This commit was manufactured by cvs2svn to create tag 'v20030611'.

Sprout from master 2003-06-11 05:55:59 UTC Wassim Melhem <wmelhem> '*** empty log message ***'
Cherrypick from master 2003-06-11 15:27:19 UTC Dorian Birsan <dbirsan> '*** empty log message ***':
    update/org.eclipse.update.ui.win32/src/org/eclipse/update/internal/ui/win32/views/IEmbeddedWebBrowser.java
    update/org.eclipse.update.ui.win32/src/org/eclipse/update/internal/ui/win32/views/WebBrowserView.java
Delete:
    ant/org.eclipse.ant.core/.classpath
    ant/org.eclipse.ant.core/.cvsignore
    ant/org.eclipse.ant.core/.externalToolBuilders/Build Ant Support JAR.launch
    ant/org.eclipse.ant.core/.options
    ant/org.eclipse.ant.core/.project
    ant/org.eclipse.ant.core/about.html
    ant/org.eclipse.ant.core/build.properties
    ant/org.eclipse.ant.core/buildfiles/buildExtraJAR.xml
    ant/org.eclipse.ant.core/buildfiles/exportplugin.xml
    ant/org.eclipse.ant.core/buildnotes_platform-ant.html
    ant/org.eclipse.ant.core/doc/org_eclipse_ant_core.html
    ant/org.eclipse.ant.core/doc/org_eclipse_ant_core_antTasks.html
    ant/org.eclipse.ant.core/doc/org_eclipse_ant_core_antTypes.html
    ant/org.eclipse.ant.core/doc/org_eclipse_ant_core_extraClasspathEntries.html
    ant/org.eclipse.ant.core/lib/.cvsignore
    ant/org.eclipse.ant.core/plugin.properties
    ant/org.eclipse.ant.core/plugin.xml
    ant/org.eclipse.ant.core/r2_0_buildnotes_platform-ant.html
    ant/org.eclipse.ant.core/r2_1_buildnotes_platform-ant.html
    ant/org.eclipse.ant.core/schema/antTasks.exsd
    ant/org.eclipse.ant.core/schema/antTypes.exsd
    ant/org.eclipse.ant.core/schema/extraClasspathEntries.exsd
    ant/org.eclipse.ant.core/src/org/eclipse/ant/core/AntCorePlugin.java
    ant/org.eclipse.ant.core/src/org/eclipse/ant/core/AntCorePreferences.java
    ant/org.eclipse.ant.core/src/org/eclipse/ant/core/AntRunner.java
    ant/org.eclipse.ant.core/src/org/eclipse/ant/core/AntSecurityException.java
    ant/org.eclipse.ant.core/src/org/eclipse/ant/core/ProjectInfo.java
    ant/org.eclipse.ant.core/src/org/eclipse/ant/core/Property.java
    ant/org.eclipse.ant.core/src/org/eclipse/ant/core/TargetInfo.java
    ant/org.eclipse.ant.core/src/org/eclipse/ant/core/Task.java
    ant/org.eclipse.ant.core/src/org/eclipse/ant/core/Type.java
    ant/org.eclipse.ant.core/src/org/eclipse/ant/core/package.html
    ant/org.eclipse.ant.core/src/org/eclipse/ant/internal/core/AntClassLoader.java
    ant/org.eclipse.ant.core/src/org/eclipse/ant/internal/core/AntObject.java
    ant/org.eclipse.ant.core/src/org/eclipse/ant/internal/core/IAntCoreConstants.java
    ant/org.eclipse.ant.core/src/org/eclipse/ant/internal/core/InternalCoreAntMessages.java
    ant/org.eclipse.ant.core/src/org/eclipse/ant/internal/core/InternalCoreAntMessages.properties
    ant/org.eclipse.ant.core/src_ant/org/eclipse/ant/internal/core/ant/AntSecurityManager.java
    ant/org.eclipse.ant.core/src_ant/org/eclipse/ant/internal/core/ant/InputHandlerSetter.java
    ant/org.eclipse.ant.core/src_ant/org/eclipse/ant/internal/core/ant/InternalAntMessages.java
    ant/org.eclipse.ant.core/src_ant/org/eclipse/ant/internal/core/ant/InternalAntMessages.properties
    ant/org.eclipse.ant.core/src_ant/org/eclipse/ant/internal/core/ant/InternalAntRunner.java
    ant/org.eclipse.ant.core/src_ant/org/eclipse/ant/internal/core/ant/InternalProject.java
    ant/org.eclipse.ant.core/src_ant/org/eclipse/ant/internal/core/ant/ProgressBuildListener.java
    ant/org.eclipse.ant.tests.core/.classpath
    ant/org.eclipse.ant.tests.core/.cvsignore
    ant/org.eclipse.ant.tests.core/.project
    ant/org.eclipse.ant.tests.core/about.html
    ant/org.eclipse.ant.tests.core/build.properties
    ant/org.eclipse.ant.tests.core/buildfiles/buildAntTestsSupportJAR.xml
    ant/org.eclipse.ant.tests.core/lib/antTestsSupport.jar
    ant/org.eclipse.ant.tests.core/plugin.properties
    ant/org.eclipse.ant.tests.core/plugin.xml
    ant/org.eclipse.ant.tests.core/test plugin/org/eclipse/ant/tests/core/testplugin/AntFileRunner.java
    ant/org.eclipse.ant.tests.core/test plugin/org/eclipse/ant/tests/core/testplugin/AntTestChecker.java
    ant/org.eclipse.ant.tests.core/test plugin/org/eclipse/ant/tests/core/testplugin/AntTestPlugin.java
    ant/org.eclipse.ant.tests.core/test plugin/org/eclipse/ant/tests/core/testplugin/ProjectHelper.java
    ant/org.eclipse.ant.tests.core/test support/org/eclipse/ant/tests/core/support/inputHandlers/AntTestInputHandler.java
    ant/org.eclipse.ant.tests.core/test support/org/eclipse/ant/tests/core/support/tasks/AntTestTask.java
    ant/org.eclipse.ant.tests.core/test support/org/eclipse/ant/tests/core/support/tasks/AntTestTask2.java
    ant/org.eclipse.ant.tests.core/test support/org/eclipse/ant/tests/core/support/testloggers/TestBuildListener.java
    ant/org.eclipse.ant.tests.core/test support/org/eclipse/ant/tests/core/support/testloggers/TestBuildLogger.java
    ant/org.eclipse.ant.tests.core/test support/org/eclipse/ant/tests/core/support/types/AntTestPath.java
    ant/org.eclipse.ant.tests.core/test.xml
    ant/org.eclipse.ant.tests.core/testbuildfiles/Bug32551.xml
    ant/org.eclipse.ant.tests.core/testbuildfiles/Bug34663.xml
    ant/org.eclipse.ant.tests.core/testbuildfiles/ClasspathOrdering.xml
    ant/org.eclipse.ant.tests.core/testbuildfiles/CustomTask.xml
    ant/org.eclipse.ant.tests.core/testbuildfiles/CustomType.xml
    ant/org.eclipse.ant.tests.core/testbuildfiles/NoDefault.xml
    ant/org.eclipse.ant.tests.core/testbuildfiles/TestForEcho.xml
    ant/org.eclipse.ant.tests.core/testbuildfiles/build.xml
    ant/org.eclipse.ant.tests.core/testbuildfiles/echoing.xml
    ant/org.eclipse.ant.tests.core/testbuildfiles/input.xml
    ant/org.eclipse.ant.tests.core/testbuildfiles/javac.xml
    ant/org.eclipse.ant.tests.core/testlib/classpathOrdering1.jar
    ant/org.eclipse.ant.tests.core/testlib/classpathOrdering2.jar
    ant/org.eclipse.ant.tests.core/testlib/taskFolder/org/eclipse/ant/tests/core/support/tasks/AntTestTask2.class
    ant/org.eclipse.ant.tests.core/testresources/AntTestTask.java
    ant/org.eclipse.ant.tests.core/testresources/taskdefs.properties
    ant/org.eclipse.ant.tests.core/testresources/test.properties
    ant/org.eclipse.ant.tests.core/tests/org/eclipse/ant/tests/core/AbstractAntTest.java
    ant/org.eclipse.ant.tests.core/tests/org/eclipse/ant/tests/core/AutomatedSuite.java
    ant/org.eclipse.ant.tests.core/tests/org/eclipse/ant/tests/core/ProjectCreationDecorator.java
    ant/org.eclipse.ant.tests.core/tests/org/eclipse/ant/tests/core/tests/FrameworkTests.java
    ant/org.eclipse.ant.tests.core/tests/org/eclipse/ant/tests/core/tests/OptionTests.java
    ant/org.eclipse.ant.tests.core/tests/org/eclipse/ant/tests/core/tests/ProjectTests.java
    ant/org.eclipse.ant.tests.core/tests/org/eclipse/ant/tests/core/tests/TargetTests.java
    ant/org.eclipse.ant.tests.core/tests/org/eclipse/ant/tests/core/tests/TaskTests.java
    ant/org.eclipse.ant.tests.core/tests/org/eclipse/ant/tests/core/tests/TypeTests.java
    ant/org.eclipse.ant.tests.ui/.classpath
    ant/org.eclipse.ant.tests.ui/.cvsignore
    ant/org.eclipse.ant.tests.ui/.project
    ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ui/externaltools/internal/ant/dtd/test/dumper.java
    ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ui/externaltools/internal/ant/editor/support/TestEditor.java
    ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ui/externaltools/internal/ant/editor/support/TestLocationProvider.java
    ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ui/externaltools/internal/ant/editor/support/TestProblemRequestor.java
    ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ui/externaltools/internal/ant/editor/support/TestTextCompletionProcessor.java
    ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ui/externaltools/internal/ant/editor/support/TestUtils.java
    ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ui/externaltools/internal/ant/editor/test/AntEditorContentOutlineTests.java
    ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ui/externaltools/internal/ant/editor/test/AntEditorTests.java
    ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ui/externaltools/internal/ant/editor/test/CodeCompletionTest.java
    ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ui/externaltools/internal/ant/editor/test/EnclosingTargetSearchingHandlerTest.java
    ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ui/externaltools/internal/ant/editor/test/TaskDescriptionProviderTest.java
    ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ui/externaltools/internal/ant/editor/test/build.Cp1251.xml
    ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ui/externaltools/internal/ant/editor/test/build.UTF8.xml
    ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ui/externaltools/internal/ant/editor/test/buildsWithSpecialEncoding.zip
    ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ui/externaltools/internal/ant/editor/test/buildtest1.properties
    ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ui/externaltools/internal/ant/editor/test/buildtest1.xml
    ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ui/externaltools/internal/ant/editor/test/buildtest2.xml
    ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ui/externaltools/internal/ant/editor/test/dependencytest.xml
    ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ui/externaltools/internal/ant/editor/test/empty.xml
    ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ui/externaltools/internal/ant/editor/test/outline_select_test_build.xml
    ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ui/externaltools/internal/ant/editor/test/projectOnly.xml
    ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ui/externaltools/internal/ant/editor/test/russianbuild.xml
    ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ui/externaltools/internal/ant/editor/test/test1.xml
    ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ui/externaltools/internal/ant/editor/test/test2.xml
    ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ui/externaltools/internal/ant/editor/test/test3.xml
    ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ui/externaltools/internal/ant/editor/test/test4.xml
    ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ui/externaltools/internal/ant/editor/test/test5.xml
    ant/org.eclipse.ant.tests.ui/Ant View Tests/AntView Ext Dir Test Example/.project
    ant/org.eclipse.ant.tests.ui/Ant View Tests/AntView Ext Dir Test Example/build.xml
    ant/org.eclipse.ant.tests.ui/Ant View Tests/AntView Ext Dir Test Example/readme.txt
    ant/org.eclipse.ant.tests.ui/Ant View Tests/AntView Java Test/.classpath
    ant/org.eclipse.ant.tests.ui/Ant View Tests/AntView Java Test/.project
    ant/org.eclipse.ant.tests.ui/Ant View Tests/AntView Java Test/bin.log
    ant/org.eclipse.ant.tests.ui/Ant View Tests/AntView Java Test/bin/main.class
    ant/org.eclipse.ant.tests.ui/Ant View Tests/AntView Java Test/build.xml
    ant/org.eclipse.ant.tests.ui/Ant View Tests/AntView Java Test/src/main.class
    ant/org.eclipse.ant.tests.ui/Ant View Tests/AntView Java Test/src/main.java
    ant/org.eclipse.ant.tests.ui/Ant View Tests/AntView Test/.project
    ant/org.eclipse.ant.tests.ui/Ant View Tests/AntView Test/Buildfile Error/build.xml
    ant/org.eclipse.ant.tests.ui/Ant View Tests/AntView Test/Custom Build filename/customBuild.xml
    ant/org.eclipse.ant.tests.ui/Ant View Tests/AntView Test/Missing default target/build.xml
    ant/org.eclipse.ant.tests.ui/Ant View Tests/AntView Test/Missing project element/build.xml
    ant/org.eclipse.ant.tests.ui/Ant View Tests/AntView Test/Missing project name/build.xml
    ant/org.eclipse.ant.tests.ui/Ant View Tests/AntView Test/Similar Dependencies/build.xml
    ant/org.eclipse.ant.tests.ui/Ant View Tests/AntView Test/Simple Dependency/build.xml
    ant/org.eclipse.ant.tests.ui/about.html
    ant/org.eclipse.ant.tests.ui/build.properties
    ant/org.eclipse.ant.tests.ui/plugin.properties
    ant/org.eclipse.ant.tests.ui/plugin.xml
    ant/org.eclipse.ant.ui/.classpath
    ant/org.eclipse.ant.ui/.cvsignore
    ant/org.eclipse.ant.ui/.externalToolBuilders/Build Ant Runner Support JAR.launch
    ant/org.eclipse.ant.ui/.options
    ant/org.eclipse.ant.ui/.project
    ant/org.eclipse.ant.ui/Ant Editor Content Assist Dev/XDOCtasks.xml
    ant/org.eclipse.ant.ui/Ant Editor Content Assist Dev/tasks.xml
    ant/org.eclipse.ant.ui/Ant Editor/ant1.5b.dtd
    ant/org.eclipse.ant.ui/Ant Editor/anttasks_1.5b.xml
    ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/dtd/AntDTDMessages.java
    ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/dtd/AntDTDMessages.properties
    ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/dtd/IAtom.java
    ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/dtd/IAttribute.java
    ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/dtd/IDfm.java
    ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/dtd/IElement.java
    ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/dtd/IModel.java
    ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/dtd/ISchema.java
    ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/dtd/ParseError.java
    ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/dtd/Parser.java
    ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/dtd/schema/AntDTDSchemaMessages.java
    ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/dtd/schema/AntDTDSchemaMessages.properties
    ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/dtd/schema/Atom.java
    ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/dtd/schema/Attribute.java
    ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/dtd/schema/Dfm.java
    ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/dtd/schema/Element.java
    ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/dtd/schema/Model.java
    ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/dtd/schema/Nfm.java
    ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/dtd/schema/NfmNode.java
    ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/dtd/schema/NfmParser.java
    ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/dtd/schema/Schema.java
    ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/dtd/schema/SchemaFactory.java
    ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/dtd/util/AntDTDUtilMessages.java
    ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/dtd/util/AntDTDUtilMessages.properties
    ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/dtd/util/Factory.java
    ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/dtd/util/FactoryObject.java
    ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/dtd/util/IKeyHolder.java
    ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/dtd/util/IMapHolder.java
    ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/dtd/util/IValueHolder.java
    ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/dtd/util/MapHolder.java
    ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/dtd/util/SortedMap.java
    ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/dtd/util/SortedMapFactory.java
    ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/dtd/util/SortedSet.java
    ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/AntEditor.java
    ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/AntEditorActionContributor.java
    ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/AntEditorCompletionProcessor.java
    ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/AntEditorException.java
    ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/AntEditorMessages.java
    ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/AntEditorMessages.properties
    ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/AntEditorSaxDefaultHandler.java
    ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/AntEditorSourceViewerConfiguration.java
    ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/EnclosingTargetSearchingHandler.java
    ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/TaskDescriptionProvider.java
    ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/derived/HTML2TextReader.java
    ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/derived/HTMLPrinter.java
    ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/derived/HTMLTextPresenter.java
    ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/derived/LineBreakingReader.java
    ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/derived/SingleCharReader.java
    ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/derived/SubstitutionTextReader.java
    ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/outline/AntEditorContentOutlinePage.java
    ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/outline/AntModel.java
    ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/outline/AntOutlineMessages.java
    ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/outline/AntOutlineMessages.properties
    ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/outline/DocumentModelChangeEvent.java
    ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/outline/IDocumentModelListener.java
    ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/outline/ILocationProvider.java
    ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/outline/IProblem.java
    ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/outline/IProblemRequestor.java
    ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/outline/LocationProvider.java
    ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/outline/OutlinePreparingHandler.java
    ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/outline/XEErrorHandler.java
    ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/outline/XMLCore.java
    ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/text/AnnotationAccess.java
    ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/text/AnnotationType.java
    ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/text/AntEditorDocumentProvider.java
    ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/text/AntEditorPartitionScanner.java
    ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/text/AntEditorProcInstrScanner.java
    ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/text/AntEditorTagScanner.java
    ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/text/AntEditorWhitespaceDetector.java
    ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/text/IAntEditorColorConstants.java
    ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/text/IReconcilingParticipant.java
    ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/text/IXMLAnnotation.java
    ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/text/NonRuleBasedDamagerRepairer.java
    ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/text/NotifyingReconciler.java
    ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/text/PartiallySynchronizedDocument.java
    ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/text/TagRule.java
    ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/text/XMLAnnotationHover.java
    ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/text/XMLAnnotationIterator.java
    ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/text/XMLMarkerAnnotation.java
    ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/text/XMLProblemAnnotation.java
    ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/text/XMLReconcilingStrategy.java
    ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/text/XMLTextHover.java
    ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/tools/AntEditorToolsMessages.java
    ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/tools/AntEditorToolsMessages.properties
    ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/tools/TaskXMLFileMerger.java
    ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/utils/AntEditorUtilsMessages.java
    ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/utils/AntEditorUtilsMessages.properties
    ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/utils/ProjectHelper.java
    ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/utils/ProjectHelperImpl.java
    ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/xml/AntEditorXMLMessages.java
    ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/xml/AntEditorXMLMessages.properties
    ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/xml/IAntEditorConstants.java
    ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/xml/XmlAttribute.java
    ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/xml/XmlElement.java
    ant/org.eclipse.ant.ui/Ant Runner Support/org/eclipse/ant/ui/internal/antsupport/AntSupportMessages.java
    ant/org.eclipse.ant.ui/Ant Runner Support/org/eclipse/ant/ui/internal/antsupport/AntSupportMessages.properties
    ant/org.eclipse.ant.ui/Ant Runner Support/org/eclipse/ant/ui/internal/antsupport/inputhandler/AntInputHandler.java
    ant/org.eclipse.ant.ui/Ant Runner Support/org/eclipse/ant/ui/internal/antsupport/logger/AntProcessBuildLogger.java
    ant/org.eclipse.ant.ui/Ant Runner Support/org/eclipse/ant/ui/internal/antsupport/logger/NullBuildLogger.java
    ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/console/BuildFailedTracker.java
    ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/console/JavacLineTracker.java
    ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/console/TaskLineTracker.java
    ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/launchConfigurations/AntBuilderTabGroup.java
    ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/launchConfigurations/AntClasspathProvider.java
    ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/launchConfigurations/AntClasspathTab.java
    ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/launchConfigurations/AntConsoleColorProvider.java
    ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/launchConfigurations/AntJRETab.java
    ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/launchConfigurations/AntLaunchConfigurationMessages.java
    ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/launchConfigurations/AntLaunchConfigurationMessages.properties
    ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/launchConfigurations/AntLaunchDelegate.java
    ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/launchConfigurations/AntLaunchShortcut.java
    ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/launchConfigurations/AntMainTab.java
    ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/launchConfigurations/AntProcess.java
    ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/launchConfigurations/AntPropertiesTab.java
    ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/launchConfigurations/AntRunActionDelegate.java
    ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/launchConfigurations/AntStreamMonitor.java
    ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/launchConfigurations/AntStreamsProxy.java
    ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/launchConfigurations/AntTabGroup.java
    ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/launchConfigurations/AntTargetContentProvider.java
    ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/launchConfigurations/AntTargetsTab.java
    ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/launchConfigurations/RunAntStatusHandler.java
    ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/launchConfigurations/TargetOrderDialog.java
    ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/launchConfigurations/TargetTableLabelProvider.java
    ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/launchConfigurations/TaskLinkManager.java
    ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/model/AntImageDescriptor.java
    ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/model/AntUIImages.java
    ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/model/AntUIModelMessages.java
    ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/model/AntUIModelMessages.properties
    ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/model/AntUIPlugin.java
    ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/model/AntUtil.java
    ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/model/ColorManager.java
    ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/model/IAntUIConstants.java
    ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/model/IAntUIHelpContextIds.java
    ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/model/IAntUIPreferenceConstants.java
    ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/model/ImageDescriptorRegistry.java
    ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/preferences/AddCustomDialog.java
    ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/preferences/AddPropertyDialog.java
    ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/preferences/AntClasspathBlock.java
    ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/preferences/AntClasspathContentProvider.java
    ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/preferences/AntClasspathLabelProvider.java
    ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/preferences/AntClasspathPage.java
    ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/preferences/AntEditorPreferenceConstants.java
    ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/preferences/AntEditorPreferencePage.java
    ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/preferences/AntPage.java
    ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/preferences/AntPreferencePage.java
    ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/preferences/AntPreferencesMessages.java
    ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/preferences/AntPreferencesMessages.properties
    ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/preferences/AntPropertiesBlock.java
    ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/preferences/AntPropertiesLabelProvider.java
    ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/preferences/AntPropertiesPage.java
    ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/preferences/AntRuntimePreferencePage.java
    ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/preferences/AntTasksPage.java
    ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/preferences/AntTypesPage.java
    ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/preferences/ColorEditor.java
    ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/preferences/IAntBlockContainer.java
    ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/preferences/MessageLine.java
    ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/preferences/MinimizedFileSystemElement.java
    ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/preferences/OverlayPreferenceStore.java
    ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/preferences/StatusDialog.java
    ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/preferences/StatusInfo.java
    ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/preferences/TabFolderLayout.java
    ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/views/AntProjectContentProvider.java
    ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/views/AntTargetContentProvider.java
    ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/views/AntView.java
    ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/views/AntViewLabelProvider.java
    ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/views/AntViewMessages.java
    ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/views/AntViewMessages.properties
    ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/views/actions/AddBuildFileAction.java
    ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/views/actions/AntOpenWithMenu.java
    ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/views/actions/AntViewActionMessages.java
    ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/views/actions/AntViewActionMessages.properties
    ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/views/actions/EditLaunchConfigurationAction.java
    ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/views/actions/EditorImageDescriptor.java
    ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/views/actions/RefreshBuildFilesAction.java
    ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/views/actions/RemoveAllAction.java
    ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/views/actions/RemoveProjectAction.java
    ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/views/actions/RunTargetAction.java
    ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/views/actions/SearchForBuildFilesAction.java
    ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/views/actions/SearchForBuildFilesDialog.java
    ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/views/elements/AntNode.java
    ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/views/elements/AntViewElementsMessages.java
    ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/views/elements/AntViewElementsMessages.properties
    ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/views/elements/ProjectNode.java
    ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/views/elements/RootNode.java
    ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/views/elements/TargetNode.java
    ant/org.eclipse.ant.ui/about.html
    ant/org.eclipse.ant.ui/build.properties
    ant/org.eclipse.ant.ui/buildfiles/buildExtraJAR.xml
    ant/org.eclipse.ant.ui/buildfiles/exportplugin.xml
    ant/org.eclipse.ant.ui/icons/full/clcl16/add_co.gif
    ant/org.eclipse.ant.ui/icons/full/clcl16/ant_targets.gif
    ant/org.eclipse.ant.ui/icons/full/clcl16/properties.gif
    ant/org.eclipse.ant.ui/icons/full/clcl16/refresh.gif
    ant/org.eclipse.ant.ui/icons/full/clcl16/removeAll_co.gif
    ant/org.eclipse.ant.ui/icons/full/clcl16/remove_co.gif
    ant/org.eclipse.ant.ui/icons/full/clcl16/run_tool.gif
    ant/org.eclipse.ant.ui/icons/full/clcl16/search.gif
    ant/org.eclipse.ant.ui/icons/full/cview16/ant_view.gif
    ant/org.eclipse.ant.ui/icons/full/dlcl16/refresh.gif
    ant/org.eclipse.ant.ui/icons/full/dlcl16/run_tool.gif
    ant/org.eclipse.ant.ui/icons/full/elcl16/refresh.gif
    ant/org.eclipse.ant.ui/icons/full/elcl16/run_tool.gif
    ant/org.eclipse.ant.ui/icons/full/obj16/ant.gif
    ant/org.eclipse.ant.ui/icons/full/obj16/ant_buildfile.gif
    ant/org.eclipse.ant.ui/icons/full/obj16/ant_target_err.gif
    ant/org.eclipse.ant.ui/icons/full/obj16/classpath.gif
    ant/org.eclipse.ant.ui/icons/full/obj16/defaulttarget_obj.gif
    ant/org.eclipse.ant.ui/icons/full/obj16/jar_l_obj.gif
    ant/org.eclipse.ant.ui/icons/full/obj16/main_tab.gif
    ant/org.eclipse.ant.ui/icons/full/obj16/prop_ps.gif
    ant/org.eclipse.ant.ui/icons/full/obj16/property_obj.gif
    ant/org.eclipse.ant.ui/icons/full/obj16/targetprivate_obj.gif
    ant/org.eclipse.ant.ui/icons/full/obj16/targetpublic_obj.gif
    ant/org.eclipse.ant.ui/icons/full/obj16/task_obj.gif
    ant/org.eclipse.ant.ui/icons/full/obj16/type.gif
    ant/org.eclipse.ant.ui/icons/full/ovr16/error_co.gif
    ant/org.eclipse.ant.ui/plugin.properties
    ant/org.eclipse.ant.ui/plugin.xml
    platform/org.eclipse.platform/.classpath
    platform/org.eclipse.platform/.cvsignore
    platform/org.eclipse.platform/.eclipseproduct
    platform/org.eclipse.platform/.project
    platform/org.eclipse.platform/about.html
    platform/org.eclipse.platform/about.ini
    platform/org.eclipse.platform/about.mappings
    platform/org.eclipse.platform/about.properties
    platform/org.eclipse.platform/build.properties
    platform/org.eclipse.platform/cpl-v10.html
    platform/org.eclipse.platform/eclipse.gif
    platform/org.eclipse.platform/eclipse32.gif
    platform/org.eclipse.platform/eclipse_lg.gif
    platform/org.eclipse.platform/install.ini
    platform/org.eclipse.platform/notice.html
    platform/org.eclipse.platform/plugin.properties
    platform/org.eclipse.platform/plugin.xml
    platform/org.eclipse.platform/plugin_customization.ini
    platform/org.eclipse.platform/plugin_customization.properties
    platform/org.eclipse.platform/splash.bmp
    platform/org.eclipse.platform/src/org/eclipse/core/launcher/Main.java
    platform/org.eclipse.platform/src/org/eclipse/core/launcher/package.html
    platform/org.eclipse.platform/welcome.xml
    update/org.eclipse.update.core.linux/.classpath
    update/org.eclipse.update.core.linux/.cvsignore
    update/org.eclipse.update.core.linux/.project
    update/org.eclipse.update.core.linux/about.html
    update/org.eclipse.update.core.linux/build.properties
    update/org.eclipse.update.core.linux/fragment.xml
    update/org.eclipse.update.core.linux/src/build.xml
    update/org.eclipse.update.core.linux/src/update.cpp
    update/org.eclipse.update.core.linux/src/update.h
    update/org.eclipse.update.core.win32/.classpath
    update/org.eclipse.update.core.win32/.cvsignore
    update/org.eclipse.update.core.win32/.project
    update/org.eclipse.update.core.win32/about.html
    update/org.eclipse.update.core.win32/build.properties
    update/org.eclipse.update.core.win32/fragment.xml
    update/org.eclipse.update.core.win32/os/win32/x86/update.dll
    update/org.eclipse.update.core.win32/src/build.xml
    update/org.eclipse.update.core.win32/src/update.cpp
    update/org.eclipse.update.core.win32/src/update.h
    update/org.eclipse.update.examples/.classpath
    update/org.eclipse.update.examples/.cvsignore
    update/org.eclipse.update.examples/.project
    update/org.eclipse.update.examples/Scrapbook2.jpage
    update/org.eclipse.update.examples/about.html
    update/org.eclipse.update.examples/build.properties
    update/org.eclipse.update.examples/plugin.properties
    update/org.eclipse.update.examples/plugin.xml
    update/org.eclipse.update.examples/site/features/com.reddot.reddot_1.0.0.jar
    update/org.eclipse.update.examples/site/features/com.reddot.reddot_2.0.0.jar
    update/org.eclipse.update.examples/site/info/images/redDot.jpg
    update/org.eclipse.update.examples/site/info/siteInfo.html
    update/org.eclipse.update.examples/site/plugins/com.reddot.reddot_1.0.0.jar
    update/org.eclipse.update.examples/site/plugins/com.reddot.reddot_2.0.0.jar
    update/org.eclipse.update.examples/site/site.xml
    update/org.eclipse.update.examples/src/org/eclipse/update/examples/buildzip/BuildZipConverter.java
    update/org.eclipse.update.examples/src/org/eclipse/update/examples/buildzip/BuildZipFeatureContentProvider.java
    update/org.eclipse.update.examples/src/org/eclipse/update/examples/buildzip/BuildZipFeatureFactory.java
    update/org.eclipse.update.examples/src/org/eclipse/update/examples/buildzip/BuildZipFeatureParser.java
    update/org.eclipse.update.examples/src/org/eclipse/update/examples/buildzip/BuildZipPluginParser.java
    update/org.eclipse.update.examples/src/org/eclipse/update/examples/buildzip/BuildZipSiteContentProvider.java
    update/org.eclipse.update.examples/src/org/eclipse/update/examples/buildzip/BuildZipSiteFactory.java
    update/org.eclipse.update.examples/src/org/eclipse/update/examples/buildzip/DefaultModelWriter.java
    update/org.eclipse.update.examples/src/org/eclipse/update/examples/buildzip/Test.java
    update/org.eclipse.update.examples/src/org/eclipse/update/examples/buildzip/java.page.jpage
    update/org.eclipse.update.examples/src/org/eclipse/update/examples/freeform/FreeFormSiteContentProvider.java
    update/org.eclipse.update.examples/src/org/eclipse/update/examples/freeform/FreeFormSiteFactory.java
    update/org.eclipse.update.tests.core/.classpath
    update/org.eclipse.update.tests.core/.cvsignore
    update/org.eclipse.update.tests.core/.project
    update/org.eclipse.update.tests.core/about.html
    update/org.eclipse.update.tests.core/build.properties
    update/org.eclipse.update.tests.core/data/ExecutableFeaturePackagedSite/data/features/feature3/feature.xml
    update/org.eclipse.update.tests.core/data/ExecutableFeaturePackagedSite/data/plugins/Pde_core.jar
    update/org.eclipse.update.tests.core/data/ExecutableFeaturePackagedSite/data/plugins/help.jar
    update/org.eclipse.update.tests.core/data/ExecutableFeaturePackagedSite/data/plugins/junit_3.7.jar
    update/org.eclipse.update.tests.core/data/ExecutableFeaturePackagedSite/data/plugins/org.eclipse.update.plugin1_1.1.1/plugin.xml
    update/org.eclipse.update.tests.core/data/ExecutableFeaturePackagedSite/data/plugins/org.eclipse.update.plugin1_1.1.1/src.jar
    update/org.eclipse.update.tests.core/data/ExecutableFeaturePackagedSite/data2/features/feature3/feature.xml
    update/org.eclipse.update.tests.core/data/ExecutableFeaturePackagedSite/data2/features/helpFeature.jar
    update/org.eclipse.update.tests.core/data/ExecutableFeaturePackagedSite/data2/features/org.eclipse.pde.feature_1.0.0.jar
    update/org.eclipse.update.tests.core/data/ExecutableFeaturePackagedSite/data2/info/img/top_titlsm.gif
    update/org.eclipse.update.tests.core/data/ExecutableFeaturePackagedSite/data2/info/img/wel_ml.jpg
    update/org.eclipse.update.tests.core/data/ExecutableFeaturePackagedSite/data2/info/siteInfo.html
    update/org.eclipse.update.tests.core/data/ExecutableFeaturePackagedSite/data2/plugins/Pde_core.jar
    update/org.eclipse.update.tests.core/data/ExecutableFeaturePackagedSite/data2/plugins/help.jar
    update/org.eclipse.update.tests.core/data/ExecutableFeaturePackagedSite/data2/plugins/junit_3.7.jar
    update/org.eclipse.update.tests.core/data/ExecutableFeaturePackagedSite/data2/plugins/org.eclipse.update.plugin1_1.1.1/plugin.xml
    update/org.eclipse.update.tests.core/data/ExecutableFeaturePackagedSite/data2/plugins/org.eclipse.update.plugin1_1.1.1/src.jar
    update/org.eclipse.update.tests.core/data/ExecutableFeaturePackagedSite/data2/site.xml
    update/org.eclipse.update.tests.core/data/FTPLikeSite/site.xml
    update/org.eclipse.update.tests.core/data/FeatureTypeExamples/site1/features/feature3/feature.xml
    update/org.eclipse.update.tests.core/data/FeatureTypeExamples/site1/site.xml
    update/org.eclipse.update.tests.core/data/FeatureTypeExamples/site2/features/feature3/features2.jarfile
    update/org.eclipse.update.tests.core/data/FeatureTypeExamples/site2/site.xml
    update/org.eclipse.update.tests.core/data/FeatureTypeExamples/site3/features/feature3/features2.jarfile
    update/org.eclipse.update.tests.core/data/FeatureTypeExamples/site3/site.xml
    update/org.eclipse.update.tests.core/data/Site with space/features space/helpFeature.jar
    update/org.eclipse.update.tests.core/data/Site with space/features space/space feature.jar
    update/org.eclipse.update.tests.core/data/Site with space/info/img/top_titlsm.gif
    update/org.eclipse.update.tests.core/data/Site with space/info/img/wel_ml.jpg
    update/org.eclipse.update.tests.core/data/Site with space/info/siteInfo.html
    update/org.eclipse.update.tests.core/data/Site with space/install/features space/feature3/feature.xml
    update/org.eclipse.update.tests.core/data/Site with space/plugins space/Pde_core.jar
    update/org.eclipse.update.tests.core/data/Site with space/plugins space/help.jar
    update/org.eclipse.update.tests.core/data/Site with space/plugins space/junit_3.7.jar
    update/org.eclipse.update.tests.core/data/Site with space/plugins space/org.eclipse.update.plugin1_1.1.1/plugin.xml
    update/org.eclipse.update.tests.core/data/Site with space/plugins space/org.eclipse.update.plugin1_1.1.1/src.jar
    update/org.eclipse.update.tests.core/data/Site with space/site.xml
    update/org.eclipse.update.tests.core/data/SiteTypeExamples/site1/features/feature3/features2.jarfile
    update/org.eclipse.update.tests.core/data/SiteTypeExamples/site1/site.xml
    update/org.eclipse.update.tests.core/data/SiteURLTest/data/artifacts/features/helpFeature.jar
    update/org.eclipse.update.tests.core/data/SiteURLTest/data/artifacts/features/org.eclipse.pde.feature_1.0.0.jar
    update/org.eclipse.update.tests.core/data/SiteURLTest/data/artifacts/plugins/Pde_core.jar
    update/org.eclipse.update.tests.core/data/SiteURLTest/data/artifacts/plugins/help.jar
    update/org.eclipse.update.tests.core/data/SiteURLTest/data/artifacts/plugins/junit_3.7.jar
    update/org.eclipse.update.tests.core/data/SiteURLTest/data/info/img/top_titlsm.gif
    update/org.eclipse.update.tests.core/data/SiteURLTest/data/info/img/wel_ml.jpg
    update/org.eclipse.update.tests.core/data/SiteURLTest/data/info/siteInfo.html
    update/org.eclipse.update.tests.core/data/SiteURLTest/data/site.xml
    update/org.eclipse.update.tests.core/data/dataEntrySiteTest/site1/file1.zip
    update/org.eclipse.update.tests.core/data/dataEntrySiteTest/site1/install/features/feature3/feature.xml
    update/org.eclipse.update.tests.core/data/dataEntrySiteTest/site1/site.xml
    update/org.eclipse.update.tests.core/data/dataEntrySiteTest/site2/features/features3.jar
    update/org.eclipse.update.tests.core/data/dataEntrySiteTest/site2/non data/another file.zip
    update/org.eclipse.update.tests.core/data/dataEntrySiteTest/site2/site.xml
    update/org.eclipse.update.tests.core/data/features/features2.jar
    update/org.eclipse.update.tests.core/data/features/org.eclipse.test.feature_1.0.0.jar
    update/org.eclipse.update.tests.core/data/features/org.eclipse.update.core.tests.feature1_1.0.4.jar
    update/org.eclipse.update.tests.core/data/features/org.eclipse_test_feature.jar
    update/org.eclipse.update.tests.core/data/nestedFeatureSiteTest/features/org.eclipse.update.core.tests.childrenfeature_2.0.0.jar
    update/org.eclipse.update.tests.core/data/nestedFeatureSiteTest/features/rootfeature.jar
    update/org.eclipse.update.tests.core/data/nestedFeatureSiteTest/plugins/org.eclipse.update.core.tests.feature1.plugin1_3.5.6.jar
    update/org.eclipse.update.tests.core/data/nestedFeatureSiteTest/plugins/org.eclipse.update.core.tests.feature1.plugin2_5.0.0.jar
    update/org.eclipse.update.tests.core/data/nestedFeatureSiteTest/plugins/org.eclipse.update.core.tests.feature1.plugin2_5.0.1.jar
    update/org.eclipse.update.tests.core/data/nestedFeatureSiteTest/site.xml
    update/org.eclipse.update.tests.core/data/nestedFeatureSiteTest2/features/childrenfeature.jar
    update/org.eclipse.update.tests.core/data/nestedFeatureSiteTest2/features/rootfeature.jar
    update/org.eclipse.update.tests.core/data/nestedFeatureSiteTest2/plugins/org.eclipse.update.core.tests.feature1.plugin1_3.5.6.jar
    update/org.eclipse.update.tests.core/data/nestedFeatureSiteTest2/plugins/org.eclipse.update.core.tests.feature1.plugin2_5.0.0.jar
    update/org.eclipse.update.tests.core/data/nestedFeatureSiteTest2/plugins/org.eclipse.update.core.tests.feature1.plugin2_5.0.1.jar
    update/org.eclipse.update.tests.core/data/nestedFeatureSiteTest2/site.xml
    update/org.eclipse.update.tests.core/data/nestedFeatureSiteTest3/features/childrenfeature.jar
    update/org.eclipse.update.tests.core/data/nestedFeatureSiteTest3/features/rootfeature.jar
    update/org.eclipse.update.tests.core/data/nestedFeatureSiteTest3/plugins/org.eclipse.update.core.tests.feature1.plugin1_3.5.6.jar
    update/org.eclipse.update.tests.core/data/nestedFeatureSiteTest3/plugins/org.eclipse.update.core.tests.feature1.plugin2_5.0.0.jar
    update/org.eclipse.update.tests.core/data/nestedFeatureSiteTest3/plugins/org.eclipse.update.core.tests.feature1.plugin2_5.0.1.jar
    update/org.eclipse.update.tests.core/data/nestedFeatureSiteTest3/site.xml
    update/org.eclipse.update.tests.core/data/parsertests/feature1.xml
    update/org.eclipse.update.tests.core/data/parsertests/feature1bis.xml
    update/org.eclipse.update.tests.core/data/parsertests/feature2.xml
    update/org.eclipse.update.tests.core/data/parsertests/feature3.xml
    update/org.eclipse.update.tests.core/data/parsertests/feature4.xml
    update/org.eclipse.update.tests.core/data/parsertests/reddot.xml
    update/org.eclipse.update.tests.core/data/parsertests/reddot1.xml
    update/org.eclipse.update.tests.core/data/parsertests/site.properties
    update/org.eclipse.update.tests.core/data/parsertests/site.xml
    update/org.eclipse.update.tests.core/data/parsertests/site10.xml
    update/org.eclipse.update.tests.core/data/parsertests/site2.xml
    update/org.eclipse.update.tests.core/data/parsertests/site3.xml
    update/org.eclipse.update.tests.core/data/parsertests/site4.xml
    update/org.eclipse.update.tests.core/data/parsertests/site7.xml
    update/org.eclipse.update.tests.core/data/parsertests/site8.xml
    update/org.eclipse.update.tests.core/data/parsertests/site9.xml
    update/org.eclipse.update.tests.core/data/parsertests/siteftp.xml
    update/org.eclipse.update.tests.core/data/plugins/org.eclipse.update.core.feature1.plugin1_1.1.1.jar
    update/org.eclipse.update.tests.core/data/plugins/org.eclipse.update.core.feature2.plugin2_2.2.2.jar
    update/org.eclipse.update.tests.core/data/plugins/org.eclipse.update.core.tests.dummy_7.9.8.jar
    update/org.eclipse.update.tests.core/data/plugins/org.eclipse.update.core.tests.feature1.plugin1_3.5.6.jar
    update/org.eclipse.update.tests.core/data/plugins/org.eclipse.update.core.tests.feature1.plugin2_5.0.0.jar
    update/org.eclipse.update.tests.core/data/plugins/org.eclipse.update.plugin1_1.1.1/plugin.xml
    update/org.eclipse.update.tests.core/data/plugins/org.eclipse.update.plugin1_1.1.1/src.jar
    update/org.eclipse.update.tests.core/data/reconciliationSites/site1/install/features/feature3/feature.xml
    update/org.eclipse.update.tests.core/data/reconciliationSites/site1/plugins/org.eclipse.update.plugin1_1.1.1/plugin.xml
    update/org.eclipse.update.tests.core/data/reconciliationSites/site1/plugins/org.eclipse.update.plugin1_1.1.1/src.jar
    update/org.eclipse.update.tests.core/data/reconciliationSites/site2/install/features/feature3/feature.xml
    update/org.eclipse.update.tests.core/data/reconciliationSites/site2/plugins/org.eclipse.update.core_2.0.0/plugin.xml
    update/org.eclipse.update.tests.core/data/reconciliationSites/site2/plugins/org.eclipse.update.core_2.0.0/src.jar
    update/org.eclipse.update.tests.core/data/resources.properties
    update/org.eclipse.update.tests.core/data/site.xml
    update/org.eclipse.update.tests.core/data/site2/site.xml
    update/org.eclipse.update.tests.core/data/siteTestLocalSite/plugins/feature1_plugin2_5.0.0/plugin.xml
    update/org.eclipse.update.tests.core/data/siteTestLocalSite/plugins/feature1_plugin2_5.0.0/src.jar
    update/org.eclipse.update.tests.core/data/siteTestLocalSite/plugins/feature1_plugin2_5.0.1/plugin.xml
    update/org.eclipse.update.tests.core/data/siteTestLocalSite/plugins/feature1_plugin2_5.0.1/src.jar
    update/org.eclipse.update.tests.core/data/testAPI/features/feature3/feature.xml
    update/org.eclipse.update.tests.core/data/testAPI/plugins/org.eclipse.update.plugin1_1.1.1/plugin.xml
    update/org.eclipse.update.tests.core/data/testAPI/plugins/org.eclipse.update.plugin1_1.1.1/src.jar
    update/org.eclipse.update.tests.core/data/testAPI/site.xml
    update/org.eclipse.update.tests.core/data/validation/site2/.eclipseproduct
    update/org.eclipse.update.tests.core/data/validation/site3/.eclipseextension
    update/org.eclipse.update.tests.core/data/validation/site4/.eclipseUM
    update/org.eclipse.update.tests.core/data/validation/site5/.eclipseUM
    update/org.eclipse.update.tests.core/data/validation/site6/.eclipseUM
    update/org.eclipse.update.tests.core/data/xmls/apitests/org.eclipse.test.feature_1.0.0/feature.xml
    update/org.eclipse.update.tests.core/data/xmls/apitests/org.eclipse_test_feature/feature.xml
    update/org.eclipse.update.tests.core/data/xmls/feature_1.0.0/feature.xml
    update/org.eclipse.update.tests.core/data/xmls/feature_1.0.0/feature1.gif
    update/org.eclipse.update.tests.core/data/xmls/site1/site.xml
    update/org.eclipse.update.tests.core/plugin.properties
    update/org.eclipse.update.tests.core/plugin.xml
    update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/AllTests.java
    update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/UpdateManagerTestCase.java
    update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/UpdateTestsPlugin.java
    update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/AllAPITests.java
    update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/DefaultFeature.java
    update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/MyURLEntry.java
    update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/TestDefaultExecutableFeatureAPI.java
    update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/TestDefaultPackageFeatureAPI.java
    update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/TestFeatureContentProvider_FileFilterAPI.java
    update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/TestLocalSiteAPI.java
    update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/TestNestedFeatureAPI.java
    update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/TestPluginContainerAPI.java
    update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/TestSiteAPI.java
    update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/TestSiteManagerAPI.java
    update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/TestUpdateManagerUtilsAPI.java
    update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/configurations/AllConfigurationsTests.java
    update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/configurations/TestBackward.java
    update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/configurations/TestRevert.java
    update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/core/boot/AllPlatformConfigurationTests.java
    update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/core/boot/PlatformConfigurationTestCase.java
    update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/core/boot/TestPlatCfgAPI.java
    update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/core/boot/TestPlatCfgDefault.java
    update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/implementation/SiteFTP.java
    update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/implementation/SiteFTPFactory.java
    update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/model/AllModelTests.java
    update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/model/FeatureMain.java
    update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/model/SiteMain.java
    update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/model/feature.xml
    update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/model/site.xml
    update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/model/site_old_format.xml
    update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/model/site_with_type.xml
    update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/model/test.properties
    update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/nativeTests/TestLocalSystemInfo.java
    update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/nestedfeatures/AllNestedTests.java
    update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/nestedfeatures/TestInstall.java
    update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/parser/AllParserTests.java
    update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/parser/TestCategories.java
    update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/parser/TestFeatureParse.java
    update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/parser/TestSiteParse.java
    update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/reconciliation/AllReconciliationTests.java
    update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/reconciliation/TestSiteReconciliation.java
    update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/regularInstall/AllRegularInstallTests.java
    update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/regularInstall/MultipleTestLocalSite.java
    update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/regularInstall/TestDataEntryInstall.java
    update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/regularInstall/TestExecutableInstall.java
    update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/regularInstall/TestExecutablePackagedInstall.java
    update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/regularInstall/TestGetFeature.java
    update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/regularInstall/TestInstall.java
    update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/regularInstall/TestInstallURLSIteXML.java
    update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/regularInstall/TestLocalSite.java
    update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/regularInstall/TestSpaceInInstall.java
    update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/regularRemove/AllRegularRemoveTests.java
    update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/regularRemove/TestRemove.java
    update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/sitevalidation/AllSiteValidationTests.java
    update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/sitevalidation/TestSiteValidation.java
    update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/types/AllTypesTests.java
    update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/types/TestFeatureType.java
    update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/types/TestSiteType.java
    update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/uivalues/AllCoreUITests.java
    update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/uivalues/TestUILabel.java
    update/org.eclipse.update.tests.core/test.xml
    update/org.eclipse.update.tests.core/test_with_mail.xml
    update/org.eclipse.update.tests.core/webserver/Site with space/features space/helpFeature.jar
    update/org.eclipse.update.tests.core/webserver/Site with space/features space/space feature.jar
    update/org.eclipse.update.tests.core/webserver/Site with space/info/img/top_titlsm.gif
    update/org.eclipse.update.tests.core/webserver/Site with space/info/img/wel_ml.jpg
    update/org.eclipse.update.tests.core/webserver/Site with space/info/siteInfo.html
    update/org.eclipse.update.tests.core/webserver/Site with space/install/features space/feature3/feature.xml
    update/org.eclipse.update.tests.core/webserver/Site with space/plugins space/Pde_core.jar
    update/org.eclipse.update.tests.core/webserver/Site with space/plugins space/help.jar
    update/org.eclipse.update.tests.core/webserver/Site with space/plugins space/junit_3.7.jar
    update/org.eclipse.update.tests.core/webserver/Site with space/site.xml
    update/org.eclipse.update.tests.core/webserver/UpdateManager/features/helpFeature.jar
    update/org.eclipse.update.tests.core/webserver/UpdateManager/features/org.eclipse.pde.feature_1.0.0.jar
    update/org.eclipse.update.tests.core/webserver/UpdateManager/info/img/top_titlsm.gif
    update/org.eclipse.update.tests.core/webserver/UpdateManager/info/img/wel_ml.jpg
    update/org.eclipse.update.tests.core/webserver/UpdateManager/info/siteInfo.html
    update/org.eclipse.update.tests.core/webserver/UpdateManager/plugins/Pde_core.jar
    update/org.eclipse.update.tests.core/webserver/UpdateManager/plugins/help.jar
    update/org.eclipse.update.tests.core/webserver/UpdateManager/plugins/junit_3.7.jar
    update/org.eclipse.update.tests.core/webserver/UpdateManager/site.xml
    update/org.eclipse.update.tests.core/webserver/UpdateManager2/features/features2.jar
    update/org.eclipse.update.tests.core/webserver/UpdateManager2/features/org.eclipse.test.feature_1.0.0.jar
    update/org.eclipse.update.tests.core/webserver/UpdateManager2/features/org.eclipse.update.core.tests.feature1_1.0.4.jar
    update/org.eclipse.update.tests.core/webserver/UpdateManager2/features/org.eclipse_test_feature.jar
    update/org.eclipse.update.tests.core/webserver/UpdateManager2/nestedFeatureSiteTest/features/org.eclipse.update.core.tests.childrenfeature_2.0.0.jar
    update/org.eclipse.update.tests.core/webserver/UpdateManager2/nestedFeatureSiteTest/features/rootfeature.jar
    update/org.eclipse.update.tests.core/webserver/UpdateManager2/nestedFeatureSiteTest/plugins/org.eclipse.update.core.tests.feature1.plugin1_3.5.6.jar
    update/org.eclipse.update.tests.core/webserver/UpdateManager2/nestedFeatureSiteTest/plugins/org.eclipse.update.core.tests.feature1.plugin2_5.0.0.jar
    update/org.eclipse.update.tests.core/webserver/UpdateManager2/nestedFeatureSiteTest/plugins/org.eclipse.update.core.tests.feature1.plugin2_5.0.1.jar
    update/org.eclipse.update.tests.core/webserver/UpdateManager2/nestedFeatureSiteTest/site.xml
    update/org.eclipse.update.tests.core/webserver/UpdateManager2/org.eclipse.update.core.feature2_1.0.0/org.eclipse.update.core.feature2_2.2.2.jar
    update/org.eclipse.update.tests.core/webserver/UpdateManager2/plugins/org.eclipse.update.core.feature1.plugin1_1.1.1.jar
    update/org.eclipse.update.tests.core/webserver/UpdateManager2/plugins/org.eclipse.update.core.feature2.plugin2_2.2.2.jar
    update/org.eclipse.update.tests.core/webserver/UpdateManager2/plugins/org.eclipse.update.core.tests.dummy_7.9.8.jar
    update/org.eclipse.update.tests.core/webserver/UpdateManager2/plugins/org.eclipse.update.core.tests.feature1.plugin1_3.5.6.jar
    update/org.eclipse.update.tests.core/webserver/UpdateManager2/plugins/org.eclipse.update.core.tests.feature1.plugin2_5.0.0.jar
    update/org.eclipse.update.tests.core/webserver/UpdateManager2/site.properties
    update/org.eclipse.update.tests.core/webserver/UpdateManager2/site.xml
    update/org.eclipse.update.tests.core/webserver/WEB-INF/web.xml
    update/org.eclipse.update.ui.forms/.classpath
    update/org.eclipse.update.ui.forms/.cvsignore
    update/org.eclipse.update.ui.forms/.project
    update/org.eclipse.update.ui.forms/about.html
    update/org.eclipse.update.ui.forms/build.properties
    update/org.eclipse.update.ui.forms/plugin.properties
    update/org.eclipse.update.ui.forms/plugin.xml
    update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/AbstractForm.java
    update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/AbstractSectionForm.java
    update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/CustomWorkbook.java
    update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/ExpandableGroup.java
    update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/FormButton.java
    update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/FormEntry.java
    update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/FormLabel.java
    update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/FormSection.java
    update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/FormWidgetFactory.java
    update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/FormsPlugin.java
    update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/FormsPluginResources.properties
    update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/HTMLTableLayout.java
    update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/HyperlinkAdapter.java
    update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/HyperlinkHandler.java
    update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/HyperlinkSettings.java
    update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/IForm.java
    update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/IFormPage.java
    update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/IFormSelectionListener.java
    update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/IFormTextListener.java
    update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/IFormWorkbook.java
    update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/IHyperlinkListener.java
    update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/ILayoutExtension.java
    update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/NoTabsWorkbook.java
    update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/ScrollableSectionForm.java
    update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/SectionChangeManager.java
    update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/SectionForm.java
    update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/SelectableControl.java
    update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/SelectableFormLabel.java
    update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/TableData.java
    update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/TableLayoutTest.java
    update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/ToggleControl.java
    update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/WebForm.java
    update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/engine/BulletParagraph.java
    update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/engine/FormEngine.java
    update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/engine/FormEngineLayout.java
    update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/engine/HTTPAction.java
    update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/engine/HyperlinkAction.java
    update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/engine/HyperlinkSegment.java
    update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/engine/IBulletParagraph.java
    update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/engine/IHyperlinkSegment.java
    update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/engine/IImageSegment.java
    update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/engine/IObjectReference.java
    update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/engine/IParagraph.java
    update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/engine/IParagraphSegment.java
    update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/engine/ITextModel.java
    update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/engine/ITextSegment.java
    update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/engine/ImageSegment.java
    update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/engine/Locator.java
    update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/engine/Paragraph.java
    update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/engine/ParagraphSegment.java
    update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/engine/TextModel.java
    update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/engine/TextSegment.java
    update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/index.xml
    update/org.eclipse.update/.classpath
    update/org.eclipse.update/.cvsignore
    update/org.eclipse.update/.vcm_meta
    update/org.eclipse.update/about.html
    update/org.eclipse.update/build.properties
    update/org.eclipse.update/icons/full/ctool16/new.gif
    update/org.eclipse.update/icons/full/ctool16/update.gif
    update/org.eclipse.update/icons/full/wizban/new.gif
    update/org.eclipse.update/icons/full/wizban/revert.gif
    update/org.eclipse.update/icons/full/wizban/update.gif
    update/org.eclipse.update/plugin.properties
    update/org.eclipse.update/plugin.xml
    update/org.eclipse.update/plugin.xml.off
    update/org.eclipse.update/src/org/eclipse/update/internal/core/ISessionDefiner.java
    update/org.eclipse.update/src/org/eclipse/update/internal/core/IUMLock.java
    update/org.eclipse.update/src/org/eclipse/update/internal/core/UMLock.java
    update/org.eclipse.update/src/org/eclipse/update/internal/core/UMSessionDefinerReferenceUpdate.java
    update/org.eclipse.update/src/org/eclipse/update/internal/core/UMSessionManager.java
    update/org.eclipse.update/src/org/eclipse/update/internal/core/UMSessionManagerEntry.java
    update/org.eclipse.update/src/org/eclipse/update/internal/core/UMSessionManagerMessage.java
    update/org.eclipse.update/src/org/eclipse/update/internal/core/UMSessionManagerOperation.java
    update/org.eclipse.update/src/org/eclipse/update/internal/core/UMSessionManagerParcel.java
    update/org.eclipse.update/src/org/eclipse/update/internal/core/UMSessionManagerSession.java
    update/org.eclipse.update/src/org/eclipse/update/internal/core/URLHandler.java
    update/org.eclipse.update/src/org/eclipse/update/internal/core/UpdateManager.java
    update/org.eclipse.update/src/org/eclipse/update/internal/core/UpdateManagerException.java
    update/org.eclipse.update/src/org/eclipse/update/internal/core/UpdateManagerPlugin.java
    update/org.eclipse.update/src/org/eclipse/update/internal/core/UpdateManagerStrings.java
    update/org.eclipse.update/src/org/eclipse/update/internal/core/UpdateManagerURLComparator.java
    update/org.eclipse.update/src/org/eclipse/update/internal/core/updatemanagerstrings.properties
    update/org.eclipse.update/src/org/eclipse/update/internal/ui/AuthorizationDatabase.java
    update/org.eclipse.update/src/org/eclipse/update/internal/ui/Installation.java
    update/org.eclipse.update/src/org/eclipse/update/internal/ui/JarVerificationDialog.java
    update/org.eclipse.update/src/org/eclipse/update/internal/ui/JarVerificationResult.java
    update/org.eclipse.update/src/org/eclipse/update/internal/ui/JarVerificationService.java
    update/org.eclipse.update/src/org/eclipse/update/internal/ui/JarVerifier.java
    update/org.eclipse.update/src/org/eclipse/update/internal/ui/KeyStores.java
    update/org.eclipse.update/src/org/eclipse/update/internal/ui/Main.java
    update/org.eclipse.update/src/org/eclipse/update/internal/ui/UMApplication.java
    update/org.eclipse.update/src/org/eclipse/update/internal/ui/UMApplicationUserInterface.java
    update/org.eclipse.update/src/org/eclipse/update/internal/ui/UMApplicationUserInterfaceProperties.java
    update/org.eclipse.update/src/org/eclipse/update/internal/ui/UMApplicationWindow.java
    update/org.eclipse.update/src/org/eclipse/update/internal/ui/UMDialog.java
    update/org.eclipse.update/src/org/eclipse/update/internal/ui/UMDialogAction.java
    update/org.eclipse.update/src/org/eclipse/update/internal/ui/UMPreferencePageSettings.java
    update/org.eclipse.update/src/org/eclipse/update/internal/ui/UMWizard.java
    update/org.eclipse.update/src/org/eclipse/update/internal/ui/UMWizardPageComplete.java
    update/org.eclipse.update/src/org/eclipse/update/internal/ui/UMWizardPageInstallable.java
    update/org.eclipse.update/src/org/eclipse/update/internal/ui/UMWizardPageInstalling.java
    update/org.eclipse.update/src/org/eclipse/update/internal/ui/UMWizardPageLaunchHistory.java
    update/org.eclipse.update/src/org/eclipse/update/internal/ui/UMWizardPageLaunchHistoryComplete.java
    update/org.eclipse.update/src/org/eclipse/update/internal/ui/UMWizardPageLocations.java
    update/org.eclipse.update/src/org/eclipse/update/internal/ui/UMWizardPageURLComplete.java
    update/org.eclipse.update/src/org/eclipse/update/internal/ui/UMWizardPageURLInstall.java
    update/org.eclipse.update/src/org/eclipse/update/internal/ui/UMWizardPageURLInstallable.java
    update/org.eclipse.update/src/org/eclipse/update/internal/ui/UMWizardPageURLInstalling.java
    update/org.eclipse.update/src/org/eclipse/update/internal/ui/UMWizardPersistentProperties.java
    update/org.eclipse.update/src/org/eclipse/update/internal/ui/UMWizardProductComponentNew.java
    update/org.eclipse.update/src/org/eclipse/update/internal/ui/UMWizardProductComponentRevert.java
    update/org.eclipse.update/src/org/eclipse/update/internal/ui/UMWizardProductComponentURLInstall.java
    update/org.eclipse.update/src/org/eclipse/update/internal/ui/UMWizardProductComponentUpdate.java
    update/org.eclipse.update/src/org/eclipse/update/internal/ui/UMWizardTreeItem.java
    update/org.eclipse.update/src/org/eclipse/update/internal/ui/UMWizardTreeItemComparator.java
    update/org.eclipse.update/src/org/eclipse/update/internal/ui/UMWizardURLNamePairComparator.java
    update/org.eclipse.update/src/org/eclipse/update/internal/ui/UserValidationDialog.java
diff --git a/ant/org.eclipse.ant.core/.classpath b/ant/org.eclipse.ant.core/.classpath
deleted file mode 100644
index 0946172..0000000
--- a/ant/org.eclipse.ant.core/.classpath
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-    <classpathentry kind="src" path="src/"/>
-    <classpathentry kind="src" path="src_ant/"/>
-    <classpathentry kind="src" path="/org.apache.xerces"/>
-    <classpathentry kind="src" path="/org.eclipse.core.runtime"/>
-    <classpathentry kind="src" path="/org.eclipse.core.boot"/>
-    <classpathentry kind="var" path="JRE_LIB" rootpath="JRE_SRCROOT" sourcepath="JRE_SRC"/>
-    <classpathentry kind="src" path="/org.apache.ant"/>
-    <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/ant/org.eclipse.ant.core/.cvsignore b/ant/org.eclipse.ant.core/.cvsignore
deleted file mode 100644
index db87d54..0000000
--- a/ant/org.eclipse.ant.core/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-bin
-lib
-temp.folder
-antsupport.jar
diff --git a/ant/org.eclipse.ant.core/.externalToolBuilders/Build Ant Support JAR.launch b/ant/org.eclipse.ant.core/.externalToolBuilders/Build Ant Support JAR.launch
deleted file mode 100644
index 32539aa..0000000
--- a/ant/org.eclipse.ant.core/.externalToolBuilders/Build Ant Support JAR.launch
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType">
-    <stringAttribute key="org.eclipse.ui.externaltools.ATTR_BUILD_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;
-&lt;launchConfigurationWorkingSet factoryID=&quot;org.eclipse.ui.internal.WorkingSetFactory&quot; name=&quot;workingSet&quot;&gt;&lt;item factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; path=&quot;/org.eclipse.ant.core/buildfiles/buildExtraJAR.xml&quot; type=&quot;1&quot;/&gt;&lt;item factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; path=&quot;/org.eclipse.ant.core/src_ant&quot; type=&quot;2&quot;/&gt;&lt;/launchConfigurationWorkingSet&gt;}"/>
-    <stringAttribute
-        key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="full,incremental,auto,"/>
-    <stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/org.eclipse.ant.core/buildfiles/buildExtraJAR.xml}"/>
-    <stringAttribute key="org.eclipse.debug.ui.target_run_perspective" value="perspective_none"/>
-</launchConfiguration>
diff --git a/ant/org.eclipse.ant.core/.options b/ant/org.eclipse.ant.core/.options
deleted file mode 100644
index 04b34d5..0000000
--- a/ant/org.eclipse.ant.core/.options
+++ /dev/null
@@ -1,7 +0,0 @@
-# Debugging options for the org.eclipse.ant.core plugin.
-
-# Turn on debugging for the org.eclipse.ant.core plugin.
-org.eclipse.ant.core/debug=true
-
-# Displays buildfile run times.
-org.eclipse.ant.core/buildfile/timing=false
diff --git a/ant/org.eclipse.ant.core/.project b/ant/org.eclipse.ant.core/.project
deleted file mode 100644
index 3617f6f..0000000
--- a/ant/org.eclipse.ant.core/.project
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ant.core</name>
-	<comment></comment>
-	<projects>
-		<project>org.apache.ant</project>
-		<project>org.apache.xerces</project>
-		<project>org.eclipse.core.boot</project>
-		<project>org.eclipse.core.runtime</project>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
-			<arguments>
-				<dictionary>
-					<key>LaunchConfigHandle</key>
-					<value>&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;
-&lt;launchConfiguration local=&quot;false&quot; path=&quot;/org.eclipse.ant.core/.externalToolBuilders/Build Ant Support JAR.launch&quot;/&gt;
-</value>
-				</dictionary>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.PluginNature</nature>
-	</natures>
-</projectDescription>
diff --git a/ant/org.eclipse.ant.core/about.html b/ant/org.eclipse.ant.core/about.html
deleted file mode 100644
index 4735c0f..0000000
--- a/ant/org.eclipse.ant.core/about.html
+++ /dev/null
@@ -1,90 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>3rd March, 2003</p>	
-<h3>License</h3>
-<p>Eclipse.org makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Common Public License Version 1.0 (&quot;CPL&quot;).  A copy of the CPL is available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>.
-For purposes of the CPL, &quot;Program&quot; will mean the Content.</p>
-
-<h3>Third Party Content</h3>
-
-<p>The Content includes items that have been sourced from third parties as follows:</p>
-
-<p><b>Ant 1.5.2</b></p>
-<p>The plug-in is based on software developed by The Apache Software Foundation as part of the Jakarta project.  Therefore:</p>
-
-<blockquote>
-This product includes software developed by the Apache Software Foundation (<a href="http://www.apache.org/">http://www.apache.org/</a>).
-</blockquote>
-
-<p>The following classes (&quot;Ant Derivative Work&quot;) are based on Ant code:</p>
-
-<ul>
-	<li>InternalAntRunner contained in antsupportlib.jar and antsupportlibsrc.zip</li>
-	<li>InternalProject contained in antsupportlib.jar and antsupportlibsrc.zip</li>
-</ul>
-
-<p>The Ant Derivative Work is:</p>
-
-<blockquote>Copyright (c) 2000-2002 The Apache Software Foundation. All rights reserved.</blockquote>
-
-<p>Your use of the Ant Derivative Work is subject to the terms and conditions of the Apache Software License 1.1 which
-is available at <a href="http://ant.apache.org/manual/LICENSE">http://ant.apache.org/manual/LICENSE</a>.
-More specifically:</p>
-<blockquote>
-	1. Redistributions of source code must retain the above copyright notice, this list of<br>
-	conditions and the following disclaimer.<br>
-<br>
-	2. Redistributions in binary form must reproduce the above copyright notice, this list of<br>
-	conditions and the following disclaimer in the documentation and/or other materials<br>
-	provided with the distribution.<br>
-<br>
-	3. The end-user documentation included with the redistribution, if any, must include the<br>
-	following acknowledgment:<br>
-	<blockquote>
-		&quot;This product includes software developed by the Apache Software Foundation<br>
-		(<a href="http://www.apache.org/">http://www.apache.org/</a>).&quot;
-	</blockquote>
-	Alternately, this acknowledgment may appear in the software itself, if and wherever such<br>
-	third-party acknowledgments normally appear.<br>
-<br>
-	4. The names &quot;Ant&quot; and &quot;Apache Software Foundation&quot; must not be used to endorse or<br>
-	promote products derived from this software without prior written permission. For written<br>
-	permission, please contact <a href="mailto:apache@apache.org">apache@apache.org</a>.<br>
-<br>
-	5. Products derived from this software may not be called &quot;Apache&quot;, nor may &quot;Apache&quot; appear<br>
-	in their name, without prior written permission of the Apache Software Foundation.<br>
-<br>
-	THIS SOFTWARE IS PROVIDED &quot;AS IS&quot; AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT<br>
-	LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR<br>
-	PURPOSE ARE	DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR ITS<br>
-	CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR<br>
-	CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR<br>
-	SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON<br>
-	ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,	OR TORT (INCLUDING<br>
-	NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT	OF THE USE OF THIS SOFTWARE, EVEN IF<br>
-	ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-</blockquote>
-
-<h3>Contributions</h3>
-
-<p>If this Content is licensed to you under the terms and conditions of the CPL, any Contributions, as defined in the CPL, uploaded, submitted, or otherwise
-made available to Eclipse.org, members of Eclipse.org and/or the host of Eclipse.org web site, by you that relate to such
-Content are provided under the terms and conditions of the CPL and can be made available to others under the terms of the CPL.</p>
-
-<p>If this Content is licensed to you under license terms and conditions other than the CPL (&quot;Other License&quot;), any modifications, enhancements and/or
-other code and/or documentation (&quot;Modifications&quot;) uploaded, submitted, or otherwise made available to Eclipse.org, members of Eclipse.org and/or the
-host of Eclipse.org, by you that relate to such Content are provided under terms and conditions of the Other License and can be made available
-to others under the terms of the Other License.  In addition, with regard to Modifications for which you are the copyright holder, you are also
-providing the Modifications under the terms and conditions of the CPL and such Modifications can be made available to others under the terms of
-the CPL.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/ant/org.eclipse.ant.core/build.properties b/ant/org.eclipse.ant.core/build.properties
deleted file mode 100644
index b5703b3..0000000
--- a/ant/org.eclipse.ant.core/build.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2003 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Common Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/cpl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-source.antsupport.jar=src/
-source.lib/antsupportlib.jar=src_ant/
-src.includes=about.html,schema/
-bin.includes=plugin.xml,plugin.properties,about.html,*.jar,lib/*.jar,.options
-jars.compile.order=antsupport.jar,lib/antsupportlib.jar
-jars.extra.classpath=../org.apache.ant/ant.jar
-javadoc.packages=org.eclipse.*
\ No newline at end of file
diff --git a/ant/org.eclipse.ant.core/buildfiles/buildExtraJAR.xml b/ant/org.eclipse.ant.core/buildfiles/buildExtraJAR.xml
deleted file mode 100644
index fb8779b..0000000
--- a/ant/org.eclipse.ant.core/buildfiles/buildExtraJAR.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="Build Ant support JAR" default="build" basedir="..">
-
-	<property name="bootclasspath" value=""/>
-
-	<target name="build" description="Cleans, builds and refreshes the impacted resources">
-		<antcall target="clean"/>
-		<antcall target="lib/antsupportlib.jar"/>
-		<antcall target="refresh"/>
-	</target>
-
-	<target name="init" depends="properties">
-		<property name="plugin" value="org.eclipse.ant.core"/>
-		<property name="temp.folder" value="${basedir}/temp.folder"/>
-		<property name="build.result.folder" value="${basedir}"/>
-	</target>
-
-	<target name="properties" if="eclipse.running">
-		<property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter"/>
-	</target>
-
-	<target name="lib/antsupportlib.jar" depends="init" description="Creates the lib/antsupportlib.jar">
-		<property name="destdir" value="${temp.folder}/lib/antsupportlib.jar.bin"/>
-		<delete dir="${temp.folder}/lib/antsupportlib.jar.bin"/>
-		<mkdir dir="${temp.folder}/lib/antsupportlib.jar.bin"/>
-		<!-- compile the source code -->
-		<javac target="1.3" source="1.3" destdir="${temp.folder}/lib/antsupportlib.jar.bin"
-			failonerror="true"
-			verbose="false"
-			debug="on"
-			includeAntRuntime="no"
-			bootclasspath="${bootclasspath}" 
-			classpath="${basedir}/../org.eclipse.core.runtime/runtime.jar;
-					${basedir}/../org.apache.ant/ant.jar;
-					${basedir}/bin">
-			<src path="src_ant/"/>
-		</javac>
-		<!-- copy necessary resources -->
-		<copy todir="${temp.folder}/lib/antsupportlib.jar.bin">
-			<fileset dir="src_ant/" excludes="**/*.java"/>
-		</copy>
-		<mkdir dir="${build.result.folder}/lib"/>
-		<jar jarfile="${build.result.folder}/lib/antsupportlib.jar" basedir="${temp.folder}/lib/antsupportlib.jar.bin"/>
-		<delete dir="${temp.folder}"/>
-	</target>
-
-	<target name="clean" depends="init">
-		<delete file="${build.result.folder}/lib/antsupportlib.jar"/>
-		<delete dir="${temp.folder}"/>
-	</target>
-
-	<target name="refresh" depends="init" if="eclipse.running">
-		<eclipse.refreshLocal resource="${plugin}" depth="infinite"/>
-	</target>
-
-</project>
diff --git a/ant/org.eclipse.ant.core/buildfiles/exportplugin.xml b/ant/org.eclipse.ant.core/buildfiles/exportplugin.xml
deleted file mode 100644
index cb24504..0000000
--- a/ant/org.eclipse.ant.core/buildfiles/exportplugin.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<!-- Export a jar of .class files for the org.eclipse.ant.core Eclipse plug-in
-     along with other important plugin files to the "plugin-export" subdirectory
-     of the target Eclipse installation -->
-<project name="Export ant.core" default="export" basedir="..">
-
-	<!-- Set the timestamp and important properties -->
-	<target name="init">
-		<tstamp/>
-		<property name="destdir" value="../../plugin-export" />
-		<property name="dest"  value="${destdir}/org.eclipse.ant.core_2.1.0" />
-	</target>
-
-	<!-- Create the jar of .class files, and copy other important files to export dir -->
-	<target name="export" depends="init">
-		<mkdir dir="${destdir}" />
-		<delete dir="${dest}" />
-		<mkdir dir="${dest}" />
-		<delete dir="${dest}/lib"/>
-		<mkdir dir="${dest}/lib"/>
-		<jar jarfile="${dest}/antsupport.jar">
-			<fileset dir="bin">
-				<exclude name="org/eclipse/ant/internal/core/ant/*"/>
-			</fileset>
-		</jar>
-		<!-- Create the source zip -->
-		<zip zipfile="${dest}/antsupportsrc.zip">
-			<fileset dir="src"/>
-		</zip>
-		<copy file="plugin.xml" todir="${dest}"/>
-		<copy file="plugin.properties" todir="${dest}"/>
-		<copy file=".classpath" todir="${dest}"/>
-		<copy file=".options" todir="${dest}"/>
-		<ant antfile="buildfiles/buildExtraJAR.xml" target="build"/>
-		<copy file="lib/antsupportlib.jar" todir="${dest}/lib"/>
-	</target>
-	
-</project>
diff --git a/ant/org.eclipse.ant.core/buildnotes_platform-ant.html b/ant/org.eclipse.ant.core/buildnotes_platform-ant.html
deleted file mode 100644
index e19483c..0000000
--- a/ant/org.eclipse.ant.core/buildnotes_platform-ant.html
+++ /dev/null
@@ -1,117 +0,0 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
-<html>
-<head>
-   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-   <meta name="GENERATOR" content="Mozilla/4.7 [en] (WinNT; I) [Netscape]">
-   <title>Eclipse Platform Release Notes Ant</title>
-</head>
-<body>
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build June 10, 2003
-
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=38023">38023</a>: NPE attempting to Run as > Ant Build<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=38645">38645</a>: Exception occured creating launch configuration tabs<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=34683">34683</a>: Standardize the parser used throughout ExternalTools<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=38609">38609</a>: External tool project builders always run in background<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build June 3, 2003
-
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=38142">38142</a>: Unknown extension point specified in org.eclipse.ui.externaltools<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=37522">37522</a>: properties with capitals are lost in content assist<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=38029">38029</a>: Build fails resulting from errors in build file provides no link<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=37516">37516</a>: AntRunner should return an IPlatformRunnable return code<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=38284">38284</a>: [External Tools] Illegal access to DebugUIPlugin<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=37529">37529</a>: Ant UI tests failing<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=38287">38287</a>: TVT21: Use of variable makes the string difficult to translate<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build May 13, 2003
-
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=37060">37060</a>: Ant core preference store persistance<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=37173">37173</a>: VariableSelectionDialog needs a key listener<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=37451">37451</a>: XDOCtasks.xml does not need to be included in binary plugin<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=37520">37520</a>: Cannot edit properties from double click<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=37502">37502</a>: Property icon missing in Ant editor outline and from content assist proposals<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=35834">35834</a>: Action set icons: some color; some not<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=32444">32444</a>: No configurability for code completion in Ant Editor<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=20169">20169</a>: Help context ids for External tools<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=25337">25337</a>: External Builder Configuration<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=31699">31699</a>: Ant editor completion should provide minimal required keys<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=36869">36869</a>: WorkingSetComponent should allow creating/editing of working sets<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=36971">36971</a>: Classpath not set correctly for parsing target<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build May 06, 2003
-
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=36574">36574</a>: Additional classpath entries on Ant dont take effect<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=36848">36848</a>: Support double-click in variable selection dialog<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=37088">37088</a>: Argument expansion consistently fails<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=37074">37074</a>: External tool builders should not default to run in the background<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=37007">37007</a>: NPE with missing name for property<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=37185">37185</a>: Properties not sorted properly after edit<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=37059">37059</a>: Better error reporting when arguments cannot be expanded<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=37094">37094</a>: Specifying -D with spaces differs from cmd line<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=36875">36875</a>: Targets tab defaults 50/50 split for names and descriptions<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build April 29, 2003
-
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=35511">35511</a>: NPE running external tools<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=36444">36444</a>: Ant view needs a refresh action<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=36581">36581</a>: External tool closed when Eclipse exits<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=29316">29316</a>: Classpath entries and task/type paths separators not platform specific<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=36870">36870</a>: Separate the Ant UI from ExternalToolsUI<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=37056">37056</a>: NPE creating new Ant config<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=36937">36937</a>: WorkingSetComponent should set the working set images<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=36538">36538</a>: Add a ${variable} that prompts the user with a dialog<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build April 22, 2003
-
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=35507">35507</a>: Preference pages do not set help on control<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=35508">35508</a>: Ant editor preference page doesn't set widget fonts<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=34608">34608</a>: Exception using content assist<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=35497">35497</a>: ArrayIndexOutOfBounds on external tools page<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=35726">35726</a>: Remove unused icons in External Tools<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=34984">34984</a>: RunTargetAction causing parsing of build file out of ProjectNode<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=36076">36076</a>: Ant View does not refresh for projects outside the workspace<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=31691">31691</a>: Allow unrecognized arguments to pass through<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=34488">34488</a>: When "-quiet" no report of build success or failure<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=36570">36570</a>: Ant view parses files during shutdown<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=34709">34709</a>: Should be allowed to apply changes to Ant launch config when errors<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=35648">35648</a>: No help context for variable selection dialog<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=36660">36660</a>: Double click in external tool builder property page should invoke edit<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=36728">36728</a>: NPE after upgrading<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=36353">36353</a>: Move to Ant 1.5.3<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=27245">27245</a>: If Ant "core" classes cannot be found, no error reported<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=34645">34645</a>: Representation of default targets<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=36158">36158</a>: Workbench Help set on wrong Composite<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=36596">36596</a>: No completion proposals for properties that contain '-'<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=36412">36412</a>: Refreshing for specific resource should set an initial selection<br>
-</body>
-</html>
diff --git a/ant/org.eclipse.ant.core/doc/org_eclipse_ant_core.html b/ant/org.eclipse.ant.core/doc/org_eclipse_ant_core.html
deleted file mode 100644
index 08f87c4..0000000
--- a/ant/org.eclipse.ant.core/doc/org_eclipse_ant_core.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
-<html>
-<head>
-   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-   <title>Ant Build Tool Core extension-points</title>
-</head>
-<body link="#0000FF" vlink="#800080">
-
-<center>
-<h1>
-Ant Build Tool Core Plug-in</h1></center>
-This document lists all of the extension points that the Ant Build Tool Core
-plug-in makes available to tool developers.
-<p>
-<hr WIDTH="100%">
-<h1>
-General Extension Points</h1>
-The following extension points can be used to extend the fundamental capabilities
-of the Ant core plug-in:
-<ul>
-<li>
-<a href="org_eclipse_ant_core_antTasks.html">org.eclipse.ant.core.antTasks</a></li>
-
-<li>
-<a href="org_eclipse_ant_core_antTypes.html">org.eclipse.ant.core.antTypes</a></li>
-<li>
-<a href="org_eclipse_ant_core_extraClasspathEntries.html">org.eclipse.ant.core.extraClasspathEntries</a></li>
-</ul>
-<a href="hglegal2003.htm"><img SRC="ngibmcpy2003.gif" ALT="Copyright IBM Corp. 2000, 2003.  All Rights Reserved." BORDER=0 height=14 width=324></a>
-</body>
-</html>
diff --git a/ant/org.eclipse.ant.core/doc/org_eclipse_ant_core_antTasks.html b/ant/org.eclipse.ant.core/doc/org_eclipse_ant_core_antTasks.html
deleted file mode 100644
index 1346c07..0000000
--- a/ant/org.eclipse.ant.core/doc/org_eclipse_ant_core_antTasks.html
+++ /dev/null
@@ -1,68 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HEAD><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<STYLE type="text/css">
-div.dtd-fragment {
-	width: 100%;
-	border: none;
-	background-color: #eee;
-}
-</STYLE>
-</HEAD>
-<HTML>
-<BODY>
-<H1><CENTER>Ant Tasks</CENTER></H1>
-<b><i>Identifier: </i></b>org.eclipse.ant.core.antTasks<p>
-<b><i>Description: </i></b>Allows plug-ins to define arbitrary Ant tasks for use 
-by the Ant infrastructure.  The standard Ant infrastructure 
-allows for the addition of arbitrary tasks.  
-Unfortunately, it is unlikely that the Ant Core plug-in 
-would have the classes required by these tasks on its 
-classpath (or that of any of its prerequisites).  
-To address this, clients should define an extension 
-which plugs into this extension-point and maps a 
-task name onto a class.  The Ant plug-in can then 
-request that the declaring plug-in load the specified class.<p><b><i>Configuration Markup:</i></b><p>
-<p><samp><font color="#800000">&nbsp;&nbsp; &lt;!ELEMENT <a name="e.extension">extension</a> (<a href="#e.antTask">antTask</a>*)&gt;</font></samp>
-<br><br><samp><font color="#800000">&nbsp;&nbsp; &lt;!ATTLIST extension</samp>
-<br><samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;point&nbsp;CDATA #REQUIRED</samp>
-<br><samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;id&nbsp;&nbsp;&nbsp;&nbsp;CDATA #IMPLIED</samp>
-<br><samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;name&nbsp;&nbsp;CDATA #IMPLIED</samp>
-<br><samp>&nbsp;&nbsp; &gt;</font></samp>
-<ul>
-<li><b>point</b> - a fully qualified identifier of the target extension point</li>
-<li><b>id</b> - an optional identifier of the extension instance</li>
-<li><b>name</b> - an optional name of the extension instance</li>
-</ul>
-<p><samp><font color="#800000">&nbsp;&nbsp; &lt;!ELEMENT <a name="e.antTask">antTask</a> EMPTY&gt;</font></samp>
-<br><br><samp><font color="#800000">&nbsp;&nbsp; &lt;!ATTLIST antTask</samp>
-<br><samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;name&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #REQUIRED</samp>
-<br><samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;class&nbsp;&nbsp;&nbsp;&nbsp;CDATA #REQUIRED</samp>
-<br><samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;library&nbsp;&nbsp;CDATA #REQUIRED</samp>
-<br><samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;headless&nbsp;CDATA #IMPLIED</samp>
-<br><samp>&nbsp;&nbsp; &gt;</font></samp>
-<ul>
-<li><b>name</b> - name of the task to be defined</li>
-<li><b>class</b> - the fully qualified name of a Java class implementing 
-the task.  Generally this class must be a subclass of
-<samp>org.apache.tools.ant.Task</samp>.</li>
-<li><b>library</b> - a path relative to the plug-in install location
-for the library containing the task.</li>
-<li><b>headless</b> - indicates whether this task is suitable for use in a "headless" Ant environment. If running headless and the attribute is "false", 
-                  the task will not be loaded or defined. As well, the plugin class loader will not be added as a parent classloader to the Ant classloader.
-                  The implied value is true, when not specified.</li>
-</ul>
-<b><i>Examples: </i></b>The following is an example of an Ant tasks extension point: 
-<p>
-<pre>
-   <font color="#000080">&lt;extension point=<font color="#008000">&quot;org.eclipse.ant.core.antTasks&quot;</font>&gt;</font>
-      <font color="#000080">&lt;antTask name=<font color="#008000">&quot;coolTask&quot;</font> class=<font color="#008000">&quot;com.example.CoolTask&quot;</font>/&gt;</font>
-   <font color="#000080">&lt;/extension&gt;</font> 
-</pre>
-</p><p>
-<b><i>Supplied Implementation: </i></b>The platform itself supplies a number of tasks including 
-eclipse.incrementalBuild and eclipse.refreshLocal.<p>
-<font size="-1" color="#336699">
-<a href="hglegal.htm"><img SRC="ngibmcpy.gif" ALT="Copyright IBM Corp. 2000, 2003.  All Rights Reserved." BORDER=0 height=14 width=324></a><p>
-</font>
-</BODY>
-</HTML>
diff --git a/ant/org.eclipse.ant.core/doc/org_eclipse_ant_core_antTypes.html b/ant/org.eclipse.ant.core/doc/org_eclipse_ant_core_antTypes.html
deleted file mode 100644
index 8f1f125..0000000
--- a/ant/org.eclipse.ant.core/doc/org_eclipse_ant_core_antTypes.html
+++ /dev/null
@@ -1,67 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HEAD><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<STYLE type="text/css">
-div.dtd-fragment {
-	width: 100%;
-	border: none;
-	background-color: #eee;
-}
-</STYLE>
-</HEAD>
-<HTML>
-<BODY>
-<H1><CENTER>Ant Types</CENTER></H1>
-<b><i>Identifier: </i></b>org.eclipse.ant.core.antTypes<p>
-<b><i>Description: </i></b>Allows plug-ins to define arbitrary Ant datatypes for 
-use by the Ant infrastructure.  The standard Ant 
-infrastructure allows for the addition of arbitrary 
-datatypes.  Unfortunately, it is unlikely that the 
-Ant Core plug-in would have the classes required 
-by these datatypes on its classpath (or that of any 
-of its prerequisites).  To address this, clients 
-should define an extension which plugs into this 
-extension-point and maps a datatype name onto a class.  
-The Ant plug-in can then request that the declaring 
-plug-in load the specified class.<p><b><i>Configuration Markup:</i></b><p>
-<p><samp><font color="#800000">&nbsp;&nbsp; &lt;!ELEMENT <a name="e.extension">extension</a> (<a href="#e.antType">antType</a>*)&gt;</font></samp>
-<br><br><samp><font color="#800000">&nbsp;&nbsp; &lt;!ATTLIST extension</samp>
-<br><samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;point&nbsp;CDATA #REQUIRED</samp>
-<br><samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;id&nbsp;&nbsp;&nbsp;&nbsp;CDATA #IMPLIED</samp>
-<br><samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;name&nbsp;&nbsp;CDATA #IMPLIED</samp>
-<br><samp>&nbsp;&nbsp; &gt;</font></samp>
-<ul>
-<li><b>point</b> - a fully qualified identifier of the target extension point</li>
-<li><b>id</b> - an optional identifier of the extension instance</li>
-<li><b>name</b> - an optional name of the extension instance</li>
-</ul>
-<p><samp><font color="#800000">&nbsp;&nbsp; &lt;!ELEMENT <a name="e.antType">antType</a> EMPTY&gt;</font></samp>
-<br><br><samp><font color="#800000">&nbsp;&nbsp; &lt;!ATTLIST antType</samp>
-<br><samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;name&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #REQUIRED</samp>
-<br><samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;class&nbsp;&nbsp;&nbsp;&nbsp;CDATA #REQUIRED</samp>
-<br><samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;library&nbsp;&nbsp;CDATA #REQUIRED</samp>
-<br><samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;headless&nbsp;CDATA #IMPLIED</samp>
-<br><samp>&nbsp;&nbsp; &gt;</font></samp>
-<ul>
-<li><b>name</b> - name of the type to be defined</li>
-<li><b>class</b> - the fully qualified name of a Java class implementing 
-the datatype.  Generally this class must be a subclass of
-<samp>org.apache.tools.ant.types.DataType</samp>.</li>
-<li><b>library</b> - a path relative to the plug-in install location
-for the library containing the type.</li>
-<li><b>headless</b> - indicates whether this type is suitable for use in a "headless" Ant environment. If running headless and the attribute is "false", 
-                  the type will not be loaded or defined. As well, the plugin class loader will not be added as a parent classloader to the Ant classloader.
-                  The implied value is true, when not specified.</li>
-</ul>
-<b><i>Examples: </i></b>The following is an example of an Ant types extension point: 
-<p>
-<pre>
-   <font color="#000080">&lt;extension point=<font color="#008000">&quot;org.eclipse.ant.core.antTypes&quot;</font>&gt;</font>
-      <font color="#000080">&lt;antType name=<font color="#008000">&quot;coolType&quot;</font> class=<font color="#008000">&quot;com.example.CoolType&quot;</font>/&gt;</font>
-   <font color="#000080">&lt;/extension&gt;</font> 
-</pre>
-</p><p>
-<font size="-1" color="#336699">
-<a href="hglegal.htm"><img SRC="ngibmcpy.gif" ALT="Copyright IBM Corp. 2000, 2003.  All Rights Reserved." BORDER=0 height=14 width=324></a><p>
-</font>
-</BODY>
-</HTML>
diff --git a/ant/org.eclipse.ant.core/doc/org_eclipse_ant_core_extraClasspathEntries.html b/ant/org.eclipse.ant.core/doc/org_eclipse_ant_core_extraClasspathEntries.html
deleted file mode 100644
index 5c2e35c..0000000
--- a/ant/org.eclipse.ant.core/doc/org_eclipse_ant_core_extraClasspathEntries.html
+++ /dev/null
@@ -1,55 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HEAD><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<STYLE type="text/css">
-div.dtd-fragment {
-	width: 100%;
-	border: none;
-	background-color: #eee;
-}
-</STYLE>
-</HEAD>
-<HTML>
-<BODY>
-<H1><CENTER>Extra Ant Classpath Entries</CENTER></H1>
-<b><i>Identifier: </i></b>org.eclipse.ant.core.extraClasspathEntries<p>
-<b><i>Description: </i></b>Allows plug-ins to define arbitrary JARs for use by the Ant infrastructure.
-These JARs are put into the Ant classpath at runtime.  Besides
-the JAR, the plug-in classloader of the plug-in providing the
-JAR is also added to the classpath.<p><b><i>Configuration Markup:</i></b><p>
-<p><samp><font color="#800000">&nbsp;&nbsp; &lt;!ELEMENT <a name="e.extension">extension</a> (<a href="#e.extraClasspathEntry">extraClasspathEntry</a>*)&gt;</font></samp>
-<br><br><samp><font color="#800000">&nbsp;&nbsp; &lt;!ATTLIST extension</samp>
-<br><samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;point&nbsp;CDATA #REQUIRED</samp>
-<br><samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;id&nbsp;&nbsp;&nbsp;&nbsp;CDATA #IMPLIED</samp>
-<br><samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;name&nbsp;&nbsp;CDATA #IMPLIED</samp>
-<br><samp>&nbsp;&nbsp; &gt;</font></samp>
-<ul>
-<li><b>point</b> - a fully qualified identifier of the target extension point</li>
-<li><b>id</b> - an optional identifier of the extension instance</li>
-<li><b>name</b> - an optional name of the extension instance</li>
-</ul>
-<p><samp><font color="#800000">&nbsp;&nbsp; &lt;!ELEMENT <a name="e.extraClasspathEntry">extraClasspathEntry</a> EMPTY&gt;</font></samp>
-<br><br><samp><font color="#800000">&nbsp;&nbsp; &lt;!ATTLIST extraClasspathEntry</samp>
-<br><samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;library&nbsp;&nbsp;CDATA #REQUIRED</samp>
-<br><samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;headless&nbsp;CDATA #IMPLIED</samp>
-<br><samp>&nbsp;&nbsp; &gt;</font></samp>
-<ul>
-<li><b>library</b> - a path relative to the plug-in install location for the library.</li>
-<li><b>headless</b> - indicates whether this extra classpath entry is suitable for use in a "headless" Ant environment. If running headless and the attribute is "false", 
-                  this entry will not be added to the Ant classpath. As well, the plugin class loader will not be added as a parent classloader to the Ant classloader.
-                  The implied value is true, when not specified.</li>
-</ul>
-<b><i>Examples: </i></b>The following is an example of an extra classpath entries extension point:
-
-<p>
-<pre>
- <font color="#000080">&lt;extension point=<font color="#008000">&quot;org.eclipse.ant.core.extraClasspathEntries&quot;</font>&gt;</font>
-  <font color="#000080">&lt;extraClasspathEntry library=<font color="#008000">&quot;myExtraLibrary.jar&quot;</font>/&gt;</font>
- <font color="#000080">&lt;/extension&gt;</font>
-</pre>
-</p><p>
-<b><i>Supplied Implementation: </i></b>The platform itself supplies an Ant support jar (antsupportlib.jar).<p>
-<font size="-1" color="#336699">
-<a href="hglegal.htm"><img SRC="ngibmcpy.gif" ALT="Copyright IBM Corp. 2000, 2003.  All Rights Reserved." BORDER=0 height=14 width=324></a><p>
-</font>
-</BODY>
-</HTML>
diff --git a/ant/org.eclipse.ant.core/lib/.cvsignore b/ant/org.eclipse.ant.core/lib/.cvsignore
deleted file mode 100644
index f0f30e5..0000000
--- a/ant/org.eclipse.ant.core/lib/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-antsupportlib.jar
diff --git a/ant/org.eclipse.ant.core/plugin.properties b/ant/org.eclipse.ant.core/plugin.properties
deleted file mode 100644
index cfbd778..0000000
--- a/ant/org.eclipse.ant.core/plugin.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2003 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Common Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/cpl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-pluginName = Ant Build Tool Core
-providerName = Eclipse.org
-classpathName = Extra Ant Classpath Entry Definitions
-tasksName = Ant Task Definitions
-typesName = Ant Type Definitions
diff --git a/ant/org.eclipse.ant.core/plugin.xml b/ant/org.eclipse.ant.core/plugin.xml
deleted file mode 100644
index c4fe15f..0000000
--- a/ant/org.eclipse.ant.core/plugin.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-   id="org.eclipse.ant.core"
-   name="%pluginName"
-   version="2.1.0"
-   provider-name="%providerName"
-   class="org.eclipse.ant.core.AntCorePlugin">
-
-   <requires>
-     <import plugin="org.apache.xerces"/>
-   </requires>
-
-   <runtime>
-     <library name="antsupport.jar">
-       <export name="*"/>
-       <packages prefixes="org.eclipse.ant"/>
-     </library>
-   </runtime>
-
-   <extension-point id="extraClasspathEntries" name="%classpathName" schema="schema/extraClasspathEntries.exsd"/>
-   <extension-point id="antTasks" name="%tasksName" schema="schema/antTasks.exsd"/>
-   <extension-point id="antTypes" name="%typesName" schema="schema/antTypes.exsd"/>
-
-   <!-- Applications -->
-   <extension
-     id="antRunner"
-     point="org.eclipse.core.runtime.applications">
-     <application>
-       <run
-         class="org.eclipse.ant.core.AntRunner">
-       </run>
-    </application>
-   </extension>
-
-   <!-- Extra Classpath -->
-   <extension point="org.eclipse.ant.core.extraClasspathEntries">
-      <extraClasspathEntry
-         library="lib/antsupportlib.jar">
-      </extraClasspathEntry>
-   </extension>
-
-</plugin>
\ No newline at end of file
diff --git a/ant/org.eclipse.ant.core/r2_0_buildnotes_platform-ant.html b/ant/org.eclipse.ant.core/r2_0_buildnotes_platform-ant.html
deleted file mode 100644
index 238d69a..0000000
--- a/ant/org.eclipse.ant.core/r2_0_buildnotes_platform-ant.html
+++ /dev/null
@@ -1,552 +0,0 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
-<html>
-<head>
-   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-   <meta name="GENERATOR" content="Mozilla/4.7 [en] (WinNT; I) [Netscape]">
-   <title>Eclipse Platform Release Notes Core</title>
-</head>
-<body>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build 20020612
-<h2>
-What's new in this drop</h2>
-
-<h3>
-API changes</h3>
-
-<ul>
-<li>
-None.</li>
-</ul>
-
-<h3>
-Other highlights</h3>
-
-<ul>
-<li>
-None.</li>
-</ul>
-
-<h3>
-Resolved Bugs</h3>
-
-<ul>
-<li>
-<a href="http://dev.eclipse.org/bugs/buglist.cgi?bug_status=RESOLVED&bug_status=VERIFIED&bug_status=CLOSED&email1=&emailtype1=substring&emailassigned_to1=1&email2=&emailtype2=substring&emailreporter2=1&bugidtype=include&bug_id=&changedin=&votes=&chfield=bug_status&chfieldfrom=2002%2F06%2F11&chfieldto=2002%2F06%2F12&chfieldvalue=&product=Platform&component=Ant&short_desc=&short_desc_type=allwordssubstr&long_desc=&long_desc_type=allwordssubstr&keywords=&keywords_type=anywords&field0-0-0=noop&type0-0-0=noop&value0-0-0=&field0-0-1=noop&type0-0-1=noop&value0-0-1=&cmdtype=doit&order=Bug+Number">Click
-here</a> to see PRs which have been marked as RESOLVED, VERIFIED or CLOSED
-since the last integration build.</li>
-</ul>
-
-<h1>
-
-<hr WIDTH="100%">Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build 20020611
-<h2>
-What's new in this drop</h2>
-
-<h3>
-API changes</h3>
-
-<ul>
-<li>
-None.</li>
-</ul>
-
-<h3>
-Other highlights</h3>
-
-<ul>
-<li>
-None.</li>
-</ul>
-
-<h3>
-Resolved Bugs</h3>
-
-<ul>
-<li>
-<a href="http://dev.eclipse.org/bugs/buglist.cgi?bug_status=RESOLVED&bug_status=VERIFIED&bug_status=CLOSED&email1=&emailtype1=substring&emailassigned_to1=1&email2=&emailtype2=substring&emailreporter2=1&bugidtype=include&bug_id=&changedin=&votes=&chfield=bug_status&chfieldfrom=2002%2F06%2F07&chfieldto=2002%2F06%2F11&chfieldvalue=&product=Platform&component=Ant&short_desc=&short_desc_type=allwordssubstr&long_desc=&long_desc_type=allwordssubstr&keywords=&keywords_type=anywords&field0-0-0=noop&type0-0-0=noop&value0-0-0=&field0-0-1=noop&type0-0-1=noop&value0-0-1=&cmdtype=doit&order=Bug+Number">Click
-here</a> to see PRs which have been marked as RESOLVED, VERIFIED or CLOSED
-since the last integration build.</li>
-</ul>
-
-<h1>
-
-<hr WIDTH="100%">Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build 20020607
-<h2>
-What's new in this drop</h2>
-
-<h3>
-API changes</h3>
-
-<ul>
-<li>
-None.</li>
-</ul>
-
-<h3>
-Other highlights</h3>
-
-<ul>
-<li>
-None.</li>
-</ul>
-
-<h3>
-Resolved Bugs</h3>
-
-<ul>
-<li>
-<a href="http://dev.eclipse.org/bugs/buglist.cgi?bug_status=RESOLVED&bug_status=VERIFIED&bug_status=CLOSED&email1=&emailtype1=substring&emailassigned_to1=1&email2=&emailtype2=substring&emailreporter2=1&bugidtype=include&bug_id=&changedin=&votes=&chfield=bug_status&chfieldfrom=2002%2F05%2F31&chfieldto=2002%2F06%2F07&chfieldvalue=&product=Platform&component=Ant&short_desc=&short_desc_type=allwordssubstr&long_desc=&long_desc_type=allwordssubstr&keywords=&keywords_type=anywords&field0-0-0=noop&type0-0-0=noop&value0-0-0=&field0-0-1=noop&type0-0-1=noop&value0-0-1=&cmdtype=doit&order=Bug+Number">Click
-here</a> to see PRs which have been marked as RESOLVED, VERIFIED or CLOSED
-since the last integration build.</li>
-</ul>
-
-<h1>
-
-<hr WIDTH="100%">Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build 20020531
-<h2>
-What's new in this drop</h2>
-
-<h3>
-API changes</h3>
-
-<ul>
-<li>
-None.</li>
-</ul>
-
-<h3>
-Other highlights</h3>
-
-<ul>
-<li>
-None.</li>
-</ul>
-
-<h3>
-Resolved Bugs</h3>
-
-<ul>
-<li>
-<a href="http://dev.eclipse.org/bugs/buglist.cgi?bug_status=RESOLVED&bug_status=VERIFIED&bug_status=CLOSED&email1=&emailtype1=substring&emailassigned_to1=1&email2=&emailtype2=substring&emailreporter2=1&bugidtype=include&bug_id=&changedin=&votes=&chfield=bug_status&chfieldfrom=2002%2F05%2F30&chfieldto=2002%2F05%2F31&chfieldvalue=&product=Platform&component=Ant&short_desc=&short_desc_type=allwordssubstr&long_desc=&long_desc_type=allwordssubstr&keywords=&keywords_type=anywords&field0-0-0=noop&type0-0-0=noop&value0-0-0=&field0-0-1=noop&type0-0-1=noop&value0-0-1=&cmdtype=doit&order=Bug+Number">Click
-here</a> to see PRs which have been marked as RESOLVED, VERIFIED or CLOSED
-since the last integration build.</li>
-</ul>
-
-<hr WIDTH="100%">
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build 20020530
-<h2>
-What's new in this drop</h2>
-
-<h3>
-API changes</h3>
-
-<ul>
-<li>
-None.</li>
-</ul>
-
-<h3>
-Other highlights</h3>
-
-<ul>
-<li>
-None.</li>
-</ul>
-
-<h3>
-Resolved Bugs</h3>
-
-<ul>
-<li>
-<a href="http://dev.eclipse.org/bugs/buglist.cgi?bug_status=RESOLVED&bug_status=VERIFIED&bug_status=CLOSED&email1=&emailtype1=substring&emailassigned_to1=1&email2=&emailtype2=substring&emailreporter2=1&bugidtype=include&bug_id=&changedin=&votes=&chfield=bug_status&chfieldfrom=2002%2F05%2F29&chfieldto=2002%2F05%2F30&chfieldvalue=&product=Platform&component=Ant&short_desc=&short_desc_type=allwordssubstr&long_desc=&long_desc_type=allwordssubstr&keywords=&keywords_type=anywords&field0-0-0=noop&type0-0-0=noop&value0-0-0=&cmdtype=doit&order=Bug+Number">Click
-here</a> to see PRs which have been marked as RESOLVED, VERIFIED or CLOSED
-since the last integration build.</li>
-</ul>
-
-<h1>
-
-<hr WIDTH="100%">Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build 20020529
-<h2>
-What's new in this drop</h2>
-
-<h3>
-API changes</h3>
-
-<ul>
-<li>
-None.</li>
-</ul>
-
-<h3>
-Other highlights</h3>
-
-<ul>
-<li>
-None.</li>
-</ul>
-
-<h3>
-Resolved Bugs</h3>
-
-<ul>
-<li>
-<a href="http://dev.eclipse.org/bugs/buglist.cgi?bug_status=RESOLVED&bug_status=VERIFIED&bug_status=CLOSED&email1=&emailtype1=substring&emailassigned_to1=1&email2=&emailtype2=substring&emailreporter2=1&bugidtype=include&bug_id=&changedin=&votes=&chfield=bug_status&chfieldfrom=2002%2F05%2F21&chfieldto=2002%2F05%2F29&chfieldvalue=&product=Platform&component=Ant&short_desc=&short_desc_type=allwordssubstr&long_desc=&long_desc_type=allwordssubstr&keywords=&keywords_type=anywords&field0-0-0=noop&type0-0-0=noop&value0-0-0=&cmdtype=doit&order=Bug+Number">Click
-here</a> to see PRs which have been marked as RESOLVED, VERIFIED or CLOSED
-since the last integration build.</li>
-</ul>
-
-<h1>
-
-<hr WIDTH="100%">Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build 20020521
-<h2>
-What's new in this drop</h2>
-
-<h3>
-API changes</h3>
-
-<ul>
-<li>
-The plug-in <b><tt>org.eclipse.ant.ui</tt></b> has been removed in favor
-of <b><tt>org.eclipse.ui.externaltools</tt></b>.</li>
-</ul>
-
-<h3>
-Other highlights</h3>
-
-<ul>
-<li>
-None.</li>
-</ul>
-
-<h3>
-Resolved Bugs</h3>
-
-<ul>
-<li>
-<a href="http://dev.eclipse.org/bugs/buglist.cgi?bug_status=RESOLVED&bug_status=VERIFIED&bug_status=CLOSED&email1=&emailtype1=substring&emailassigned_to1=1&email2=&emailtype2=substring&emailreporter2=1&bugidtype=include&bug_id=&changedin=&votes=&chfield=bug_status&chfieldfrom=2002%2F05%2F14&chfieldto=2002%2F05%2F21&chfieldvalue=&product=Platform&component=Ant&short_desc=&short_desc_type=allwordssubstr&long_desc=&long_desc_type=allwordssubstr&keywords=&keywords_type=anywords&field0-0-0=noop&type0-0-0=noop&value0-0-0=&cmdtype=doit&order=Bug+Number">Click
-here</a> to see PRs which have been marked as RESOLVED, VERIFIED or CLOSED
-since the last integration build.</li>
-</ul>
-
-<hr WIDTH="100%">
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build 20020514
-<h2>
-What's new in this drop</h2>
-
-<h3>
-API changes</h3>
-
-<ul>
-<li>
-None.</li>
-</ul>
-
-<h3>
-Other highlights</h3>
-
-<ul>
-<li>
-Ant type eclipse.commapatternset has been removed.</li>
-</ul>
-
-<h3>
-Resolved Bugs</h3>
-
-<ul>
-<li>
-<a href="http://dev.eclipse.org/bugs/buglist.cgi?bug_status=RESOLVED&bug_status=VERIFIED&bug_status=CLOSED&email1=&emailtype1=substring&emailassigned_to1=1&email2=&emailtype2=substring&emailreporter2=1&bugidtype=include&bug_id=&changedin=&votes=&chfield=bug_status&chfieldfrom=2002%2F04%2F30&chfieldto=2002%2F05%2F14&chfieldvalue=&product=Platform&component=Ant&short_desc=&short_desc_type=allwordssubstr&long_desc=&long_desc_type=allwordssubstr&keywords=&keywords_type=anywords&field0-0-0=noop&type0-0-0=noop&value0-0-0=&cmdtype=doit&order=Bug+Number">Click
-here</a> to see PRs which have been marked as RESOLVED, VERIFIED or CLOSED
-since the last integration build.</li>
-</ul>
-
-<h1>
-
-<hr WIDTH="100%">Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build 20020430
-<h2>
-What's new in this drop</h2>
-
-<h3>
-API changes</h3>
-
-<ul>
-<li>
-None.</li>
-</ul>
-
-<h3>
-Other highlights</h3>
-
-<ul>
-<li>
-Type commapatternset is now called eclipse.commapatternset .</li>
-</ul>
-
-<h3>
-Resolved Bugs</h3>
-
-<ul>
-<li>
-<a href="http://dev.eclipse.org/bugs/buglist.cgi?bug_status=RESOLVED&bug_status=VERIFIED&bug_status=CLOSED&email1=&emailtype1=substring&emailassigned_to1=1&email2=&emailtype2=substring&emailreporter2=1&bugidtype=include&bug_id=&changedin=&votes=&chfield=bug_status&chfieldfrom=2002%2F04%2F12&chfieldto=2002%2F04%2F30&chfieldvalue=&product=Platform&component=Ant&short_desc=&short_desc_type=allwordssubstr&long_desc=&long_desc_type=allwordssubstr&keywords=&keywords_type=anywords&field0-0-0=noop&type0-0-0=noop&value0-0-0=&cmdtype=doit&order=Bug+Number">Click
-here</a> to see PRs which have been marked as RESOLVED, VERIFIED or CLOSED
-since the last integration build.</li>
-</ul>
-
-<h1>
-
-<hr WIDTH="100%">Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build 20020411
-<h2>
-What's new in this drop</h2>
-
-<h3>
-API changes</h3>
-
-<ul>
-<li>
-None.</li>
-</ul>
-
-<h3>
-Other highlights</h3>
-
-<ul>
-<li>
-None.</li>
-</ul>
-
-<h3>
-Resolved Bugs</h3>
-
-<ul>
-<li>
-<a href="http://dev.eclipse.org/bugs/buglist.cgi?bug_status=RESOLVED&bug_status=VERIFIED&bug_status=CLOSED&email1=&emailtype1=substring&emailassigned_to1=1&email2=&emailtype2=substring&emailreporter2=1&bugidtype=include&bug_id=&changedin=&votes=&chfield=bug_status&chfieldfrom=2002%2F04%2F09&chfieldto=2002%2F04%2F12&chfieldvalue=&product=Platform&component=Ant&short_desc=&short_desc_type=allwordssubstr&long_desc=&long_desc_type=allwordssubstr&keywords=&keywords_type=anywords&field0-0-0=noop&type0-0-0=noop&value0-0-0=&cmdtype=doit&namedcmd=Active&newqueryname=&order=Bug+Number">Click
-here</a> to see PRs which have been marked as RESOLVED, VERIFIED or CLOSED
-since the last integration build.</li>
-</ul>
-
-<h1>
-
-<hr WIDTH="100%">Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build 20020409
-<h2>
-What's new in this drop</h2>
-
-<h3>
-API changes</h3>
-
-<ul>
-<li>
-<b><tt>org.eclipse.ant.core</tt></b> does not export <b><tt>org.apache.ant</tt></b>
-anymore. Plug-ins that need to have access to Ant classes need to require
-<b><tt>org.apache.ant</tt></b>
-directly.</li>
-
-<li>
-Tasks <b><tt>refreshLocal</tt></b> and <b><tt>incrementalBuild</tt></b>
-are not available anymore. Use <b><tt>eclipse.refreshLocal</tt></b> and
-<b><tt>eclipse.incrementalBuild</tt></b>
-instead.</li>
-</ul>
-
-<h3>
-Other highlights</h3>
-
-<ul>
-<li>
-New property <b><tt>eclipse.running</tt></b> is set for scripts running
-inside Eclipse.</li>
-
-<li>
-It is now possible to extend the Ant classpath by adding new JARs, folders,
-tasks and types through a preference (Workbench->Preferences->Ant->Customize).</li>
-</ul>
-
-<h3>
-Resolved Bugs</h3>
-
-<ul>
-<li>
-<a href="http://dev.eclipse.org/bugs/buglist.cgi?bug_status=RESOLVED&bug_status=VERIFIED&bug_status=CLOSED&email1=&emailtype1=substring&emailassigned_to1=1&email2=&emailtype2=substring&emailreporter2=1&bugidtype=include&bug_id=&changedin=&votes=&chfield=bug_status&chfieldfrom=2002%2F01%2F29&chfieldto=2002%2F04%2F09&chfieldvalue=&product=Platform&component=Ant&short_desc=&short_desc_type=allwordssubstr&long_desc=&long_desc_type=allwordssubstr&keywords=&keywords_type=anywords&field0-0-0=noop&type0-0-0=noop&value0-0-0=&cmdtype=doit&namedcmd=Active&newqueryname=&order=Bug+Number">Click
-here</a> to see PRs which have been marked as RESOLVED, VERIFIED or CLOSED
-since the last integration build.</li>
-</ul>
-
-<h1>
-
-<hr WIDTH="100%">Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build 20020129
-<h2>
-What's new in this drop</h2>
-
-<h3>
-API changes</h3>
-
-<ul>
-<li>
-None.</li>
-</ul>
-
-<h3>
-Other highlights</h3>
-
-<ul>
-<li>
-None.</li>
-</ul>
-
-<h3>
-Resolved Bugs</h3>
-
-<ul>
-<li>
-<a href="http://dev.eclipse.org/bugs/buglist.cgi?bug_status=RESOLVED&bug_status=VERIFIED&bug_status=CLOSED&email1=&emailtype1=substring&emailassigned_to1=1&email2=&emailtype2=substring&emailreporter2=1&bugidtype=include&bug_id=&changedin=&votes=&chfield=bug_status&chfieldfrom=2001%2F12%2F17&chfieldto=2002%2F01%2F29&chfieldvalue=&product=Platform&component=Ant&short_desc=&short_desc_type=allwordssubstr&long_desc=&long_desc_type=allwordssubstr&keywords=&keywords_type=anywords&field0-0-0=noop&type0-0-0=noop&value0-0-0=&cmdtype=doit&namedcmd=ant&newqueryname=&order=Bug+Number">Click
-here</a> to see PRs which have been marked as RESOLVED, VERIFIED or CLOSED
-since the last integration build.</li>
-</ul>
-
-<h1>
-
-<hr WIDTH="100%">Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build 20011218
-<h2>
-What's new in this drop</h2>
-
-<h3>
-API changes</h3>
-
-<ul>
-<li>
-None.</li>
-</ul>
-
-<h3>
-Other highlights</h3>
-
-<ul>
-<li>
-None.</li>
-</ul>
-
-<h3>
-Resolved Bugs</h3>
-
-<ul>
-<li>
-<a href="http://dev.eclipse.org/bugs/buglist.cgi?bug_status=RESOLVED&bug_status=VERIFIED&bug_status=CLOSED&email1=&emailtype1=substring&emailassigned_to1=1&email2=&emailtype2=substring&emailreporter2=1&bugidtype=include&bug_id=&changedin=&votes=&chfield=bug_status&chfieldfrom=2001%2F12%2F11&chfieldto=2001%2F12%2F17&chfieldvalue=&product=Platform&component=Ant&short_desc=&short_desc_type=allwordssubstr&long_desc=&long_desc_type=allwordssubstr&keywords=&keywords_type=anywords&field0-0-0=noop&type0-0-0=noop&value0-0-0=&cmdtype=doit&namedcmd=ant&newqueryname=&order=Bug+Number">Click
-here</a> to see PRs which have been marked as RESOLVED, VERIFIED or CLOSED
-since the last integration build.</li>
-</ul>
-
-<h1>
-
-<hr WIDTH="100%">Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build 20011211
-<h2>
-What's new in this drop</h2>
-
-<h3>
-API changes</h3>
-
-<ul>
-<li>
-None.</li>
-</ul>
-
-<h3>
-Other highlights</h3>
-
-<ul>
-<li>
-Ant code from Apache has moved to a new plug-in called org.apache.ant..</li>
-</ul>
-
-<h3>
-Resolved Bugs</h3>
-
-<ul>
-<li>
-<a href="http://dev.eclipse.org/bugs/buglist.cgi?bug_status=RESOLVED&bug_status=VERIFIED&bug_status=CLOSED&email1=&emailtype1=substring&emailassigned_to1=1&email2=&emailtype2=substring&emailreporter2=1&bugidtype=include&bug_id=&changedin=&votes=&chfield=bug_status&chfieldfrom=2001%2F11%2F27&chfieldto=2001%2F12%2F10&chfieldvalue=&product=Platform&component=Ant&short_desc=&short_desc_type=allwordssubstr&long_desc=&long_desc_type=allwordssubstr&keywords=&keywords_type=anywords&field0-0-0=noop&type0-0-0=noop&value0-0-0=&cmdtype=doit&namedcmd=Active&newqueryname=&order=Bug+Number">Click
-here</a> to see PRs which have been marked as RESOLVED, VERIFIED or CLOSED
-since the last integration build.</li>
-</ul>
-
-<h1>
-
-<hr WIDTH="100%">Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build 20011127 (v213)
-<h2>
-What's new in this drop</h2>
-
-<h3>
-API changes</h3>
-
-<ul>
-<li>
-None.</li>
-</ul>
-
-<h3>
-Other highlights</h3>
-
-<ul>
-<li>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=5391">5391</a>&nbsp;
-Upgrade to Ant 1.4.1</li>
-</ul>
-
-<h1>
-
-<hr WIDTH="100%">Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build 20011120 (v211)
-<h2>
-What's new in this drop</h2>
-
-<h3>
-API changes</h3>
-
-<ul>
-<li>
-None.</li>
-</ul>
-
-<h3>
-Other highlights</h3>
-
-<ul>
-<li>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=5331">5331</a>&nbsp;
-Ant does not override optional tasks with org.eclipse.ant.core.antTasks
-extension point</li>
-</ul>
-
-</body>
-</html>
diff --git a/ant/org.eclipse.ant.core/r2_1_buildnotes_platform-ant.html b/ant/org.eclipse.ant.core/r2_1_buildnotes_platform-ant.html
deleted file mode 100644
index 6ce0828..0000000
--- a/ant/org.eclipse.ant.core/r2_1_buildnotes_platform-ant.html
+++ /dev/null
@@ -1,706 +0,0 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
-<html>
-<head>
-   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-   <meta name="GENERATOR" content="Mozilla/4.7 [en] (WinNT; I) [Netscape]">
-   <title>Eclipse Platform Release Notes Ant</title>
-</head>
-<body>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build March 25, 2003
-
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=35610">35610</a>: External tools plugin.xml error<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build March 17, 2003
-
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=35138">35138</a>: NPE during shutdown<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=34767">34767</a>: Ant preferences not imported<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=35100">35100</a>: Migrate actions to command extension point<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build March 13, 2003
-
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=34726">34726</a>: Ant tests do not need the overhead of AutomatedSuite.run<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=34922">34922</a>: Typos<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=34439">34439</a>: Index out of bounds editing custom task<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=34496">34496</a>: double click adds type without name<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=34682">34682</a>: External entity with unrecognized protocol<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=34678">34678</a>: Duplicate properties in files<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=34663">34663</a>: Ant attempts to resolve taskdefs before resolving properties<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build March 12, 2003
-
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=34442">34442</a>: Custom task does not work in folder (only in jar)<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=34472">34472</a>: External tools preference is not clear<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=34519">34519</a>: Dialog slow to cancel when Properties/External Tools was selected<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build March 6, 2003
-<p>
-<b>Note:</b> Adding the Xerces JARs to your runtime Ant classpath is no longer required.
-In fact, adding these JARs can cause problems. The Xerces classes are loaded from the Xerces plugin provided with Eclipse.
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=32643">32643</a>: PlantyContentOutlinePage: 'Open With' shows up in context menu for non-existant external entity<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=33682">33682</a>: Ant build file editor causes exceptions when file empty<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=33794">33794</a>: Variables should be sorted in the "Select Variable" dialog<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=33826">33826</a>: Preferences>Editor>Appearance: layout problem<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=33069">33069</a>: Stack traces using ant editor<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=31727">31727</a>: Ant Editor tests fail when run as PDE JUnit tests<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=33838">33838</a>: Have build.xml as a default name for -find emulation<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=32700">32700</a>: Refresh Tab Scope variable selected but no selection widget<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=33685">33685</a>: Ant view: open with not available for targets<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=32657">32657</a>: Ant build stops working after terminating build<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=33861">33861</a>: [External Tools] Pref page too prominent<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=33870">33870</a>: The build.properties for org.eclipse.ant.tests.core is incorrect<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=33837">33837</a>: Ant editor code assist is case sensitive<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=33859">33859</a>: AntEditor: error nodes in outline are inconsistent with the Java editor<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=33867">33867</a>: Misspelling in Ant View context menu<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=33874">33874</a>: AntEditor: no context menu on vertical ruler<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=33857">33857</a>: AntEditor: doesn't support hovers on annotations<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=33928">33928</a>: NPE closing workbench<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=33981">33981</a>: Better positioning of error squiggles in Ant Editor<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=33264">33264</a>: Content assist fails if reference external entity<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=33664">33644</a>: Class org/xml/sax/Parser violates loader constraints with IBM vm 131<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=32890">32890</a>: Coloring bug in ant editor<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=33892">33892</a>: BadLocationException possible during reconciliation of AntEditor<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=33952">33952</a>: AntEditor: possible automatic move of cursor while editing<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build March 4, 2003
-
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=33443">33443</a>: No need for our own Ant version implementation<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=33263">33263</a>: Ant completion of properties is incorrect.<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=32825">32825</a>: Missing NLS strings for Ant Editor preference page<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=32183">32183</a>: Running with Ant1.6 alpha<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=32477">32477</a>: Errors in external entities and nested external entities aren't supported by the editor outline<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=32551">32551</a>: "Run Ant" causes ClassCastException with filesets<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=32587">32587</a>: AntView actions are incorrecly enabled --> NPE<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=32824">32824</a>: BadLocationException creating build.xml file<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=32624">32624</a>: Problem with asyncExec(..) Runnable in PlantyContentOutlinePage if control of treeviewer gets disposed.<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=32787">32787</a>: AssertionFailedException selecting error node in AntEditor outline<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=33043">33043</a>: Custom types are broken<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=33288">33288</a>: Ant View tooltips should use book capitalization<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=32517">32517</a>: No mneumonics on the Choose Configuration Type dialog<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=31433">31433</a>: Ant view will not set its focus when selecting the window<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=33514">33514</a>: Ant integration appears broken in I20030227<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=32715">32715</a>: Cancelling removing a external tool builder fails<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=32836">32836</a>: Cannot remove custom task<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=33284">33284</a>: Ant preferences: additional classpath entries not removed permanently<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=33117">33117</a>: ClassCastException with tasks using Xerces<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=32837">32837</a>: Tasks tab restore defaults<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=32827">32827</a>: Editor selection for external entities can be improved<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=32809">32809</a>: AntView search dialog retains name of removed working set<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=32693">32693</a>: Duplicate mneumonic on Program main tab<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=33534">33534</a>: Ant Editor: range indication not supported<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=33272">33272</a>: Leaking PlantyDocumentProviders<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=32768">32768</a>: Edit launch config from Ant view starts out "dirty"<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=32811">32811</a>: Setting ANT_HOME for specific config does not update classpath<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=32781">32781</a>: Description in Ant preference page is confusing<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=33702">33702</a>: [Ant View] Properties action<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=33346">33346</a>: Move to Ant 1.5.2<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=32521">32521</a>: (minor)AntView status line shows "no description"<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=33670">33670</a>: Ant view error strings are too long<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=32762">32762</a>: ${resource_loc} variable component specific resource tree too small<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build Feb 21, 2003
-
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=23969">23969</a>: Launcher should throw JVM exit code to parent process when build fails<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build Feb 20, 2003
-
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=31819">31819</a>: New support for color in TableViewers and TreeViewers<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=32158">32158</a>: Can't remove erroneous project builders<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=30716">30716</a>: cannot change external tool builder launch configuration properties<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=31949">31949</a>: Use OpenWith menu for external entities in the AntEditor outline<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=32091">32091</a>: AntClassloader should be setting its parent classloader<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=31625">31625</a>: Mixing build files in Ant view does not work<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=31934">31934</a>: Targets tab gets very wide if lots of targets selected<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=19459">19459</a>: [ExternalTools] failure to execute invalid tools should be better handled by ui.<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=32297">32297</a>: "plug-in" should be spelled with a hyphen<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=32276">32276</a>: Stack trace running ant.bat as an external process<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=31955">31955</a>: Outline is not created until initial reconcilation: noticeable delay<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=32345">32345</a>: Ant Editor doesn't support annotations<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=32374">32374</a>: BadLocationException on external entity build file<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=32423">32423</a>: Cannot use Run as Ant build with the Ant Editor outline with focus<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=32419">32419</a>: Put External Tools launch button with Run and Debug launch buttons<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build Feb 18, 2003
-
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=28770">28770</a>: Display default target in project label in Ant view<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=30596">30596</a>: Fixes for the Ant Editor Tests<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=29236">29236</a>: AntView tests & Ant editor tests<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=31780">31780</a>: Workaround JFace selection bug<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=31776">31776</a>: Ant targets cannot be configured within the list box if many targets exist<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=31777">31777</a>: Add reconciling to the Ant editor outline page<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=21793">21793</a>: Ant ProjectHelper not loaded correctly [set thread context classloader]<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=31796">31796</a>: Ant Editor syntax coloring fails over multiple lines<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=30836">30836</a>: XMLElements from external entities have incorrect selection in AntEditor<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=31369">31369</a>: External Processes are not typed<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=31439">31439</a>: PlantyException on opening ant script<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=31588">31588</a>: Show In... support from the Ant<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=31792">31792</a>: Project.init shortcut not working for datatypes<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=31797">31797</a>: AntEditor syntax color does not update until the editor is re-opened<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=31935">31935</a>: No targets selected, yet still have targets in target execution order<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=31876">31876</a>: ClassCastException code assisting in Ant Editor<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=31948">31948</a>: AntEditor reconciling has broken resolution of external entities<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=32069">32069</a>: Color preferences are applied too early<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=27613">27613</a>: Code duplication with Ant preference pages and Ant launch config tabs<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build Feb 13, 2003
-
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=31587">31587</a>: Open Editor for external entities should use selection<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=31561">31561</a>: Parse build files faster<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=31672">31672</a>: Broken backwards compatibility with Ant 1.4.*<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=31678">31678</a>: Disallow the AntClassLoader to load core Ant classes from plugin parents<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=30679">30679</a>: External tool migration and writing to System.err<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=31097">31097</a>: Ant Color Option list needs scrollbars<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=28928">28928</a>: Set minimum size of Runtime class path<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build Feb 11, 2003
-
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=30939">30939</a>: DBCS characters are garbled at the Outline view using non-native workbench encoding<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=31180">31180</a>: Outline colors all elements whose name matches default target's<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=29815">29815</a>: Ant artwork<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=29898">29898</a>: Updating actions in the AntView<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=30931">30931</a>: [Ant View] Run button not enabled when first target added to list<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=30961">30961</a>: Arguments field on the ExternalToolsMain tab needs to be multiline<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=30239">30239</a>: Some bugs in launch configurations for external tools<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=31378">31378</a>: AntTargetsTab order tab does not color default target correctly<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=31200">31200</a>: Unable to uncheck Ant Targets after clicking "Revert"<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=31145">31145</a>: Show external entities as root nodes in the outline page<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=30884">30884</a>: PlantyCompletionProcessor does not handle external entities<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=30844">30844</a>: AntClasspathTab top table will grow unbounded<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=29572">29572</a>: headless Ant support does not properly handle IDE based Ant tasks<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build Feb 6, 2003
-
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=31055">31055</a>: NPE determining if default target<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build Feb 5, 2003
-
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=30239">30239</a>: Some bugs in launch configurations for external tools<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=26750">26750</a>: "Run with..." dialog for AntView<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=29231">29231</a>: Ant view is listed under "External Tools" in menu<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=29824">29824</a>: Ant view toolbars should follow type hierarchy example<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=30220">30220</a>: external builder not readded to projects<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=30228">30228</a>: Mneumonic collision on Refresh tab for resource variable<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=30649">30649</a>: Ant Runtime Classpath Up/Down buttons broken<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=30591">30591</a>: DBCS:After remove all targets, "Run Ant..." will repeat last target<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=29822">29822</a>: Streamline single target case for Ant View<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=30331">30331</a>: [Ant View] Add build files sorts case dependant<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=30318">30318</a>: Planty should be renamed to "Ant Editor"<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=29820">29820</a>: Reduce clutter in Ant View<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=30098">30098</a>: AntSecurityManager throws exception when exiting Eclipse<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=30715">30715</a>: Incorrect string description for ${build_type} variable<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=30420">30420</a>: StringIndexOutOfBoundsException on restart with Ant editor active<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=30744">30744</a>: Activating a target in the Ant view switches view layout<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=30589">30589</a>: DBCS:Clicking "Up" or "Down" make Target lost<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=29318">29318</a>: Two builds at the same time...one starts logging to the DOS console<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=29271">29271</a>: External tools ant output always goes to the console<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=30547">30547</a>: Ant view properties action doesn't handle more than one config<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=30680">30680</a>: "Widget is disposed" setting variable arguments for Ant Build<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=30769">30769</a>: Missing icon for target error node<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=29885">29885</a>: Ant editor (planty) does not handle relative paths nicely<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=29744">29744</a>: [External Tools] refresh ${working_set} does not work<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=30559">30559</a>: ExternalToolsPlugin.log(Throwable) logs no message<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=30770">30770</a>: When things go wrong parsing for the Ant Editor outline<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=30767">30767</a>: NPE on resource changed from AntView<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=30343">30343</a>: Ant Editor outline does not indicate default target<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=24108">24108</a>: Nls external tools<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=26683">26683</a>: Targets tab behavior<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=27325">27325</a>: "activate" terminology<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=29828">29828</a>: Too many preference pages<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=30915">30915</a>: Selected resource tracking fails<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=30932">30932</a>: Restore defaults does not work for color preferences<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=30845">30845</a>: org.eclipse.ui.externaltools.internal.ant.dtd.test.dumper.java<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=30093">30093</a>: Handling bad definitions of extension points<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build Jan 28, 2003
-
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=29878">29878</a>: Chkpii failures for Ant / external tools<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=29857">29857</a>: Open with "Planty"<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=28877">28877</a>: Double clicking active target should run the active target<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=29816">29816</a>: Support "delete" key in the Ant view for active targets<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=30035">30035</a>: NPE running build file in external project<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=29315">29315</a>: AntProgressBuildListener writing to .log on build cancelled<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=29321">29321</a>: Set ANT_HOME does not force you to enter location<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=29249">29249</a>: Ant view updates for resource changes inefficiently<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=27675">27675</a>: Show custom Eclipse tasks / types<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=30083">30083</a>: Adding -logger XmlLogger cause Exception on build finished<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=27627">27627</a>: API review<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=30086">30086</a>: Ant view not updated when project deleted<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=29743">29743</a>: [External Tools] Apply button does not enable in "refresh tab"<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build Jan 21, 2003
-
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=26532">26532</a>: [External Tools] the external tools menu in the run menu<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=25860">25860</a>: Ant runner sets basedir incorrectly<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=26667">26667</a>: External Tool variables are expanded in launch config dialog<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=29504">29504</a>: External Tools' Eclipse variables are disallowed to have text before/after<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=16618">16618</a>: [ExternalTools] Re-launch last External Tool hotkey <br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=26523">26523</a>: NPE in getHyperLink<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=29573">29573</a>: External tool variable scope is too restrictive<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=29672">29672</a>: When external tool builders go bad<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=29152">29152</a>: Migrate extension point schema ownership<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=29148">29148</a>: Contribution of Planty 0.9.1<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=28746">28746</a>: Please sort build targets alphabetically<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=29322">29322</a>: Revert has no effect on Build Options tab<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=29806">29806</a>: Default script name<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=29812">29812</a>: Define placeholder for Ant View<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=29811">29811</a>: Add "Ant View" to top level menu<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=28306">28306</a>: External tool builder not deleted on cancel<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=28577">28577</a>: External tool builder not added<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=28769">28769</a>: New Ant View doesn't gracefully handle missing targets<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=29449">29449</a>: SearchForBuildFilesDialog.searchForBuildFiles optimization<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=29663">29663</a>: Descriptions in the AntView<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=29818">29818</a>: Replace "Go To File" with "Open With ->"<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=3079">3079</a>: [ExternalTools] Clicking on output should open resource<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=27684">27684</a>: Tasks and Types lists need to be sorted<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build Jan 14, 2003
-
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=26688">26688</a>: Rendering of Ant projects in the Ant View<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=27699">27699</a>: Move up/down enabled when no selection and only one target<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=29180">29180</a>: Support double-click in the selection dialog<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=28809">28809</a>: ANT_HOME not set on first run of Ant tool<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=27540">27540</a>: Run Ant vs. Ant View<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=19623">19623</a>: [ExternalTools] Display full command line for external tool<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=29220">29220</a>: Ant view execution order contains extra node<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=29221">29221</a>: Run as Ant does not report anything on some failures<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=24338">24338</a>: Cancelling an Ant run can take a long time<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=21012">21012</a>: [ExternalTools] Cancel tool does not cancel tool<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=28933">28933</a>: Cannot add tasks/types from folder<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=28876">28876</a>: Ant View in M4 should split vertical<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=29269">29269</a>: ClassNotFoundException: TaskLineTracker<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=26978">26978</a>: Ant targets tab shouldn't add all targets by defaultt<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=26882">26882</a>: Need "run for build kinds" UI for project builders<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=28431">28431</a>: Variable expansion is using incorrect path separators<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=28569">28569</a>: Browse workspace dialog needs colon<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=28570">28570</a>: Missing mneumonic for copy button in External Tools builders page<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=28305">28305</a>: Edit properties for Launch Configuration for External tools<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build Jan 7, 2003
-
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=27983">27983</a>: Ant logger does not respect console buffer size<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build Dec 17, 2002
-
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=28276">28276</a>: Should not expose "ant class loader" option to user<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build Dec 16, 2002
-
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=28301">28301</a>: Creation of an External Tool Builder gets name wrong.<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=28306">28306</a>: External tool builder not deleted on cancel<br>
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build Dec 13, 2002
-
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=27984">27984</a>: Total build time wrong<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=23661">23661</a>: [ExternalTools] Launching Ant on xml file that is in the active editor<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=20581">20581</a>: [ExternalTools] Variables should insert at caret<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=26182">26182</a>: Ant preference page has conflicting mnemonics<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=26200">26200</a>: External tools menu is missing mnemonics<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=27525">27525</a>: Remove All Projects and Remove all build files<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=28052">28052</a>: AntProcessBuildLogger doesn't handle empty locations<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=27804">27804</a>: VariableContextManager and ExternalToolsPlugin#startup<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=28130">28130</a>: 1.3 incompatible compile when target, source set to "1.3" using 1.4.* vm<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=28136">28136</a>: Ant view "Run" button is ambiguous<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=28213">28213</a>: Adding a file to the Ant view that already exists takes way too long<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=26689">26689</a>: navigate from ant view to editor<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=26554">26554</a>: Ant view should update when projects closed/removed<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build Dec 10, 2002
-
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=27328">27328</a>: Search for build file does not remeber last search text<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=27541">27541</a>: Cannot add an Ant External Tool Builder<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=27050">27050</a>: NullBuildLogger no longer needed<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=16574">16574</a>: [ExternalTools] External tool builders should use same set of external tools<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=27101">27101</a>: AntView enhancement<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=27686">27686</a>: Having both Run Ant and Run Ant... in the same menu is problematic<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=27669">27669</a>: Ant view toolbar is misleading<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=27615">27615</a>: Incorrect button enablement on AntClasspathPage<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=22793">22793</a>: [ExternalTools] Ant preference page jar area changes size<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=27814">27814</a>: AntLaunchShortcut refererences internal debug UI class<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=27665">27665</a>: Buildfile hyperlink off by 1<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=27323">27323</a>: can only single-select active targets<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=27700">27700</a>: Ant View: I can activate a target more than once<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=27810">27810</a>: BuilderPropertyPage makes multiple dispatching listeners<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=15405">15405</a>: Make all ANT configuration defined at config level<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=27841">27841</a>: Illegal reference to LaunchGroup and DebugUIPlugin<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=27832">27832</a>: Easy to cut off the "Reuse Ant classloader" option<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=27831">27831</a>: Save changes prompt from classpath tab<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=25649">25649</a>: Add action to add ant project to ant view<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=27505">27505</a>: Ant specific actions in External tools base<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=27865">27865</a>: Can't cancel AntView search<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=27702">27702</a>: IllegalArgumentException in AntView<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=27846">27846</a>: Cannot add new ext tool builer<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=20856">20856</a>: [ExternalTools] Preferences/Ant/Classpath inconsistency<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=27440">27440</a>: Cached classloader misses changes to tasks / types<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=25650">25650</a>: Add action to ant view to search for build files<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=27954">27954</a>: Merge Main and Options tabs<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=27841">27841</a>: Ext tool builders have wrong icon and NPE'd<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=17782">17782</a>: [ExternalTools] Custom tasks not checked for validity<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=26455">26455</a>: -find option not yet implemented<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=27703">27703</a>: Add classpath tab for Ant<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=27776">27776</a>: Don't use the term "Ant Script"<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=27780">27780</a>: Ant Preference page reorganization<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=27856">27856</a>: Description field on ExternalToolsMainTab<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=27964">27964</a>: NoSuchElement exception in AddCustomDialog<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=27956">27956</a>: Create Ant Main tab to limit location selection<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build Dec 03, 2002
-
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=20014">20014</a>: [ExternalTools] Tool location should accept only files<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=26918">26918</a>: Projects with external builders cause NPEs when built in headless mode<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=26671">26671</a>: Ant external tool hangs Eclipse<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=25709">25709</a>: Lists on Targets page of External Tools properties need scrollbars<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=26637">26637</a>: Process timestamp showing as launch configuration property<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=26638">26638</a>: Too much logging to the log<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=26995">26995</a>: Run Ant action should prompt for config<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=26449">26449</a>: pref page: set ANT_HOME 'Browse' button size is unusual<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=27500">27500</a>: Ant tasks do not always have a name<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=25712">25712</a>: external tools tabs missing mneumonics<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=27124">27124</a>: Adjust hyperlink for adorned tasks in Ant output<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=27049">27049</a>: AntProcessBuildLogger does not write to logfile<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=24704">24704</a>: Tasks with the same name can be entered via the pref page<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=27345">27345</a>: "Don't ask again" preference when migrating external tool builders<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=27128">27128</a>: Hyperlinking for Ant tasks does not work on older Ants<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=27141">27141</a>: [External Tools] Unexpected Run Ant dialog behaviour.<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=27531">27531</a>: Browse for Ant home should store last location<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=27157">27157</a>: Two launch histories for external tools<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=27534">27534</a>: Extra runtime classpath entries lost if Ant home specified<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=25500">25500</a>: Add JAR to classpath should default to workspace root<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=13144">13144</a>: [ExternalTools] Ant preference page details<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=27449">27449</a>: External Tools/Ant should honour dialog font<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=27206">27206</a>: Additional ant classpath urls do not show up for adding tasks/types<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=24865">24865</a>: Misc Restricted to Selected Objects in Breakpoint Properties dialog<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=27265">27265</a>: Adornment adjustment is incorrect for long task names.<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=20921">20921</a>: [ExternalTools] Project properties runs autobuild for all projects<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build Nov 26, 2002
-
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=27009">27009</a>: External tool option tab defaults to "run in background"<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=24699">24699</a>: Ant classpath should be separated into two components?<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=26405">26405</a>: AntTargetsTab doesn't save target selection<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=26415">26415</a>: Migrate external tool project builders to use launch configurations<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=26704">26704</a>: Remove External Tools View<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=26705">26705</a>: Remove "ExternalTool" UI code<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=26708">26708</a>: output should be the same as from command line<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=27014">27014</a>: Prompt for argument checkbox should be temporarily removed<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=27033">27033</a>: AntView uses JDK 1.4 method String.split(...)<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=26744">26744</a>: [ExternalTools] Console always opens build file with Text editor<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=26636">26636</a>: Cached Ant classloader not reset with classpath change<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=16849">16849</a>: [ExternalTools] Ant does not respect output level preference<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=26948">26948</a>: Requesting invalid target execution causes NPE in ProgressBuildListener<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=26042">26042</a>: Can't run Ant script with new Ant on MacOS X<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=26606">26606</a>: Ant errors not showing in console<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=19520">19520</a>: [ExternalTools] Performance suffers with console log ouput enabled<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=22402">22402</a>: [ExternalTools] Port fix for handling spaces in arguments...<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=26192">26192</a>: NPE from ant targets tab<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=26729">26729</a>: External tools menu does not update<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=26714">26714</a>: Ant loses preferences<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build Nov 19, 2002
-
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=26112">26112</a>: "Run Ant..." implies dialog<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=6498">6498</a>: [ExternalTools] selecting and building individual targets in ANT scripts<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=18971">18971</a>: [ExternalTools] Using external tool configs in other contexts<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=19450">19450</a>: [ExternalTools] menu should limit itself to the first n tools (perhaps n = 20)<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=21809">21809</a>: Let user specify installation directory of Ant<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=24718">24718</a>: Run Ant should be programmatically available<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=25059">25059</a>: [ExternalTools] Refresh Scopes dialog should be wizard<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=25062">25062</a>: Support execution of ant tasks in a seperate thread<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=25821">25821</a>: External Tool] Error Message "External Tool runner internal error"<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=26061">26061</a>: Changes to Ant classpath don't persist<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=26418">26418</a>: Remove "launch configuration mode" as an option in external tools<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=26629">26629</a>: Error message has reversed arguments<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=19450">19450</a>: [ExternalTools] menu should limit itself to the first n tools (perhaps n = 20)<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=22738">22738</a>: [ExternalTools] Tool arguments should be a wizard<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=13275">13275</a>: [ExternalTools] Ant Wizard should not "always" be modal<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=20857">20857</a>: Problems with Ant classpath not being picked up<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build Nov 13, 2002
-
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=26050">26050</a>: Unnamed projects cause NPE in Ant View<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=16982">16982</a>: [ExternalTools] Console font setting should be workbench text font<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=25592">25592</a>: [External Tools] Log console should have autoscroll<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=18478">18478</a>: [External Tools] Minor: output not always in right order<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=22727">22727</a>: [External Tools] Program tool output not shown on log console<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=25762">25762</a>: Problem starting JUnit plugin tests<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=25746">25746</a>: Runtime exec support should be in debug core<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=25877">25877</a>: should save all files before execute ant script<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=23662">23662</a>: [ExternalTools] External tools history manipulation<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=25907">25907</a>: [ExternalTools] ExternalToolMenuDelegate leaking menus<br>
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build Nov 12, 2002
-
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=25759">25759</a>: NPE trying to open the antview preferences page<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=22730">22730</a>: [ExternalTools] Capture output<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=25397">25397</a>: AntPage flashes when resized<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=25493">25493</a>: NPE if default target does not exist in external tool builder ant file<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=25648">25648</a>: Add remove action to ant view<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=25468">25468</a>: Backwards compatibility with Ant 1.4.1<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build Nov 05, 2002
-
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=25509">25509</a>: NPE from InternalAntRunner<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=25639">25639</a>: Double click in tasks and types tabs should invoke edit<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=25656">25656</a>: [ant] Cannot add multiple Jars to ant classpath at the same time<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=25693">25693</a>: Implement support for the -diagnostics option<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=25647">25647</a>: Add Ant View to Eclipse<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=25698">25698</a>: Global properties<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=25699">25699</a>: Global property files<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=25702">25702</a>:  [External Tools] Restore defaults does not work<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=24525">24525</a>:  Active targets not shown in ant tool property page<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=24578">24578</a>:  Can't add variable to tool arguments<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build Oct 29, 2002
-
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=24847">24847</a>: duplicate options not handled the same as cmd line Ant<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=25133">25133</a>: Implement support for the 1.5.1 feature: -propertyfile<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=25213">25213</a>: -propertyfile should not abort build if the property file is not found<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=24580">24580</a>: Expose more information in TargetInfo<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=17803">17803</a>: [ExternalTools] AntPage table should scroll horizontally<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=18294">18294</a>: [ExternalTools] Ant preference page: classpath list too wide<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=24383">24383</a>: Update the printUsage of InternalAntRunner<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=24824">24824</a>: DefaultLogger should be used for headless Ant<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=20576">20576</a>: [ExternalTools] Should specify order of jars on classpath<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=24234">24234</a>: Ant test suite<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=24318">24318</a>: Move to Ant 1.5.1<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=25134">25134</a>: Implement support for the 1.5.1 feature: -inputhandler<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build Oct 22, 2002
-
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=24756">24756</a>: -projecthelp indicates BUILD SUCCESSFUL<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=24831">24831</a>: Same URL multiple times in the AntClassLoader<br>
-
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build Oct 16, 2002
-
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=15821">15821</a>: [ExternalTools] Minor: Ant console "steals" focus<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=22400">22400</a>: [ExternalTools] Run Ant... action displayed for invalid resources (build I0813)<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build Oct 15, 2002
-
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=6020">6020</a>: Tasks calling System.exit crash Eclipse<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=23651">23651</a>: [doc] AntTasks and AntTypes refer to non-existant API<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=23653">23653</a>: [doc] Extra Ant classpath entries extension<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=24459">24459</a>: AntCorePlugin startup<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=19899">19899</a>: If the user never changes the Ant classpath, it should always be computed<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=23917">23917</a>: logfile not created in the correct location when path not fully specified<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=24587">24587</a>: Project properties not set properly if no arguments passed<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=24696">24696</a>: ExternalTools antrunner.jar is still in the HEAD stream<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=24418">24418</a>: Option without necessary corresponding argument not handled correctly<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=24594">24594</a>: Targets specified as arguments not recognized<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=23995">23995</a>: deadlock while running build.xml<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=24733">24733</a>: Help text is wrong<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=24710">24710</a>: Custom ant task classes not found<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build Oct 09, 2002
-
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=24527">24527</a>: java.io.FileNotFoundException occurs when invoking AntRunner<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build Oct 08, 2002
-
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=20557">20557</a>: Running an empty ant script takes about 2 seconds<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=22459">22459</a>: AntRunner prints stack trace on OperationCanceledException<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=23383">23383</a>: API: Add @since tags<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=24290">24290</a>: Ant preferences are only saved at shutdown<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=23584">23584</a>: Java should be capitalized<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=17484">17484</a>: [ExternalTools] Adding tasks from JARs in the Ant Preference Page<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=23664">23664</a>: Better reporting of errors when reading Ant build file<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=24415">24415</a>: Running an Ant script with console logging turned off writes to OS console<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=24452">24452</a>: Key clashes within extension point definitions<br>
-
-<h3>
-Problem Reports Closed</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=23350">23350</a>: Possible NPE<br>
-
-<h1>
-Eclipse Platform Build Notes<br>
-Ant</h1>
-Eclipse SDK Build Oct 01, 2002
-
-<h3>
-Resolved Bugs</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=23482">23482</a>: Rework the Core Ant code to be able to use the NLS tools<br> 
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=14180">14180</a>: Ant -help not function<br> 
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=19801">19801</a>: AntCorePreferences, Type, Tasks could be a public class<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=23881">23881</a>: Same error logged three times<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=23913">23913</a>: Issues with InternalAntRunner#printHelp(Project)<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=22714">22714</a>: Arguments line lose spaces when printed to console<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=23132">23132</a>: -logfile option for ant doesnt seem to work<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=16740">16740</a>: [ExternalTools] Irrelevant stack trace for errors in Ant build file<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=19838">19838</a>: Error codes for Ant Core should be public<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=21478">21478</a>: Insufficient Ant activation error reporting<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=23658">23658</a>: Build file is not logged to log console view<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=22465">22465</a>: Wrong ant script causes fatal error written to console<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=23924">23924</a>: handling of incorrect / unrecognized arguments<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=23720">23720</a>: [doc] Extension point listing is incorrect<br>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=22702">22702</a>: XmlLogger not working?<br>
-
-<h3>
-Problem Reports Closed</h3>
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=21479">21479</a>: Ant classpath refers to old 'xerces.jar'<br> 
-<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=23832">23832</a>: Update Ant pages on dev.eclipse.org<br>
-
-</body>
-</html>
diff --git a/ant/org.eclipse.ant.core/schema/antTasks.exsd b/ant/org.eclipse.ant.core/schema/antTasks.exsd
deleted file mode 100644
index e18d665..0000000
--- a/ant/org.eclipse.ant.core/schema/antTasks.exsd
+++ /dev/null
@@ -1,132 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.ant.core">
-<annotation>
-   <appInfo>
-      <meta.schema plugin="org.eclipse.ant.core" id="antTasks" name="Ant Tasks"/>
-   </appInfo>
-   <documentation>
-      Allows plug-ins to define arbitrary Ant tasks for use 
-by the Ant infrastructure.  The standard Ant infrastructure 
-allows for the addition of arbitrary tasks.  
-Unfortunately, it is unlikely that the Ant Core plug-in 
-would have the classes required by these tasks on its 
-classpath (or that of any of its prerequisites).  
-To address this, clients should define an extension 
-which plugs into this extension-point and maps a 
-task name onto a class.  The Ant plug-in can then 
-request that the declaring plug-in load the specified class.
-   </documentation>
-</annotation>
-
-   <element name="extension">
-      <complexType>
-         <sequence>
-            <element ref="antTask" minOccurs="0" maxOccurs="unbounded"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  a fully qualified identifier of the target extension point
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  an optional identifier of the extension instance
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                 an optional name of the extension instance
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="antTask">
-      <annotation>
-         <appInfo>
-            <meta.element labelAttribute="name"/>
-         </appInfo>
-      </annotation>
-      <complexType>
-         <attribute name="name" type="string" use="required">
-            <annotation>
-               <documentation>
-                  name of the task to be defined
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  the fully qualified name of a Java class implementing 
-the task.  Generally this class must be a subclass of
-&lt;samp&gt;org.apache.tools.ant.Task&lt;/samp&gt;.
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn="org.apache.tools.ant.Task"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-         <attribute name="library" type="string" use="required">
-            <annotation>
-               <documentation>
-                  a path relative to the plug-in install location
-for the library containing the task.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="headless" type="string" use="optional">
-            <annotation>
-               <documentation>
-                  indicates whether this task is suitable for use in a "headless" Ant environment. If running headless and the attribute is "false", 
-                  the task will not be loaded or defined. As well, the plugin class loader will not be added as a parent classloader to the Ant classloader.
-                  The implied value is true, when not specified.
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         The following is an example of an Ant tasks extension point: 
-&lt;p&gt;
-&lt;pre&gt;
-   &lt;extension point="org.eclipse.ant.core.antTasks"&gt;
-      &lt;antTask name="coolTask" class="com.example.CoolTask"/&gt;
-   &lt;/extension&gt; 
-&lt;/pre&gt;
-&lt;/p&gt;
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         The platform itself supplies a number of tasks including 
-eclipse.incrementalBuild and eclipse.refreshLocal.
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         &lt;a href="hglegal.htm"&gt;&lt;img SRC="ngibmcpy.gif" ALT="Copyright IBM Corp. 2000, 2003.  All Rights Reserved." BORDER=0 height=14 width=324&gt;&lt;/a&gt;
-      </documentation>
-   </annotation>
-
-</schema>
diff --git a/ant/org.eclipse.ant.core/schema/antTypes.exsd b/ant/org.eclipse.ant.core/schema/antTypes.exsd
deleted file mode 100644
index 186a7b5..0000000
--- a/ant/org.eclipse.ant.core/schema/antTypes.exsd
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.ant.core">
-<annotation>
-   <appInfo>
-      <meta.schema plugin="org.eclipse.ant.core" id="antTypes" name="Ant Types"/>
-   </appInfo>
-   <documentation>
-      Allows plug-ins to define arbitrary Ant datatypes for 
-use by the Ant infrastructure.  The standard Ant 
-infrastructure allows for the addition of arbitrary 
-datatypes.  Unfortunately, it is unlikely that the 
-Ant Core plug-in would have the classes required 
-by these datatypes on its classpath (or that of any 
-of its prerequisites).  To address this, clients 
-should define an extension which plugs into this 
-extension-point and maps a datatype name onto a class.  
-The Ant plug-in can then request that the declaring 
-plug-in load the specified class.
-   </documentation>
-</annotation>
-
-   <element name="extension">
-      <complexType>
-         <sequence>
-            <element ref="antType" minOccurs="0" maxOccurs="unbounded"/>
-         </sequence>
-        <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  a fully qualified identifier of the target extension point
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  an optional identifier of the extension instance
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                 an optional name of the extension instance
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="antType">
-      <annotation>
-         <appInfo>
-            <meta.element labelAttribute="name"/>
-         </appInfo>
-      </annotation>
-      <complexType>
-         <attribute name="name" type="string" use="required">
-            <annotation>
-               <documentation>
-                  name of the type to be defined
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  the fully qualified name of a Java class implementing 
-the datatype.  Generally this class must be a subclass of
-&lt;samp&gt;org.apache.tools.ant.types.DataType&lt;/samp&gt;.
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn="org.apache.tools.ant.types.DataType"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-         <attribute name="library" type="string" use="required">
-            <annotation>
-               <documentation>
-                  a path relative to the plug-in install location
-for the library containing the type.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="headless" type="string" use="optional">
-            <annotation>
-               <documentation>
-                  indicates whether this type is suitable for use in a "headless" Ant environment. If running headless and the attribute is "false", 
-                  the type will not be loaded or defined. As well, the plugin class loader will not be added as a parent classloader to the Ant classloader.
-                  The implied value is true, when not specified.
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         The following is an example of an Ant types extension point: 
-&lt;p&gt;
-&lt;pre&gt;
-   &lt;extension point="org.eclipse.ant.core.antTypes"&gt;
-      &lt;antType name="coolType" class="com.example.CoolType"/&gt;
-   &lt;/extension&gt; 
-&lt;/pre&gt;
-&lt;/p&gt;
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         &lt;a href="hglegal.htm"&gt;&lt;img SRC="ngibmcpy.gif" ALT="Copyright IBM Corp. 2000, 2003.  All Rights Reserved." BORDER=0 height=14 width=324&gt;&lt;/a&gt;
-      </documentation>
-   </annotation>
-
-</schema>
diff --git a/ant/org.eclipse.ant.core/schema/extraClasspathEntries.exsd b/ant/org.eclipse.ant.core/schema/extraClasspathEntries.exsd
deleted file mode 100644
index de5ee52..0000000
--- a/ant/org.eclipse.ant.core/schema/extraClasspathEntries.exsd
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.ant.core">
-<annotation>
-   <appInfo>
-      <meta.schema plugin="org.eclipse.ant.core" id="extraClasspathEntries" name="Extra Ant Classpath Entries"/>
-   </appInfo>
-   <documentation>
-      Allows plug-ins to define arbitrary JARs for use by the Ant infrastructure.
-These JARs are put into the Ant classpath at runtime.  Besides
-the JAR, the plug-in classloader of the plug-in providing the
-JAR is also added to the classpath.
-   </documentation>
-</annotation>
-
-   <element name="extension">
-      <complexType>
-         <sequence>
-            <element ref="extraClasspathEntry" minOccurs="0" maxOccurs="unbounded"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  a fully qualified identifier of the target extension point
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  an optional identifier of the extension instance
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                 an optional name of the extension instance
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="extraClasspathEntry">
-      <complexType>
-         <attribute name="library" type="string" use="required">
-            <annotation>
-               <documentation>
-                  a path relative to the plug-in install location for the library.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="headless" type="string" use="optional">
-            <annotation>
-               <documentation>
-                  indicates whether this extra classpath entry is suitable for use in a "headless" Ant environment. If running headless and the attribute is "false", 
-                  this entry will not be added to the Ant classpath. As well, the plugin class loader will not be added as a parent classloader to the Ant classloader.
-                  The implied value is true, when not specified.
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         The following is an example of an extra classpath entries extension point:
-
-&lt;p&gt;
-&lt;pre&gt;
- &lt;extension point="org.eclipse.ant.core.extraClasspathEntries"&gt;
-  &lt;extraClasspathEntry library="myExtraLibrary.jar"/&gt;
- &lt;/extension&gt;
-&lt;/pre&gt;
-&lt;/p&gt;
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         The platform itself supplies an Ant support jar (antsupportlib.jar).
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         &lt;a href="hglegal.htm"&gt;&lt;img SRC="ngibmcpy.gif" ALT="Copyright IBM Corp. 2000, 2003.  All Rights Reserved." BORDER=0 height=14 width=324&gt;&lt;/a&gt;
-      </documentation>
-   </annotation>
-
-</schema>
diff --git a/ant/org.eclipse.ant.core/src/org/eclipse/ant/core/AntCorePlugin.java b/ant/org.eclipse.ant.core/src/org/eclipse/ant/core/AntCorePlugin.java
deleted file mode 100644
index f882eb4..0000000
--- a/ant/org.eclipse.ant.core/src/org/eclipse/ant/core/AntCorePlugin.java
+++ /dev/null
@@ -1,207 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.core;
-
-
-import java.net.URL;
-import java.util.Arrays;
-import java.util.List;
-
-import org.eclipse.ant.internal.core.AntClassLoader;
-import org.eclipse.core.runtime.*;
-
-/**
- * The plug-in runtime class for the Ant Core plug-in.
- */
-public class AntCorePlugin extends Plugin {
-
-	/**
-	 * Status code indicating an unexpected internal error.
-	 * @since 2.1
-	 */
-	public static final int INTERNAL_ERROR = 120;		
-	
-	/**
-	 * The single instance of this plug-in runtime class.
-	 */
-	private static AntCorePlugin plugin;
-
-	/**
-	 * The preferences class for this plugin.
-	 */
-	private AntCorePreferences preferences;
-
-	/**
-	 * Unique identifier constant (value <code>"org.eclipse.ant.core"</code>)
-	 * for the Ant Core plug-in.
-	 */
-	public static final String PI_ANTCORE = "org.eclipse.ant.core"; //$NON-NLS-1$
-
-	/**
-	 * Simple identifier constant (value <code>"antTasks"</code>)
-	 * for the Ant tasks extension point.
-	 */
-	public static final String PT_TASKS = "antTasks"; //$NON-NLS-1$
-
-	/**
-	 * Simple identifier constant (value <code>"extraClasspathEntries"</code>)
-	 * for the extra classpath entries extension point.
-	 */
-	public static final String PT_EXTRA_CLASSPATH = "extraClasspathEntries"; //$NON-NLS-1$
-
-	/**
-	 * Simple identifier constant (value <code>"antTypes"</code>)
-	 * for the Ant types extension point.
-	 */
-	public static final String PT_TYPES = "antTypes"; //$NON-NLS-1$
-
-	/**
-	 * Simple identifier constant (value <code>"class"</code>)
-	 * of a tag that appears in Ant extensions.
-	 */
-	public static final String CLASS = "class"; //$NON-NLS-1$
-
-	/**
-	 * Simple identifier constant (value <code>"name"</code>)
-	 * of a tag that appears in Ant extensions.
-	 */
-	public static final String NAME = "name"; //$NON-NLS-1$
-
-	/**
-	 * Simple identifier constant (value <code>"library"</code>)
-	 * of a tag that appears in Ant extensions.
-	 */
-	public static final String LIBRARY = "library"; //$NON-NLS-1$
-	
-	/**
-	 * Simple identifier constant (value <code>"headless"</code>) of a tag
-	 * that appears in Ant extensions.
-	 * @since 2.1
-	 */
-	public static final String HEADLESS = "headless"; //$NON-NLS-1$
-
-	/**
-	 * Key to access the <code>IProgressMonitor</code> reference. When a
-	 * progress monitor is passed to the <code>AntRunner.run(IProgressMonitor)</code>
-	 * method, the object is available as a reference for the current
-	 * Ant project.
-	 */
-	public static final String ECLIPSE_PROGRESS_MONITOR = "eclipse.progress.monitor"; //$NON-NLS-1$
-	
-	/**
-	 * Status code indicating an error occurred running a build.
-	 * @since 2.1
-	 */
-	public static final int ERROR_RUNNING_BUILD = 1;
-	
-	/**
-	 * Status code indicating an error occurred due to a malformed URL.
-	 * @since 2.1
-	 */
-	public static final int ERROR_MALFORMED_URL = 2;
-	
-	/**
-	 * Status code indicating an error occurred as a library was not specified
-	 * @since 2.1
-	 */
-	public static final int ERROR_LIBRARY_NOT_SPECIFIED = 3;
-
-	/** 
-	 * Constructs an instance of this plug-in runtime class.
-	 * <p>
-	 * An instance of this plug-in runtime class is automatically created 
-	 * when the facilities provided by the Ant Core plug-in are required.
-	 * <b>Clients must never explicitly instantiate a plug-in runtime class.</b>
-	 * </p>
-	 * 
-	 * @param pluginDescriptor the plug-in descriptor for the
-	 *   Ant Core plug-in
-	 */
-	public AntCorePlugin(IPluginDescriptor descriptor) {
-		super(descriptor);
-		plugin = this;
-	}
-
-	/**
-	 * @see Plugin#shutdown()
-	 */
-	public void shutdown() throws CoreException {
-		if (preferences == null) {
-			return;
-		}
-		preferences.updatePluginPreferences();
-		savePluginPreferences();
-	}
-
-	/**
-	 * Given an extension point name, extract its extensions and return them
-	 * as a List.
-	 */
-	private List extractExtensions(String point) {
-		IExtensionPoint extensionPoint = getDescriptor().getExtensionPoint(point);
-		if (extensionPoint == null) {
-			return null;
-		}
-		IConfigurationElement[] extensions = extensionPoint.getConfigurationElements();
-		return Arrays.asList(extensions);
-	}
-
-	/**
-	 * Returns an object representing this plug-in's preferences.
-	 * 
-	 * @return the Ant core object representing the preferences for this plug-in.
-	 */
-	public AntCorePreferences getPreferences() {
-		if (preferences == null) {
-			preferences = new AntCorePreferences(extractExtensions(PT_TASKS), extractExtensions(PT_EXTRA_CLASSPATH), extractExtensions(PT_TYPES), false);
-		}
-		return preferences;
-	}
-	
-	/**
-	 * Set this plug-in's preferences for running headless.
-	 */
-	protected void setRunningHeadless() {
-		preferences = new AntCorePreferences(extractExtensions(PT_TASKS), extractExtensions(PT_EXTRA_CLASSPATH), extractExtensions(PT_TYPES), true);
-	}
-
-	/**
-	 * Returns this plug-in instance.
-	 *
-	 * @return the single instance of this plug-in runtime class
-	 */
-	public static AntCorePlugin getPlugin() {
-		return plugin;
-	}
-	
-	/**
-	 * Returns a new class loader to use when executing Ant builds.
-	 * 
-	 * @return the new class loader
-	 */
-	protected ClassLoader getNewClassLoader() {
-		AntCorePreferences corePreferences = getPreferences();
-		URL[] urls = corePreferences.getURLs();
-		ClassLoader[] pluginLoaders = corePreferences.getPluginClassLoaders();
-		return new AntClassLoader(urls, pluginLoaders);
-	}
-	
-	/**
-	 * Logs the specified throwable with this plug-in's log.
-	 * 
-	 * @param t throwable to log 
-	 * @since 2.1
-	 */
-	public static void log(Throwable t) {
-		IStatus status= new Status(IStatus.ERROR, PI_ANTCORE, INTERNAL_ERROR, "Error logged from Ant Core: ", t); //$NON-NLS-1$
-		getPlugin().getLog().log(status);
-	}
-}
diff --git a/ant/org.eclipse.ant.core/src/org/eclipse/ant/core/AntCorePreferences.java b/ant/org.eclipse.ant.core/src/org/eclipse/ant/core/AntCorePreferences.java
deleted file mode 100644
index fb01370..0000000
--- a/ant/org.eclipse.ant.core/src/org/eclipse/ant/core/AntCorePreferences.java
+++ /dev/null
@@ -1,990 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.core;
-
-
-import java.io.File;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.text.MessageFormat;
-import java.util.*;
-
-import org.eclipse.ant.internal.core.IAntCoreConstants;
-import org.eclipse.ant.internal.core.InternalCoreAntMessages;
-import org.eclipse.core.boot.BootLoader;
-import org.eclipse.core.internal.plugins.PluginClassLoader;
-import org.eclipse.core.runtime.*;
-
-
-/**
- * Represents the Ant Core plug-in's preferences providing utilities for
- * extracting, changing and updating the underlying preferences.
- * @since 2.1
- */
-public class AntCorePreferences implements org.eclipse.core.runtime.Preferences.IPropertyChangeListener {
-
-	private List defaultTasks;
-	private List defaultTypes;
-	private List extraClasspathURLs;
-	private URL[] defaultAntURLs;
-	
-	private Task[] customTasks;
-	private Task[] oldCustomTasks;
-	private Type[] customTypes;
-	private Type[] oldCustomTypes;
-	private URL[] antURLs;
-	private URL[] customURLs;
-	private Property[] customProperties;
-	private Property[] oldCustomProperties;
-	private String[] customPropertyFiles;
-	
-	private List pluginClassLoaders;
-	
-	private ClassLoader[] orderedPluginClassLoaders;
-	
-	private String antHome;
-	
-	private boolean runningHeadless= false;
-
-	protected AntCorePreferences(List defaultTasks, List defaultExtraClasspath, List defaultTypes, boolean headless) {
-		runningHeadless= headless;
-		initializePluginClassLoaders();
-		extraClasspathURLs = new ArrayList(20);
-		this.defaultTasks = computeDefaultTasks(defaultTasks);
-		this.defaultTypes = computeDefaultTypes(defaultTypes);
-		computeDefaultExtraClasspathEntries(defaultExtraClasspath);
-		restoreCustomObjects();
-	}
-	
-	/**
-	 * When a preference changes, update the in-memory cache of the preference.
-	 * @see org.eclipse.core.runtime.Preferences.IPropertyChangeListener#propertyChange(org.eclipse.core.runtime.Preferences.PropertyChangeEvent)
-	 */
-	public void propertyChange(Preferences.PropertyChangeEvent event) {
-		Preferences prefs = AntCorePlugin.getPlugin().getPluginPreferences();
-		String property= event.getProperty();
-		if (property.equals(IAntCoreConstants.PREFERENCE_TASKS) || property.startsWith(IAntCoreConstants.PREFIX_TASK)) {
-			restoreTasks(prefs);
-		} else if (property.equals(IAntCoreConstants.PREFERENCE_TYPES) || property.startsWith(IAntCoreConstants.PREFIX_TYPE)) {
-			restoreTypes(prefs);
-		} else if (property.equals(IAntCoreConstants.PREFERENCE_ANT_URLS)) {
-			restoreAntURLs(prefs);
-		} else if (property.equals(IAntCoreConstants.PREFERENCE_URLS)) {
-			restoreCustomURLs(prefs);
-		} else if (property.equals(IAntCoreConstants.PREFERENCE_ANT_HOME)) {
-			restoreAntHome(prefs);
-		} else if (property.equals(IAntCoreConstants.PREFERENCE_PROPERTIES) || property.startsWith(IAntCoreConstants.PREFIX_PROPERTY)) {
-			restoreCustomProperties(prefs);
-		} else if (property.equals(IAntCoreConstants.PREFERENCE_PROPERTY_FILES)) {
-			restoreCustomPropertyFiles(prefs);
-		}
-	}
-
-	/**
-	 * Restores the in-memory model of the preferences from the preference store
-	 */
-	private void restoreCustomObjects() {
-		Preferences prefs = AntCorePlugin.getPlugin().getPluginPreferences();
-		restoreTasks(prefs);
-		restoreTypes(prefs);
-		restoreAntURLs(prefs);
-		restoreCustomURLs(prefs);
-		restoreAntHome(prefs);
-		restoreCustomProperties(prefs);
-		restoreCustomPropertyFiles(prefs);
-		prefs.addPropertyChangeListener(this);
-	}
-	
-	private void restoreTasks(Preferences prefs) {
-		 String tasks = prefs.getString(IAntCoreConstants.PREFERENCE_TASKS);
-		 if (tasks.equals("")) { //$NON-NLS-1$
-			 customTasks = new Task[0];
-		 } else {
-			 customTasks = extractTasks(prefs, getArrayFromString(tasks));
-		 }
-	}
-	
-	private void restoreTypes(Preferences prefs) {
-		String types = prefs.getString(IAntCoreConstants.PREFERENCE_TYPES);
-		if (types.equals("")) {//$NON-NLS-1$
-			customTypes = new Type[0];
-		} else {
-			customTypes = extractTypes(prefs, getArrayFromString(types));
-		}
-	}
-	
-	private void restoreAntURLs(Preferences prefs) {
-		String urls = prefs.getString(IAntCoreConstants.PREFERENCE_ANT_URLS);
-		if (urls.equals("")) {//$NON-NLS-1$
-			antURLs = getDefaultAntURLs();
-		} else {
-			antURLs = extractURLs(getArrayFromString(urls));
-		}
-	}
-	
-	private void restoreCustomURLs(Preferences prefs) {
-		String urls = prefs.getString(IAntCoreConstants.PREFERENCE_URLS);
-		if (urls.equals("")) {//$NON-NLS-1$
-			customURLs = new URL[0];
-		} else {
-			customURLs = extractURLs(getArrayFromString(urls));
-		}
-	}
-	
-	private void restoreAntHome(Preferences prefs) {
-		antHome= prefs.getString(IAntCoreConstants.PREFERENCE_ANT_HOME);
-	}
-	
-	private void restoreCustomProperties(Preferences prefs) {
-		String properties = prefs.getString(IAntCoreConstants.PREFERENCE_PROPERTIES);
-		if (properties.equals("")) {//$NON-NLS-1$
-			customProperties = new Property[0];
-		} else {
-			customProperties = extractProperties(prefs, getArrayFromString(properties));
-		}
-	}
-	
-	private void restoreCustomPropertyFiles(Preferences prefs) {
-		String propertyFiles= prefs.getString(IAntCoreConstants.PREFERENCE_PROPERTY_FILES);
-		if (propertyFiles.equals("")) { //$NON-NLS-1$
-			customPropertyFiles= new String[0];
-		} else {
-			customPropertyFiles= getArrayFromString(propertyFiles);
-		}
-	}
-
-	protected Task[] extractTasks(Preferences prefs, String[] tasks) {
-		List result = new ArrayList(tasks.length);
-		for (int i = 0; i < tasks.length; i++) {
-			try {
-				String taskName = tasks[i];
-				String[] values = getArrayFromString(prefs.getString(IAntCoreConstants.PREFIX_TASK + taskName));
-				if (values.length < 2) {
-					continue;
-				}
-				Task task = new Task();
-				task.setTaskName(taskName);
-				task.setClassName(values[0]);
-				task.setLibrary(new URL(values[1]));
-				result.add(task);
-			} catch (MalformedURLException e) {
-				// if the URL does not have a valid format, just log and ignore the exception
-				IStatus status = new Status(IStatus.ERROR, AntCorePlugin.PI_ANTCORE, AntCorePlugin.ERROR_MALFORMED_URL, InternalCoreAntMessages.getString("AntCorePreferences.Malformed_URL._1"), e); //$NON-NLS-1$
-				AntCorePlugin.getPlugin().getLog().log(status);
-			}
-		}
-		return (Task[]) result.toArray(new Task[result.size()]);
-	}
-
-	protected Type[] extractTypes(Preferences prefs, String[] types) {
-		List result = new ArrayList(types.length);
-		for (int i = 0; i < types.length; i++) {
-			try {
-				String typeName = types[i];
-				String[] values = getArrayFromString(prefs.getString(IAntCoreConstants.PREFIX_TYPE + typeName));
-				if (values.length < 2) {
-					continue;
-				}
-				Type type = new Type();
-				type.setTypeName(typeName);
-				type.setClassName(values[0]);
-				type.setLibrary(new URL(values[1]));
-				result.add(type);
-			} catch (MalformedURLException e) {
-				// if the URL does not have a valid format, just log and ignore the exception
-				IStatus status = new Status(IStatus.ERROR, AntCorePlugin.PI_ANTCORE, AntCorePlugin.ERROR_MALFORMED_URL, InternalCoreAntMessages.getString("AntCorePreferences.Malformed_URL._1"), e);  //$NON-NLS-1$
-				AntCorePlugin.getPlugin().getLog().log(status);
-			}
-		}
-		return (Type[]) result.toArray(new Type[result.size()]);
-	}
-	
-	protected Property[] extractProperties(Preferences prefs, String[] properties) {
-		Property[] result = new Property[properties.length];
-		for (int i = 0; i < properties.length; i++) {
-			String propertyName = properties[i];
-			String[] values = getArrayFromString(prefs.getString(IAntCoreConstants.PREFIX_PROPERTY + propertyName));
-			if (values.length < 1) {
-				continue;
-			}
-			Property property = new Property();
-			property.setName(propertyName);
-			property.setValue(values[0]);
-			result[i]= property;
-		}
-		return result;
-	}
-
-	protected URL[] extractURLs(String[] urls) {
-		List result = new ArrayList(urls.length);
-		for (int i = 0; i < urls.length; i++) {
-			try {
-				result.add(new URL(urls[i]));
-			} catch (MalformedURLException e) {
-				// if the URL does not have a valid format, just log and ignore the exception
-				IStatus status = new Status(IStatus.ERROR, AntCorePlugin.PI_ANTCORE, AntCorePlugin.ERROR_MALFORMED_URL, InternalCoreAntMessages.getString("AntCorePreferences.Malformed_URL._1"), e);  //$NON-NLS-1$
-				AntCorePlugin.getPlugin().getLog().log(status);
-			}
-		}
-		return (URL[]) result.toArray(new URL[result.size()]);
-	}
-
-	/**
-	 * Returns the array of URLs that is the default set of URLs defining
-	 * the Ant classpath.
-	 * The Xerces JARs are included when the plugin classloader for org.eclipse.ant.core
-	 * is set as one of the plugin classloaders of the AntClassLoader.
-	 * 
-	 * Ant running through the command line tries to find tools.jar to help the
-	 * user. Try emulating the same behaviour here.
-	 *
-	 * @return the default set of URLs defining the Ant classpath
-	 */
-	public URL[] getDefaultAntURLs() {
-		if (defaultAntURLs == null) {
-			List result = new ArrayList(3);
-			Plugin antPlugin= Platform.getPlugin("org.apache.ant"); //$NON-NLS-1$
-			if (antPlugin != null) {
-				IPluginDescriptor descriptor = antPlugin.getDescriptor(); 
-				addLibraries(descriptor, result);
-			}
-			
-			URL toolsURL= getToolsJarURL();
-			if (toolsURL != null) {
-				result.add(toolsURL);
-			}
-			defaultAntURLs= (URL[]) result.toArray(new URL[result.size()]);
-		}
-		return defaultAntURLs;
-	}
-	
-	/**
-	 * Returns the array of URLs that is the set of URLs defining the Ant
-	 * classpath.
-	 * 
-	 * @return the set of URLs defining the Ant classpath
-	 */
-	public URL[] getAntURLs() {
-		return antURLs;
-	}
-
-	protected List computeDefaultTasks(List tasks) {
-		List result = new ArrayList(tasks.size());
-		for (Iterator iterator = tasks.iterator(); iterator.hasNext();) {
-			IConfigurationElement element = (IConfigurationElement) iterator.next();
-			if (runningHeadless) {
-				String headless = element.getAttribute(AntCorePlugin.HEADLESS);
-				if (headless != null) {
-					boolean headlessType= Boolean.valueOf(headless).booleanValue();
-					if (!headlessType) {
-						continue;
-					}
-				}
-			}
-			Task task = new Task();
-			task.setIsDefault(true);
-			task.setTaskName(element.getAttribute(AntCorePlugin.NAME));
-			task.setClassName(element.getAttribute(AntCorePlugin.CLASS));
-			String library = element.getAttribute(AntCorePlugin.LIBRARY);
-			if (library == null) {
-				IStatus status = new Status(IStatus.ERROR, AntCorePlugin.PI_ANTCORE, AntCorePlugin.ERROR_LIBRARY_NOT_SPECIFIED, MessageFormat.format(InternalCoreAntMessages.getString("AntCorePreferences.Library_not_specified_for__{0}_4"), new String[]{task.getTaskName()}), null); //$NON-NLS-1$
-				AntCorePlugin.getPlugin().getLog().log(status);
-				continue;
-			}
-			
-			IPluginDescriptor descriptor = element.getDeclaringExtension().getDeclaringPluginDescriptor();
-			try {
-				URL url = Platform.asLocalURL(new URL(descriptor.getInstallURL(), library));
-				if (new File(url.getPath()).exists()) {
-					if (!extraClasspathURLs.contains(url)) {
-						extraClasspathURLs.add(url);
-					}
-					result.add(task);
-					addPluginClassLoader(descriptor.getPluginClassLoader());
-					task.setLibrary(url);
-				} else {
-					//task specifies a library that does not exist
-					IStatus status = new Status(IStatus.ERROR, AntCorePlugin.PI_ANTCORE, AntCorePlugin.ERROR_LIBRARY_NOT_SPECIFIED, MessageFormat.format(InternalCoreAntMessages.getString("AntCorePreferences.No_library_for_task"), new String[]{url.toExternalForm(), descriptor.getLabel()}), null); //$NON-NLS-1$
-					AntCorePlugin.getPlugin().getLog().log(status);
-					continue;
-				}
-			} catch (Exception e) {
-				// if the URL does not have a valid format, just log and ignore the exception
-				IStatus status = new Status(IStatus.ERROR, AntCorePlugin.PI_ANTCORE, AntCorePlugin.ERROR_MALFORMED_URL, InternalCoreAntMessages.getString("AntCorePreferences.Malformed_URL._1"), e); //$NON-NLS-1$
-				AntCorePlugin.getPlugin().getLog().log(status);
-				continue;
-			}
-		}
-		return result;
-	}
-
-	protected List computeDefaultTypes(List types) {
-		List result = new ArrayList(types.size());
-		for (Iterator iterator = types.iterator(); iterator.hasNext();) {
-			IConfigurationElement element = (IConfigurationElement) iterator.next();
-			if (runningHeadless) {
-				String headless = element.getAttribute(AntCorePlugin.HEADLESS);
-				if (headless != null) {
-					boolean headlessTask= Boolean.valueOf(headless).booleanValue();
-					if (!headlessTask) {
-						continue;
-					}
-				}
-			}
-			Type type = new Type();
-			type.setIsDefault(true);
-			type.setTypeName(element.getAttribute(AntCorePlugin.NAME));
-			type.setClassName(element.getAttribute(AntCorePlugin.CLASS));
-			String library = element.getAttribute(AntCorePlugin.LIBRARY);
-			if (library == null) {
-				IStatus status = new Status(IStatus.ERROR, AntCorePlugin.PI_ANTCORE, AntCorePlugin.ERROR_LIBRARY_NOT_SPECIFIED, MessageFormat.format(InternalCoreAntMessages.getString("AntCorePreferences.Library_not_specified_for__{0}_4"), new String[]{type.getTypeName()}), null); //$NON-NLS-1$
-				AntCorePlugin.getPlugin().getLog().log(status);
-				continue;
-			}
-			IPluginDescriptor descriptor = element.getDeclaringExtension().getDeclaringPluginDescriptor();
-			try {
-				URL url = Platform.asLocalURL(new URL(descriptor.getInstallURL(), library));
-				if (new File(url.getPath()).exists()) {
-					if (!extraClasspathURLs.contains(url)) {
-						extraClasspathURLs.add(url);
-					}
-					result.add(type);
-					addPluginClassLoader(descriptor.getPluginClassLoader());
-					type.setLibrary(url);
-				} else {
-					//type specifies a library that does not exist
-					IStatus status = new Status(IStatus.ERROR, AntCorePlugin.PI_ANTCORE, AntCorePlugin.ERROR_LIBRARY_NOT_SPECIFIED, MessageFormat.format(InternalCoreAntMessages.getString("AntCorePreferences.No_library_for_type"), new String[]{url.toExternalForm(), descriptor.getLabel()}), null); //$NON-NLS-1$
-					AntCorePlugin.getPlugin().getLog().log(status);
-					continue;
-				}
-			} catch (Exception e) {
-				// if the URL does not have a valid format, just log and ignore the exception
-				IStatus status = new Status(IStatus.ERROR, AntCorePlugin.PI_ANTCORE, AntCorePlugin.ERROR_MALFORMED_URL, InternalCoreAntMessages.getString("AntCorePreferences.Malformed_URL._1"), e); //$NON-NLS-1$
-				AntCorePlugin.getPlugin().getLog().log(status);
-				continue;
-			}
-		}
-		return result;
-	}
-
-	/**
-	 * Computes the extra classpath entries defined plugins and fragments.
-	 */
-	protected void computeDefaultExtraClasspathEntries(List entries) {
-		for (Iterator iterator = entries.iterator(); iterator.hasNext();) {
-			IConfigurationElement element = (IConfigurationElement) iterator.next();
-			if (runningHeadless) {
-				String headless = element.getAttribute(AntCorePlugin.HEADLESS);
-				if (headless != null) {
-					boolean headlessEntry= Boolean.valueOf(headless).booleanValue();
-					if (!headlessEntry) {
-						continue;
-					}
-				}
-			}
-			String library = (String) element.getAttribute(AntCorePlugin.LIBRARY);
-			IPluginDescriptor descriptor = element.getDeclaringExtension().getDeclaringPluginDescriptor();
-			try {
-				URL url = Platform.asLocalURL(new URL(descriptor.getInstallURL(), library));
-				
-				if (new File(url.getPath()).exists()) {
-					if (!extraClasspathURLs.contains(url)) {
-						extraClasspathURLs.add(url);
-					}
-					addPluginClassLoader(descriptor.getPluginClassLoader());
-				} else {
-					//extra classpath entry that does not exist
-					IStatus status = new Status(IStatus.ERROR, AntCorePlugin.PI_ANTCORE, AntCorePlugin.ERROR_LIBRARY_NOT_SPECIFIED, MessageFormat.format(InternalCoreAntMessages.getString("AntCorePreferences.No_library_for_extraClasspathEntry"), new String[]{url.toExternalForm(), descriptor.getLabel()}), null); //$NON-NLS-1$
-					AntCorePlugin.getPlugin().getLog().log(status);
-					continue;
-				}
-			} catch (Exception e) {
-				// if the URL does not have a valid format, just log and ignore the exception
-				IStatus status = new Status(IStatus.ERROR, AntCorePlugin.PI_ANTCORE, AntCorePlugin.ERROR_MALFORMED_URL, InternalCoreAntMessages.getString("AntCorePreferences.Malformed_URL._1"), e); //$NON-NLS-1$
-				AntCorePlugin.getPlugin().getLog().log(status);
-				continue;
-			}
-		}
-	}
-
-	/**
-	 * Returns the URL for the tools.jar associated with the "java.home"
-	 * location. May return <code>null</code> if no tools.jar is found (e.g. "java.home"
-	 * points to a JRE install).
-	 * 
-	 * @return URL tools.jar URL or <code>null</code>
-	 */
-	public URL getToolsJarURL() {
-		IPath path = new Path(System.getProperty("java.home")); //$NON-NLS-1$
-		if (path.lastSegment().equalsIgnoreCase("jre")) { //$NON-NLS-1$
-			path = path.removeLastSegments(1);
-		}
-		path = path.append("lib").append("tools.jar"); //$NON-NLS-1$ //$NON-NLS-2$
-		File tools = path.toFile();
-		if (!tools.exists()) {
-			//attempt to find in the older 1.1.* 
-			path= path.removeLastSegments(1);
-			path= path.append("classes.zip"); //$NON-NLS-1$
-			tools = path.toFile();
-			if (!tools.exists()) {
-				return null;
-			}
-		}
-		try {
-			return new URL("file:" + tools.getAbsolutePath()); //$NON-NLS-1$
-		} catch (MalformedURLException e) {
-			// if the URL does not have a valid format, just log and ignore the exception
-			IStatus status = new Status(IStatus.ERROR, AntCorePlugin.PI_ANTCORE, AntCorePlugin.ERROR_MALFORMED_URL, InternalCoreAntMessages.getString("AntCorePreferences.Malformed_URL._1"), e);  //$NON-NLS-1$
-			AntCorePlugin.getPlugin().getLog().log(status);
-		}
-		return null;
-	}
-
-	protected void addLibraries(IPluginDescriptor source, List destination) {
-		URL root = source.getInstallURL();
-		ILibrary[] libraries = source.getRuntimeLibraries();
-		for (int i = 0; i < libraries.length; i++) {
-			try {
-				URL url = new URL(root, libraries[i].getPath().toString());
-				destination.add(Platform.asLocalURL(url));
-			} catch (Exception e) {
-				// if the URL does not have a valid format, just log and ignore the exception
-				IStatus status = new Status(IStatus.ERROR, AntCorePlugin.PI_ANTCORE, AntCorePlugin.ERROR_MALFORMED_URL, InternalCoreAntMessages.getString("AntCorePreferences.Malformed_URL._1"), e);  //$NON-NLS-1$
-				AntCorePlugin.getPlugin().getLog().log(status);
-				continue;
-			}
-		}
-	}
-
-	protected void addPluginClassLoader(ClassLoader loader) {
-		if (!pluginClassLoaders.contains(loader)) {
-			pluginClassLoaders.add(loader);
-		}
-	}
-
-	/**
-	 * Returns the list of urls added to the classpath by the extra classpath
-	 * entries extension point.
-	 * 
-	 * @return the list of extra classpath URLs
-	 */
-	public URL[] getExtraClasspathURLs() {
-		return (URL[])extraClasspathURLs.toArray(new URL[extraClasspathURLs.size()]);
-	}
-	
-	/**
-	 * Returns the entire set of URLs that define the Ant runtime classpath.
-	 * Includes the Ant URLs, the custom URLs and extra classpath URLs.
-	 * 
-	 * @return the entire runtime classpath of URLs
-	 */
-	public URL[] getURLs() {
-		List result = new ArrayList(20);
-		if (antURLs != null) {
-			result.addAll(Arrays.asList(antURLs));
-		}
-		if (customURLs != null && customURLs.length > 0) {
-			result.addAll(Arrays.asList(customURLs));
-		}
-		if (extraClasspathURLs != null) {
-			result.addAll(extraClasspathURLs);
-		}
-		return (URL[]) result.toArray(new URL[result.size()]);
-	}
-
-	protected ClassLoader[] getPluginClassLoaders() {
-		if (orderedPluginClassLoaders == null) {
-			Iterator classLoaders= pluginClassLoaders.iterator();
-			Map idToLoader= new HashMap(pluginClassLoaders.size());
-			IPluginDescriptor[] descriptors= new IPluginDescriptor[pluginClassLoaders.size()];
-			int i= 0;
-			while (classLoaders.hasNext()) {
-				PluginClassLoader loader = (PluginClassLoader) classLoaders.next();
-				IPluginDescriptor descriptor= loader.getPluginDescriptor();
-				idToLoader.put(descriptor.getUniqueIdentifier(), loader);
-				descriptors[i]= descriptor;
-				i++;
-			}
-			String[] ids= computePrerequisiteOrderPlugins(descriptors);
-			orderedPluginClassLoaders= new ClassLoader[pluginClassLoaders.size()];
-			for (int j = 0; j < ids.length; j++) {
-				String id = ids[j];
-				orderedPluginClassLoaders[j]= (ClassLoader)idToLoader.get(id);
-			}
-		}
-		return orderedPluginClassLoaders;
-	}
-
-	/**
-	 * Copied from org.eclipse.pde.internal.build.Utils
-	 */
-	private String[] computePrerequisiteOrderPlugins(IPluginDescriptor[] plugins) {
-		List prereqs = new ArrayList(9);
-		Set pluginList = new HashSet(plugins.length);
-		for (int i = 0; i < plugins.length; i++) {
-			pluginList.add(plugins[i].getUniqueIdentifier());
-		}
-		
-		// create a collection of directed edges from plugin to prereq
-		for (int i = 0; i < plugins.length; i++) {
-			boolean boot = false;
-			boolean runtime = false;
-			boolean found = false;
-			IPluginPrerequisite[] prereqList = plugins[i].getPluginPrerequisites();
-			if (prereqList != null) {
-				for (int j = 0; j < prereqList.length; j++) {
-					// ensure that we only include values from the original set.
-					String prereq = prereqList[j].getUniqueIdentifier();
-					boot = boot || prereq.equals(BootLoader.PI_BOOT);
-					runtime = runtime || prereq.equals(Platform.PI_RUNTIME);
-					if (pluginList.contains(prereq)) {
-						found = true;
-						prereqs.add(new String[] { plugins[i].getUniqueIdentifier(), prereq });
-					}
-				}
-			}
-
-			// if we didn't find any prereqs for this plugin, add a null prereq
-			// to ensure the value is in the output	
-			if (!found) {
-				prereqs.add(new String[] { plugins[i].getUniqueIdentifier(), null });
-			}
-
-			// if we didn't find the boot or runtime plugins as prereqs and they are in the list
-			// of plugins to build, add prereq relations for them.  This is required since the 
-			// boot and runtime are implicitly added to a plugin's requires list by the platform runtime.
-			// Note that we should skip the xerces plugin as this would cause a circularity.
-			if (plugins[i].getUniqueIdentifier().equals("org.apache.xerces")) //$NON-NLS-1$
-				continue;
-			if (!boot && pluginList.contains(BootLoader.PI_BOOT) && !plugins[i].getUniqueIdentifier().equals(BootLoader.PI_BOOT))
-				prereqs.add(new String[] { plugins[i].getUniqueIdentifier(), BootLoader.PI_BOOT });
-			if (!runtime && pluginList.contains(Platform.PI_RUNTIME) && !plugins[i].getUniqueIdentifier().equals(Platform.PI_RUNTIME) && !plugins[i].getUniqueIdentifier().equals(BootLoader.PI_BOOT))
-				prereqs.add(new String[] { plugins[i].getUniqueIdentifier(), Platform.PI_RUNTIME });
-		}
-
-		// do a topological sort, insert the fragments into the sorted elements
-		String[][] prereqArray = (String[][]) prereqs.toArray(new String[prereqs.size()][]);
-		return computeNodeOrder(prereqArray);
-	}
-	
-	/**
-	 * Copied from org.eclipse.pde.internal.build.Utils
-	 */
-	private String[] computeNodeOrder(String[][] specs) {
-		Map counts = computeCounts(specs);
-		List nodes = new ArrayList(counts.size());
-		while (!counts.isEmpty()) {
-			List roots = findRootNodes(counts);
-			if (roots.isEmpty())
-				break;
-			for (Iterator i = roots.iterator(); i.hasNext();)
-				counts.remove(i.next());
-			nodes.addAll(roots);
-			removeArcs(specs, roots, counts);
-		}
-		String[] result = new String[nodes.size()];
-		nodes.toArray(result);
-
-		return result;
-	}
-	
-	/**
-	 * Copied from org.eclipse.pde.internal.build.Utils
-	 */
-	private void removeArcs(String[][] mappings, List roots, Map counts) {
-		for (Iterator j = roots.iterator(); j.hasNext();) {
-			String root = (String) j.next();
-			for (int i = 0; i < mappings.length; i++) {
-				if (root.equals(mappings[i][1])) {
-					String input = mappings[i][0];
-					Integer count = (Integer) counts.get(input);
-					if (count != null)
-						counts.put(input, new Integer(count.intValue() - 1));
-				}
-			}
-		}
-	}
-	
-	/**
-	 * Copied from org.eclipse.pde.internal.build.Utils
-	 */
-	private List findRootNodes(Map counts) {
-		List result = new ArrayList(5);
-		for (Iterator i = counts.keySet().iterator(); i.hasNext();) {
-			String node = (String) i.next();
-			int count = ((Integer) counts.get(node)).intValue();
-			if (count == 0)
-				result.add(node);
-		}
-		return result;
-	}
-	
-	/**
-	 * Copied from org.eclipse.pde.internal.build.Utils
-	 */
-	private Map computeCounts(String[][] mappings) {
-		Map counts = new HashMap(5);
-		for (int i = 0; i < mappings.length; i++) {
-			String from = mappings[i][0];
-			Integer fromCount = (Integer) counts.get(from);
-			String to = mappings[i][1];
-			if (to == null)
-				counts.put(from, new Integer(0));
-			else {
-				if (((Integer) counts.get(to)) == null)
-					counts.put(to, new Integer(0));
-				fromCount = fromCount == null ? new Integer(1) : new Integer(fromCount.intValue() + 1);
-				counts.put(from, fromCount);
-			}
-		}
-		return counts;
-	}
-	
-	private void initializePluginClassLoaders() {
-		pluginClassLoaders = new ArrayList(10);
-		// ant.core should always be present (provides access to Xerces as well)
-		pluginClassLoaders.add(Platform.getPlugin(AntCorePlugin.PI_ANTCORE).getDescriptor().getPluginClassLoader());
-	}
-
-	/**
-	 * Returns the default and custom tasks.
-	 * 
-	 * @return the list of default and custom tasks.
-	 */
-	public List getTasks() {
-		List result = new ArrayList(10);
-		if (defaultTasks != null && !defaultTasks.isEmpty()) {
-			result.addAll(defaultTasks);
-		}
-		if (customTasks != null && customTasks.length != 0) {
-			result.addAll(Arrays.asList(customTasks));
-		}
-		return result;
-	}
-
-	/**
-	 * Returns the user defined custom tasks
-	 * @return the user defined tasks
-	 */
-	public Task[] getCustomTasks() {
-		return customTasks;
-	}
-
-	/**
-	 * Returns the user defined custom types
-	 * @return the user defined types
-	 */
-	public Type[] getCustomTypes() {
-		return customTypes;
-	}
-
-	/**
-	 * Returns the custom user properties specified for Ant builds.
-	 * 
-	 * @return the properties defined for Ant builds.
-	 */
-	public Property[] getCustomProperties() {
-		return customProperties;
-	}
-	
-	/**
-	 * Returns the custom property files specified for Ant builds.
-	 * 
-	 * @return the property files defined for Ant builds.
-	 */
-	public String[] getCustomPropertyFiles() {
-		return customPropertyFiles;
-	}
-	
-	/**
-	 * Returns the custom URLs specified for the Ant classpath
-	 * 
-	 * @return the urls defining the Ant classpath
-	 */
-	public URL[] getCustomURLs() {
-		return customURLs;
-	}
-
-	/**
-	 * Sets the user defined custom tasks
-	 * @param tasks
-	 */
-	public void setCustomTasks(Task[] tasks) {
-		oldCustomTasks= customTasks;
-		customTasks = tasks;
-	}
-
-	/**
-	 * Sets the user defined custom types
-	 * @param tasks
-	 */
-	public void setCustomTypes(Type[] types) {
-		oldCustomTypes= customTypes;
-		customTypes = types;
-	}
-
-	/**
-	 * Sets the custom URLs specified for the Ant classpath.
-	 * To commit the changes, updatePluginPreferences must be
-	 * called.
-	 * 
-	 * @param the urls defining the Ant classpath
-	 */
-	public void setCustomURLs(URL[] urls) {
-		customURLs = urls;
-	}
-	
-	/**
-	 * Sets the Ant URLs specified for the Ant classpath. To commit the changes,
-	 * updatePluginPreferences must be called.
-	 * 
-	 * @param the urls defining the Ant classpath
-	 */
-	public void setAntURLs(URL[] urls) {
-		antURLs = urls;
-	}
-	
-	/**
-	 * Sets the custom property files specified for Ant builds. To commit the
-	 * changes, updatePluginPreferences must be called.
-	 * 
-	 * @param the absolute paths defining the property files to use.
-	 */
-	public void setCustomPropertyFiles(String[] paths) {
-		customPropertyFiles = paths;
-	}
-	
-	/**
-	 * Sets the custom user properties specified for Ant builds. To commit the
-	 * changes, updatePluginPreferences must be called.
-	 * 
-	 * @param the properties defining the Ant properties
-	 */
-	public void setCustomProperties(Property[] properties) {
-		oldCustomProperties= customProperties;
-		customProperties = properties;
-	}
-
-	/**
-	 * Returns the default and custom types.
-	 * 
-	 * @return all of the defined types
-	 */
-	public List getTypes() {
-		List result = new ArrayList(10);
-		if (defaultTypes != null && !defaultTypes.isEmpty()) {
-			result.addAll(defaultTypes);
-		}
-		if (customTypes != null && customTypes.length != 0) {
-			result.addAll(Arrays.asList(customTypes));
-		}
-		return result;
-	}
-	
-	/**
-	 * Returns the default types defined via the type extension point
-	 * 
-	 * @return all of the default types
-	 */
-	public List getDefaultTypes() {
-		List result = new ArrayList(10);
-		if (defaultTypes != null && !defaultTypes.isEmpty()) {
-			result.addAll(defaultTypes);
-		}
-		return result;
-	}
-	
-	/**
-	 * Returns the default tasks defined via the task extension point
-	 * 
-	 * @return all of the default tasks
-	 */
-	public List getDefaultTasks() {
-		List result = new ArrayList(10);
-		if (defaultTasks != null && !defaultTasks.isEmpty()) {
-			result.addAll(defaultTasks);
-		}
-		return result;
-	}
-
-	/**
-	 * Convert a list of tokens into an array using "," as the tokenizer.
-	 */
-	protected String[] getArrayFromString(String list) {
-		String separator= ","; //$NON-NLS-1$
-		if (list == null || list.trim().equals("")) { //$NON-NLS-1$
-			return new String[0];
-		}
-		ArrayList result = new ArrayList();
-		for (StringTokenizer tokens = new StringTokenizer(list, separator); tokens.hasMoreTokens();) {
-			String token = tokens.nextToken().trim();
-			if (!token.equals("")) { //$NON-NLS-1$
-				result.add(token);
-			}
-		}
-		return (String[]) result.toArray(new String[result.size()]);
-	}
-
-	/**
-	 * Updates the underlying plugin preferences to the current state.
-	 */
-	public void updatePluginPreferences() {
-		Preferences prefs = AntCorePlugin.getPlugin().getPluginPreferences();
-		prefs.removePropertyChangeListener(this);
-		updateTasks(prefs);
-		updateTypes(prefs);
-		updateAntURLs(prefs);
-		updateURLs(prefs);
-		updateProperties(prefs);
-		updatePropertyFiles(prefs);
-		AntCorePlugin.getPlugin().savePluginPreferences();
-		prefs.addPropertyChangeListener(this);
-	}
-
-	protected void updateTasks(Preferences prefs) {
-		if (oldCustomTasks != null) {
-			for (int i = 0; i < oldCustomTasks.length; i++) {
-				Task oldTask = oldCustomTasks[i];
-				prefs.setToDefault(IAntCoreConstants.PREFIX_TASK + oldTask.getTaskName());
-			}
-			oldCustomTasks= null;	
-		}	
-		
-		if (customTasks.length == 0) {
-			prefs.setValue(IAntCoreConstants.PREFERENCE_TASKS, ""); //$NON-NLS-1$
-			return;
-		}
-		StringBuffer tasks = new StringBuffer();
-		for (int i = 0; i < customTasks.length; i++) {
-			tasks.append(customTasks[i].getTaskName());
-			tasks.append(',');
-			prefs.setValue(IAntCoreConstants.PREFIX_TASK + customTasks[i].getTaskName(), customTasks[i].getClassName() + "," + customTasks[i].getLibrary().toExternalForm()); //$NON-NLS-1$
-		}
-		prefs.setValue(IAntCoreConstants.PREFERENCE_TASKS, tasks.toString());
-	}
-
-	protected void updateTypes(Preferences prefs) {
-		if (oldCustomTypes != null) {
-			for (int i = 0; i < oldCustomTypes.length; i++) {
-				Type oldType = oldCustomTypes[i];
-				prefs.setToDefault(IAntCoreConstants.PREFIX_TYPE + oldType.getTypeName());
-			}
-			oldCustomTypes= null;	
-		}	
-				
-		if (customTypes.length == 0) {
-			prefs.setValue(IAntCoreConstants.PREFERENCE_TYPES, ""); //$NON-NLS-1$
-			return;
-		}
-		StringBuffer types = new StringBuffer();
-		for (int i = 0; i < customTypes.length; i++) {
-			types.append(customTypes[i].getTypeName());
-			types.append(',');
-			prefs.setValue(IAntCoreConstants.PREFIX_TYPE + customTypes[i].getTypeName(), customTypes[i].getClassName() + "," + customTypes[i].getLibrary().toExternalForm()); //$NON-NLS-1$
-		}
-		prefs.setValue(IAntCoreConstants.PREFERENCE_TYPES, types.toString());
-	}
-	
-	protected void updateProperties(Preferences prefs) {
-		if (oldCustomProperties != null) {
-			for (int i = 0; i < oldCustomProperties.length; i++) {
-				Property oldProperty = oldCustomProperties[i];
-				prefs.setToDefault(IAntCoreConstants.PREFIX_PROPERTY + oldProperty.getName());
-			}
-			oldCustomProperties= null;
-		}
-		
-		if (customProperties.length == 0) {
-			prefs.setValue(IAntCoreConstants.PREFERENCE_PROPERTIES, ""); //$NON-NLS-1$
-			return;
-		}
-		StringBuffer properties = new StringBuffer();
-		for (int i = 0; i < customProperties.length; i++) {
-			properties.append(customProperties[i].getName());
-			properties.append(',');
-			prefs.setValue(IAntCoreConstants.PREFIX_PROPERTY + customProperties[i].getName(), customProperties[i].getValue()); //$NON-NLS-1$
-		}
-		prefs.setValue(IAntCoreConstants.PREFERENCE_PROPERTIES, properties.toString());
-	}
-
-	protected void updateURLs(Preferences prefs) {
-		StringBuffer urls = new StringBuffer();
-		for (int i = 0; i < customURLs.length; i++) {
-			urls.append(customURLs[i].toExternalForm());
-			urls.append(',');
-		}
-		
-		prefs.setValue(IAntCoreConstants.PREFERENCE_URLS, urls.toString());
-		String prefAntHome= ""; //$NON-NLS-1$
-		if (antHome != null) {
-			prefAntHome= antHome;
-		} 
-		prefs.setValue(IAntCoreConstants.PREFERENCE_ANT_HOME, prefAntHome);
-	}
-	
-	protected void updateAntURLs(Preferences prefs) {
-		//see if the custom URLS are just the default URLS
-		URL[] dcUrls= getDefaultAntURLs();
-		boolean dflt= false;
-		if (dcUrls.length == antURLs.length) {
-			dflt= true;
-			for (int i = 0; i < antURLs.length; i++) {
-				if (!antURLs[i].equals(dcUrls[i])) {
-					dflt= false;
-					break;
-				}
-			}
-		}
-		if (dflt) {
-			//always want to recalculate the default Ant urls
-			//to pick up any changes in the default Ant classpath
-			prefs.setValue(IAntCoreConstants.PREFERENCE_ANT_URLS, ""); //$NON-NLS-1$
-			return;
-		}
-		StringBuffer urls = new StringBuffer();
-		for (int i = 0; i < antURLs.length; i++) {
-			urls.append(antURLs[i].toExternalForm());
-			urls.append(',');
-		}
-		
-		prefs.setValue(IAntCoreConstants.PREFERENCE_ANT_URLS, urls.toString());
-	}
-	
-	protected void updatePropertyFiles(Preferences prefs) {
-		StringBuffer files = new StringBuffer();
-		for (int i = 0; i < customPropertyFiles.length; i++) {
-			files.append(customPropertyFiles[i]);
-			files.append(',');
-		}
-		
-		prefs.setValue(IAntCoreConstants.PREFERENCE_PROPERTY_FILES, files.toString());
-	}
-	
-	/**
-	 * Sets the string that defines the Ant home set by the user.
-	 * May be set to <code>null</code>.
-	 * 
-	 * @param the fully qualified path to Ant home
-	 */
-	public void setAntHome(String antHome) {
-		this.antHome= antHome;
-	}
-	
-	/**
-	 * Returns the string that defines the Ant home set by the user.
-	 * May be <code>null</code> if Ant home has not been set.
-	 * 
-	 * @return the fully qualified path to Ant home
-	 */
-	public String getAntHome() {
-		return antHome;
-	}
-}
diff --git a/ant/org.eclipse.ant.core/src/org/eclipse/ant/core/AntRunner.java b/ant/org.eclipse.ant.core/src/org/eclipse/ant/core/AntRunner.java
deleted file mode 100644
index f1898b2..0000000
--- a/ant/org.eclipse.ant.core/src/org/eclipse/ant/core/AntRunner.java
+++ /dev/null
@@ -1,542 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.core;
-
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.net.URL;
-import java.text.MessageFormat;
-import java.util.*;
-
-import org.eclipse.ant.internal.core.AntClassLoader;
-import org.eclipse.ant.internal.core.IAntCoreConstants;
-import org.eclipse.ant.internal.core.InternalCoreAntMessages;
-import org.eclipse.core.boot.BootLoader;
-import org.eclipse.core.boot.IPlatformRunnable;
-import org.eclipse.core.runtime.*;
-
-/**
- * Entry point for running Ant builds inside Eclipse.
- */
-public class AntRunner implements IPlatformRunnable {
-
-	private static boolean buildRunning= false;
-	protected String buildFileLocation = IAntCoreConstants.DEFAULT_BUILD_FILENAME;
-	protected List buildListeners;
-	protected String[] targets;
-	protected Map userProperties;
-	protected int messageOutputLevel = 2; // Project.MSG_INFO
-	protected String buildLoggerClassName;
-	protected String inputHandlerClassName;
-	protected String[] arguments;
-	protected String[] propertyFiles;
-	protected URL[] customClasspath;
-	protected String antHome;
-
-	/**
-	 * Sets the build file location on the file system.
-	 * 
-	 * @param buildFileLocation the file system location of the build file
-	 */
-	public void setBuildFileLocation(String buildFileLocation) {
-		if (buildFileLocation == null) {
-			this.buildFileLocation = IAntCoreConstants.DEFAULT_BUILD_FILENAME;
-		} else {
-			this.buildFileLocation = buildFileLocation;
-		}
-	}
-
-	/**
-	 * Set the message output level.
-	 * <p>
-	 * Valid values are:
-	 * <ul>
-	 * <li><code>org.apache.tools.ant.Project.ERR</code>, 
-	 * <li><code>org.apache.tools.ant.Project.WARN</code>,
-	 * <li><code>org.apache.tools.ant.Project.INFO</code>,
-	 * <li><code>org.apache.tools.ant.Project.VERBOSE</code> or
-	 * <li><code>org.apache.tools.ant.Project.DEBUG</code>
-	 * </ul>
-	 * 
-	 * @param level the message output level
-	 */
-	public void setMessageOutputLevel(int level) {
-		messageOutputLevel = level;
-	}
-
-	/**
-	 * Sets the arguments to be passed to the build (e.g. -Dos=win32 -Dws=win32
-	 * - verbose).
-	 * 
-	 * @param arguments the arguments to be passed to the build
-	 */
-	public void setArguments(String arguments) {
-		this.arguments = getArray(arguments);
-	}
-
-	/**
-	 * Helper method to ensure an array is converted into an ArrayList.
-	 */
-	private String[] getArray(String args) {
-		StringBuffer sb = new StringBuffer();
-		boolean waitingForQuote = false;
-		ArrayList result = new ArrayList();
-		for (StringTokenizer tokens = new StringTokenizer(args, ", \"", true); tokens.hasMoreTokens();) { //$NON-NLS-1$
-			String token = tokens.nextToken();
-			if (waitingForQuote) {
-				if (token.equals("\"")) { //$NON-NLS-1$
-					result.add(sb.toString());
-					sb.setLength(0);
-					waitingForQuote = false;
-				} else {
-					sb.append(token);
-				}
-			} else {
-				if (token.equals("\"")) { //$NON-NLS-1$
-					// test if we have something like -Dproperty="value"
-					if (result.size() > 0) {
-						int index = result.size() - 1;
-						String last = (String) result.get(index);
-						if (last.charAt(last.length() - 1) == '=') {
-							result.remove(index);
-							sb.append(last);
-						}
-					}
-					waitingForQuote = true;
-				} else {
-					if (!(token.equals(",") || token.equals(" "))) //$NON-NLS-1$ //$NON-NLS-2$
-						result.add(token);
-				}
-			}
-		}
-		return (String[]) result.toArray(new String[result.size()]);
-	}
-
-	/**
-	 * Sets the arguments to be passed to the build (e.g. -Dos=win32 -Dws=win32 -verbose).
-	 * 
-	 * @param arguments the arguments to be passed to the build
-	 * @since 2.1
-	 */
-	public void setArguments(String[] arguments) {
-		this.arguments = arguments;
-	}
-
-	/**
-	 * Sets the targets and execution order.
-	 * 
-	 * @param executionTargets which targets should be run and in which order
-	 */
-	public void setExecutionTargets(String[] executionTargets) {
-		this.targets = executionTargets;
-	}
-
-	/**
-	 * Adds a build listener. The parameter <code>className</code>
-	 * is the class name of a <code>org.apache.tools.ant.BuildListener</code>
-	 * implementation. The class will be instantiated at runtime and the
-	 * listener will be called on build events
-	 * (<code>org.apache.tools.ant.BuildEvent</code>).
-	 *
-	 * @param className a build listener class name
-	 */
-	public void addBuildListener(String className) {
-		if (className == null) {
-			return;
-		}
-		if (buildListeners == null) {
-			buildListeners = new ArrayList(5);
-		}
-		buildListeners.add(className);
-	}
-
-	/**
-	 * Sets the build logger. The parameter <code>className</code>
-	 * is the class name of a <code>org.apache.tools.ant.BuildLogger</code>
-	 * implementation. The class will be instantiated at runtime and the
-	 * logger will be called on build events
-	 * (<code>org.apache.tools.ant.BuildEvent</code>).  
-	 * Only one build logger is permitted for any build.
-	 * 
-	 *
-	 * @param className a build logger class name
-	 */
-	public void addBuildLogger(String className) {
-		buildLoggerClassName = className;
-	}
-
-	/**
-	 * Adds user-defined properties. Keys and values must be String objects.
-	 * 
-	 * @param properties a Map of user-defined properties
-	 */
-	public void addUserProperties(Map properties) {
-		userProperties = properties;
-	}
-
-	/**
-	 * Returns the build file target information.
-	 * 
-	 * @return an array containing the target information
-	 * 
-	 * @see TargetInfo
-	 * @since 2.1
-	 */
-	public synchronized TargetInfo[] getAvailableTargets() throws CoreException {
-		Class classInternalAntRunner= null;
-		Object runner= null;
-		ClassLoader originalClassLoader= Thread.currentThread().getContextClassLoader();
-		try {
-			ClassLoader loader = getClassLoader();
-			Thread.currentThread().setContextClassLoader(loader);
-			classInternalAntRunner = loader.loadClass("org.eclipse.ant.internal.core.ant.InternalAntRunner"); //$NON-NLS-1$
-			runner = classInternalAntRunner.newInstance();
-			// set build file
-			Method setBuildFileLocation = classInternalAntRunner.getMethod("setBuildFileLocation", new Class[] { String.class }); //$NON-NLS-1$
-			setBuildFileLocation.invoke(runner, new Object[] { buildFileLocation });
-			
-			setProperties(runner, classInternalAntRunner);
-			
-			if (arguments != null && arguments.length > 0) {
-				Method setArguments = classInternalAntRunner.getMethod("setArguments", new Class[] { String[].class }); //$NON-NLS-1$
-				setArguments.invoke(runner, new Object[] { arguments });
-			}
-						
-			// get the info for each targets
-			Method getTargets = classInternalAntRunner.getMethod("getTargets", null); //$NON-NLS-1$
-			Object results = getTargets.invoke(runner, null);
-			// get the default target
-			Method getDefault= classInternalAntRunner.getMethod("getDefaultTarget", null); //$NON-NLS-1$
-			String defaultName= (String)getDefault.invoke(runner, null);
-			// collect the info into target objects
-			List infos = (List) results;
-			
-			ProjectInfo project= new ProjectInfo((String)infos.remove(0), (String)infos.remove(0));
-			int i= 0;
-			Iterator iter= infos.iterator();
-			TargetInfo[] targetInfo= new TargetInfo[infos.size()];
-			List info;
-			while (iter.hasNext()) {
-				info= (List)iter.next();
-				targetInfo[i++] = new TargetInfo(project, (String)info.get(0), (String)info.get(1), (String[])info.get(2), info.get(0).equals(defaultName));
-			}
-			return targetInfo;
-		} catch (NoClassDefFoundError e) {
-			problemLoadingClass(e);
-			//not possible to reach this line
-			return new TargetInfo[0];
-		} catch (ClassNotFoundException e) {
-			problemLoadingClass(e);
-			//not possible to reach this line
-			return new TargetInfo[0];
-		} catch (InvocationTargetException e) {
-			handleInvocationTargetException(runner, classInternalAntRunner, e);
-			//not possible to reach this line
-			return new TargetInfo[0];
-		} catch (Exception e) {
-			String message = (e.getMessage() == null) ? InternalCoreAntMessages.getString("AntRunner.Build_Failed._3") : e.getMessage(); //$NON-NLS-1$
-			throw new CoreException(new Status(IStatus.ERROR, AntCorePlugin.PI_ANTCORE, AntCorePlugin.ERROR_RUNNING_BUILD, message, e));
-		} finally {
-			Thread.currentThread().setContextClassLoader(originalClassLoader);
-		}
-	}
-
-	/**
-	 * Runs the build file. If a progress monitor is specified it will be
-	 * available during the script execution as a reference in the Ant Project
-	 * (<code>org.apache.tools.ant.Project.getReferences()</code>). A long-
-	 * running task could, for example, get the monitor during its execution and
-	 * check for cancellation. The key value to retrieve the progress monitor
-	 * instance is <code>AntCorePlugin.ECLIPSE_PROGRESS_MONITOR</code>.
-	 * 
-	 * Only one build can occur at any given time.
-	 * 
-	 * Sets the current threads context class loader to the AntClassLoader
-	 * for the duration of the build.
-	 * 
-	 * @param monitor a progress monitor, or <code>null</code> if progress
-	 *    reporting and cancellation are not desired
-	 */
-	public void run(IProgressMonitor monitor) throws CoreException {
-		if (buildRunning) {
-			IStatus status= new Status(IStatus.ERROR, AntCorePlugin.PI_ANTCORE, AntCorePlugin.ERROR_RUNNING_BUILD, MessageFormat.format(InternalCoreAntMessages.getString("AntRunner.Already_in_progess"), new String[]{buildFileLocation}), null); //$NON-NLS-1$
-			throw new CoreException(status);
-		}
-		buildRunning= true;
-		Object runner= null;
-		Class classInternalAntRunner= null;
-		ClassLoader originalClassLoader= Thread.currentThread().getContextClassLoader();
-		try {
-			ClassLoader loader = getClassLoader();
-			Thread.currentThread().setContextClassLoader(loader);
-			classInternalAntRunner = loader.loadClass("org.eclipse.ant.internal.core.ant.InternalAntRunner"); //$NON-NLS-1$
-			runner = classInternalAntRunner.newInstance();
-			// set build file
-			Method setBuildFileLocation = classInternalAntRunner.getMethod("setBuildFileLocation", new Class[] { String.class }); //$NON-NLS-1$
-			setBuildFileLocation.invoke(runner, new Object[] { buildFileLocation });
-			
-			//set the custom classpath
-			if (customClasspath != null) {
-				Method setCustomClasspath = classInternalAntRunner.getMethod("setCustomClasspath", new Class[] { URL[].class }); //$NON-NLS-1$
-				setCustomClasspath.invoke(runner, new Object[] { customClasspath });
-			}
-			
-			// add listeners
-			if (buildListeners != null) {
-				Method addBuildListeners = classInternalAntRunner.getMethod("addBuildListeners", new Class[] { List.class }); //$NON-NLS-1$
-				addBuildListeners.invoke(runner, new Object[] { buildListeners });
-			}
-			
-			if (buildLoggerClassName == null) {
-				//indicate that the default logger is not to be used
-				buildLoggerClassName= ""; //$NON-NLS-1$
-			}
-			// add build logger
-			Method addBuildLogger = classInternalAntRunner.getMethod("addBuildLogger", new Class[] { String.class }); //$NON-NLS-1$
-			addBuildLogger.invoke(runner, new Object[] { buildLoggerClassName });
-			
-			if (inputHandlerClassName != null) {	
-				// add the input handler
-				Method setInputHandler = classInternalAntRunner.getMethod("setInputHandler", new Class[] { String.class }); //$NON-NLS-1$
-				setInputHandler.invoke(runner, new Object[] { inputHandlerClassName });
-			}
-			
-			if (antHome != null) {	
-				Method setAntHome = classInternalAntRunner.getMethod("setAntHome", new Class[] { String.class }); //$NON-NLS-1$
-				setAntHome.invoke(runner, new Object[] { antHome });
-			}
-			
-			// add progress monitor
-			if (monitor != null) {
-				Method setProgressMonitor = classInternalAntRunner.getMethod("setProgressMonitor", new Class[] { IProgressMonitor.class }); //$NON-NLS-1$
-				setProgressMonitor.invoke(runner, new Object[] { monitor });
-			}
-			
-			setProperties(runner, classInternalAntRunner);
-			
-			// set message output level
-			Method setMessageOutputLevel = classInternalAntRunner.getMethod("setMessageOutputLevel", new Class[] { int.class }); //$NON-NLS-1$
-			setMessageOutputLevel.invoke(runner, new Object[] { new Integer(messageOutputLevel)});
-			// set execution targets
-			if (targets != null) {
-				Method setExecutionTargets = classInternalAntRunner.getMethod("setExecutionTargets", new Class[] { String[].class }); //$NON-NLS-1$
-				setExecutionTargets.invoke(runner, new Object[] { targets });
-			} 
-			// set extra arguments
-			if (arguments != null && arguments.length > 0) {
-				Method setArguments = classInternalAntRunner.getMethod("setArguments", new Class[] { String[].class }); //$NON-NLS-1$
-				setArguments.invoke(runner, new Object[] { arguments });
-			}
-			// run
-			Method run = classInternalAntRunner.getMethod("run", null); //$NON-NLS-1$
-			run.invoke(runner, null);
-		} catch (NoClassDefFoundError e) {
-			problemLoadingClass(e);
-		} catch (ClassNotFoundException e) {
-			problemLoadingClass(e);
-		} catch (InvocationTargetException e) {
-			handleInvocationTargetException(runner, classInternalAntRunner, e);
-		} catch (Exception e) {
-			String message = (e.getMessage() == null) ? InternalCoreAntMessages.getString("AntRunner.Build_Failed._3") : e.getMessage(); //$NON-NLS-1$
-			IStatus status= new Status(IStatus.ERROR, AntCorePlugin.PI_ANTCORE, AntCorePlugin.ERROR_RUNNING_BUILD, message, e);
-			throw new CoreException(status);
-		} finally {
-			buildRunning= false;
-			Thread.currentThread().setContextClassLoader(originalClassLoader);
-		}
-	}
-
-	private void setProperties(Object runner, Class classInternalAntRunner)
-		throws NoSuchMethodException, IllegalAccessException, InvocationTargetException {
-		// add properties
-		if (userProperties != null) {
-			Method addUserProperties = classInternalAntRunner.getMethod("addUserProperties", new Class[] { Map.class }); //$NON-NLS-1$
-			addUserProperties.invoke(runner, new Object[] { userProperties });
-		}
-		
-		// add property files
-		if (propertyFiles != null) {
-			Method addPropertyFiles = classInternalAntRunner.getMethod("addPropertyFiles", new Class[] { String[].class }); //$NON-NLS-1$
-			addPropertyFiles.invoke(runner, new Object[] { propertyFiles });
-		}
-	}
-
-	/**
-	 * Handles exceptions that are loaded by the Ant Class Loader by
-	 * asking the Internal Ant Runner class for the correct error message.
-	 * 
-	 * Handles OperationCanceledExceptions, nested NoClassDefFoundError and
-	 * nested ClassNotFoundException
-	 */
-	protected void handleInvocationTargetException(Object runner, Class classInternalAntRunner, InvocationTargetException e) throws CoreException {
-		Throwable realException = e.getTargetException();
-		if (realException instanceof OperationCanceledException) {
-			return;
-		}
-		String message= null;
-		if (runner != null) {
-			try {
-				Method getBuildErrorMessage = classInternalAntRunner.getMethod("getBuildExceptionErrorMessage", new Class[] { Throwable.class }); //$NON-NLS-1$
-				message= (String)getBuildErrorMessage.invoke(runner, new Object[] { realException });
-			} catch (Exception ex) {
-				//do nothing as already in error state
-			}
-		}
-		// J9 throws NoClassDefFoundError nested in a InvocationTargetException
-		if (message == null && ((realException instanceof NoClassDefFoundError) || (realException instanceof ClassNotFoundException))) {
-			problemLoadingClass(realException);
-			return;
-		}
-		boolean internalError= false;
-		if (message == null) {
-			//error did not result from a BuildException
-			internalError= true;
-			message = (realException.getMessage() == null) ? InternalCoreAntMessages.getString("AntRunner.Build_Failed._3") : realException.getMessage(); //$NON-NLS-1$
-		}
-		IStatus status= new Status(IStatus.ERROR, AntCorePlugin.PI_ANTCORE, AntCorePlugin.ERROR_RUNNING_BUILD, message, realException);
-		if (internalError) {
-			AntCorePlugin.getPlugin().getLog().log(status);
-		}
-		throw new CoreException(status);
-	}
-
-	protected void problemLoadingClass(Throwable e) throws CoreException {
-		String missingClassName= e.getMessage();
-		String message;
-		if (missingClassName != null) {
-			missingClassName= missingClassName.replace('/', '.');
-			message= InternalCoreAntMessages.getString("AntRunner.Could_not_find_one_or_more_classes._Please_check_the_Ant_classpath._2"); //$NON-NLS-1$
-			message= MessageFormat.format(message, new String[]{missingClassName});
-		} else {
-			message= InternalCoreAntMessages.getString("AntRunner.Could_not_find_one_or_more_classes._Please_check_the_Ant_classpath._1"); //$NON-NLS-1$
-		}
-		IStatus status= new Status(IStatus.ERROR, AntCorePlugin.PI_ANTCORE, AntCorePlugin.ERROR_RUNNING_BUILD, message, e);
-		AntCorePlugin.getPlugin().getLog().log(status);
-		throw new CoreException(status);
-	}
-
-	/**
-	 * Runs the build file.
-	 */
-	public void run() throws CoreException {
-		run((IProgressMonitor) null);
-	}
-
-	/**
-	 * Invokes the building of a project object and executes a build using either a given
-	 * target or the default target. This method is called when running Eclipse headless
-	 * and specifying <code>org.eclipse.ant.core.antRunner</code> as the application.
-	 * 
-	 * Sets the current threads context class loader to the AntClassLoader
-	 * for the duration of the build.
-	 *
-	 * @param argArray the command line arguments
-	 * @exception Exception if a problem occurred during the buildfile execution
-	 * @return an exit object (<code>EXIT_OK</code>) indicating normal termination if no exception occurs
-	 * @see org.eclipse.core.boot.IPlatformRunnable#run(java.lang.Object)
-	 */
-	public Object run(Object argArray) throws Exception {
-		ClassLoader originalClassLoader= Thread.currentThread().getContextClassLoader();
-		try {
-			//set the preferences for headless mode
-			AntCorePlugin.getPlugin().setRunningHeadless();
-			
-			// Add debug information if necessary - fix for bug 5672.
-			// Since the platform parses the -debug command line arg
-			// and removes it from the args passed to the applications,
-			// we have to check if Eclipse is in debug mode in order to
-			// forward the -debug argument to Ant.
-			if (BootLoader.inDebugMode()) {
-				String[] args = (String[]) argArray;
-				String[] newArgs = new String[args.length + 1];
-				for (int i = 0; i < args.length; i++) {
-					newArgs[i] = args[i];
-				}
-				newArgs[args.length] = "-debug"; //$NON-NLS-1$
-				argArray = newArgs;
-			}
-			ClassLoader loader = getClassLoader();
-			Thread.currentThread().setContextClassLoader(loader);
-			Class classInternalAntRunner = loader.loadClass("org.eclipse.ant.internal.core.ant.InternalAntRunner"); //$NON-NLS-1$
-			Object runner = classInternalAntRunner.newInstance();
-			Method run = classInternalAntRunner.getMethod("run", new Class[] { Object.class }); //$NON-NLS-1$
-			run.invoke(runner, new Object[] { argArray });
-		} finally {
-			Thread.currentThread().setContextClassLoader(originalClassLoader);
-		}
-
-		return EXIT_OK;
-	}
-	
-	private ClassLoader getClassLoader() {
-		if (customClasspath == null) {
-			return AntCorePlugin.getPlugin().getNewClassLoader();
-		} else {
-			AntCorePreferences preferences = AntCorePlugin.getPlugin().getPreferences();
-			List fullClasspath= new ArrayList();
-			fullClasspath.addAll(Arrays.asList(customClasspath));
-			fullClasspath.addAll(Arrays.asList(preferences.getExtraClasspathURLs()));
-			return new AntClassLoader((URL[])fullClasspath.toArray(new URL[fullClasspath.size()]), preferences.getPluginClassLoaders());
-		}
-	}
-	
-	/**
-	 * Sets the input handler. The parameter <code>className</code>
-	 * is the class name of a <code>org.apache.tools.ant.input.InputHandler</code>
-	 * implementation. The class will be instantiated at runtime and the
-	 * input handler will be used to respond to &lt;input&gt; requests
-	 * Only one input handler is permitted for any build.
-	 * 
-	 * @param className an input handler class name
-	 * @since 2.1
-	 */
-	public void setInputHandler(String className) {
-		inputHandlerClassName= className;
-	}
-	
-	/**
-	 * Sets the user specified property files.
-	 * @param array of property file paths
-	 * @since 2.1
-	 */
-	public void setPropertyFiles(String[] propertyFiles) {
-		this.propertyFiles= propertyFiles;
-	}
-
-	/**
-	 * Sets the custom classpath to use for this build
-	 * @param array of URLs that define the custom classpath
-	 */
-	public void setCustomClasspath(URL[] customClasspath) {
-		this.customClasspath = customClasspath;
-	}
-	
-	/**
-	 * Sets the Ant home to use for this build
-	 * @param String specifying the Ant home to use
-	 * @since 2.1
-	 */
- 	public void setAntHome(String antHome) {
- 		this.antHome= antHome;
- 	}
-	/**
-	 * Returns whether an Ant build is already in progress
-	 * 
-	 * Only one Ant build can occur at any given time.
-	 * 
-	 * @since 2.1
-	 * @return boolean
-	 */
-	public static boolean isBuildRunning() {
-		return buildRunning;
-	}
-}
diff --git a/ant/org.eclipse.ant.core/src/org/eclipse/ant/core/AntSecurityException.java b/ant/org.eclipse.ant.core/src/org/eclipse/ant/core/AntSecurityException.java
deleted file mode 100644
index 75fd911..0000000
--- a/ant/org.eclipse.ant.core/src/org/eclipse/ant/core/AntSecurityException.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.core;
-
-
-/**
- * A security exception that is thrown by the AntSecurityManager if
- * an Ant task in some way attempts to halt or exit the Java Virtual Machine.
- * 
- * @since 2.1
- */
-public class AntSecurityException extends SecurityException {
-
-}
diff --git a/ant/org.eclipse.ant.core/src/org/eclipse/ant/core/ProjectInfo.java b/ant/org.eclipse.ant.core/src/org/eclipse/ant/core/ProjectInfo.java
deleted file mode 100644
index 8c6ee56..0000000
--- a/ant/org.eclipse.ant.core/src/org/eclipse/ant/core/ProjectInfo.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.core;
-
-
-/**
- * Represents information about a project within an Ant build file.
- * @since 2.1
- */
-
-public class ProjectInfo {
-
-	private String name = null;
-	private String description = null;
-
-	/**
-	 * Create a project information
-	 * 
-	 * @param name project name
-	 * @param description a brief explanation of the project's purpose 		or
-	 * <code>null</code> if not specified
-	 */
-	/*package*/
-	ProjectInfo(String name, String description) {
-		this.name = name == null ? "" : name; //$NON-NLS-1$
-		this.description = description;
-	}
-
-	/**
-	 * Returns the project name.
-	 * 
-	 * @return the project name
-	 */
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * Returns the project description or <code>null</code> if no
-	 * description is provided.
-	 * 
-	 * @return the project description or <code>null</code> if none
-	 */
-	public String getDescription() {
-		return description;
-	}
-}
diff --git a/ant/org.eclipse.ant.core/src/org/eclipse/ant/core/Property.java b/ant/org.eclipse.ant.core/src/org/eclipse/ant/core/Property.java
deleted file mode 100644
index 3eb27eb..0000000
--- a/ant/org.eclipse.ant.core/src/org/eclipse/ant/core/Property.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.core;
-
-
-/**
- * Represents a Ant user property.
- * @since 2.1
- */
-public class Property {
-
-	private String name;
-	private String value;
-
-	public Property(String name, String value) {
-		this.name= name;
-		this.value= value;
-	}
-
-	public Property() {
-	}
-	/**
-	 * Gets the name
-	 * @return Returns a String
-	 */
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * Sets the name
-	 * @param name The name to set
-	 */
-	public void setName(String name) {
-		this.name= name;
-	}
-	
-	/*
-	 * @see Object#equals()
-	 */	
-	public boolean equals(Object other) {
-		if (other.getClass().equals(getClass())) {
-			Property elem= (Property)other;
-			return name.equals(elem.getName());
-		}
-		return false;
-	}
-	
-	/*
-	 * @see Object#hashCode()
-	 */
-	public int hashCode() {
-		return name.hashCode();
-	}	
-	/**
-	 * Returns the value.
-	 * @return String
-	 */
-	public String getValue() {
-		return value;
-	}
-
-	/**
-	 * Sets the value.
-	 * @param value The value to set
-	 */
-	public void setValue(String value) {
-		this.value = value;
-	}
-	/**
-	 * @see java.lang.Object#toString()
-	 */
-	public String toString() {
-		StringBuffer buff= new StringBuffer("\""); //$NON-NLS-1$
-		buff.append(getName());
-		buff.append("\"= \""); //$NON-NLS-1$
-		buff.append(getValue());
-		buff.append("\""); //$NON-NLS-1$
-		return buff.toString();
-	}
-}
diff --git a/ant/org.eclipse.ant.core/src/org/eclipse/ant/core/TargetInfo.java b/ant/org.eclipse.ant.core/src/org/eclipse/ant/core/TargetInfo.java
deleted file mode 100644
index ef50a59..0000000
--- a/ant/org.eclipse.ant.core/src/org/eclipse/ant/core/TargetInfo.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.core;
-
-
-/**
- * Represents information about a target within an Ant build file.
- * @since 2.1
- */
-public class TargetInfo {
-
-	private String name = null;
-	private String description = null;
-	private ProjectInfo project = null;
-	private String[] dependencies = null;
-	private boolean isDefault = false;
-
-	/**
-	 * Create a target information
-	 * 
-	 * @param name target name
-	 * @param description a brief explanation of the target's purpose
-	 * 		or <code>null</code> if not specified
-	 * @param project enclosing project
-	 * @param dependencies names of prerequisite projects 
-	 * @param isDefault whether this is the build file default target
-	 */
-	/*package*/
-	TargetInfo(ProjectInfo project, String name, String description, String[] dependencies, boolean isDefault) {
-		this.name = name == null ? "" : name; //$NON-NLS-1$
-		this.description = description;
-		this.project = project;
-		this.dependencies = dependencies;
-		this.isDefault = isDefault;
-	}
-
-	/**
-	 * Returns the target name.
-	 * 
-	 * @return the target name
-	 */
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * Returns the target description or <code>null</code> if no
-	 * description is provided.
-	 * 
-	 * @return the target description or <code>null</code> if none
-	 */
-	public String getDescription() {
-		return description;
-	}
-	
-	/**
-	 * Returns the ProjectInfo of the enclosing project.
-	 * 
-	 * @return the project info for the enclosing project
-	 */
-	public ProjectInfo getProject() {
-		return project;
-	}
-	
-	/**
-	 * Return the names of the targets that this target depends on.
-	 * 
-	 * @return the dependent names
-	 */
-	public String[] getDependencies() {
-		return dependencies;
-	}
-
-	/**
-	 * Returns whether this is the build file default target.
-	 * 
-	 * @return whether this is the build file default target
-	 */
-	public boolean isDefault() {
-		return isDefault;
-	}
-	/**
-	 * @see java.lang.Object#equals(java.lang.Object)
-	 */
-	public boolean equals(Object obj) {
-		if (!(obj instanceof TargetInfo)) {
-			return false;
-		}
-		TargetInfo other= (TargetInfo)obj;
-		return getName().equals(other.getName());
-	}
-
-	/**
-	 * @see java.lang.Object#hashCode()
-	 */
-	public int hashCode() {
-		return getName().hashCode();
-	}
-
-	/**
-	 * @see java.lang.Object#toString()
-	 */
-	public String toString() {
-		return getName();
-	}
-
-}
diff --git a/ant/org.eclipse.ant.core/src/org/eclipse/ant/core/Task.java b/ant/org.eclipse.ant.core/src/org/eclipse/ant/core/Task.java
deleted file mode 100644
index 7b9df05..0000000
--- a/ant/org.eclipse.ant.core/src/org/eclipse/ant/core/Task.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.core;
-
-
-import org.eclipse.ant.internal.core.AntObject;
-
-/**
- * Represents an Ant task.
- * @since 2.1
- */
-public class Task extends AntObject {
-
-	/**
-	 * Returns the name of the task
-	 * @return the name of the task
-	 */
-	public String getTaskName() {
-		return fName;
-	}
-
-	/**
-	 * Sets the name of the task
-	 * @param taskName The taskName to set
-	 */
-	public void setTaskName(String taskName) {
-		fName= taskName;
-	}
-}
diff --git a/ant/org.eclipse.ant.core/src/org/eclipse/ant/core/Type.java b/ant/org.eclipse.ant.core/src/org/eclipse/ant/core/Type.java
deleted file mode 100644
index a9c8f8e..0000000
--- a/ant/org.eclipse.ant.core/src/org/eclipse/ant/core/Type.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.core;
-
-
-import org.eclipse.ant.internal.core.AntObject;
-
-/**
- * Represents an Ant type.
- * @since 2.1
- */
-public class Type extends AntObject {
-
-	/**
-	 * Returns the type name
-	 * @return Returns a String
-	 */
-	public String getTypeName() {
-		return fName;
-	}
-
-	/**
-	 * Sets the taskName.
-	 * @param taskName The taskName to set
-	 */
-	public void setTypeName(String taskName) {
-		fName = taskName;
-	}
-}
diff --git a/ant/org.eclipse.ant.core/src/org/eclipse/ant/core/package.html b/ant/org.eclipse.ant.core/src/org/eclipse/ant/core/package.html
deleted file mode 100644
index a931089..0000000
--- a/ant/org.eclipse.ant.core/src/org/eclipse/ant/core/package.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
-<html>
-<head>
-   <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-   <title>Package-level Javadoc</title>
-</head>
-<body>
-Provides support for running the Ant build tool in the platform.
-<h2>
-Package Specification</h2>
-This package defines a number of task and data types and various infrastructure
-pieces which make Ant in the platform easier and more powerful.
-</body>
-</html>
diff --git a/ant/org.eclipse.ant.core/src/org/eclipse/ant/internal/core/AntClassLoader.java b/ant/org.eclipse.ant.core/src/org/eclipse/ant/internal/core/AntClassLoader.java
deleted file mode 100644
index e61c9b2..0000000
--- a/ant/org.eclipse.ant.core/src/org/eclipse/ant/internal/core/AntClassLoader.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.internal.core;
-
-
-import java.net.URL;
-import java.net.URLClassLoader;
-
-import org.eclipse.core.boot.BootLoader;
-
-public class AntClassLoader extends URLClassLoader {
-
-	protected ClassLoader[] pluginLoaders;
-	private static final String ANT_PACKAGES_PREFIX= "org.apache.tools.ant"; //$NON-NLS-1$
-	private static final String[] ECLIPSE_ANT_PACKAGES_PREFIXES= new String[3];
-	private static final boolean devMode= BootLoader.inDevelopmentMode();
-	
-	static {
-		if (devMode) {
-			ECLIPSE_ANT_PACKAGES_PREFIXES[0]= "org.eclipse.ant.internal.core.ant"; //$NON-NLS-1$
-			ECLIPSE_ANT_PACKAGES_PREFIXES[1]= "org.eclipse.ant.ui.internal.antsupport"; //$NON-NLS-1$
-			ECLIPSE_ANT_PACKAGES_PREFIXES[2]= "org.eclipse.ant.tests.core.support"; //$NON-NLS-1$
-		}
-	}
-	
-	public AntClassLoader(URL[] urls, ClassLoader[] pluginLoaders) {
-		super(urls, ClassLoader.getSystemClassLoader());
-		this.pluginLoaders = pluginLoaders;
-	}
-
-	public Class loadClass(String name) throws ClassNotFoundException {
-		Class result = null;
-		//do not load the "base" ant classes from the plugin class loaders 
-		//these should only be specified from the Ant runtime classpath preferences setting
-		if (!(name.startsWith(ANT_PACKAGES_PREFIX))) {
-			if (devMode) { 
-				if (shouldPluginsLoad(name)) {
-					result= loadClassPlugins(name);
-				}
-		  	} else {
-				result= loadClassPlugins(name);
-		  	}
-		}
-		if (result == null) {
-			result = loadClassURLs(name);
-		}
-		if (result == null) {
-			throw new ClassNotFoundException(name);
-		}
-		return result;
-	}
-	
-	/**
-	 * Used during development mode to disallow plugins from loading classes
-	 * that should be loaded only be this class loader.
-	 */
-	private boolean shouldPluginsLoad(String name) {
-		for (int i = 0; i < ECLIPSE_ANT_PACKAGES_PREFIXES.length; i++) {
-			String prefix = ECLIPSE_ANT_PACKAGES_PREFIXES[i];
-			if (name.startsWith(prefix)) {
-				return false;	
-			}
-		}
-		return true;
-	}
-
-	protected Class loadClassURLs(String name) {
-		try {
-			return super.loadClass(name);
-		} catch (ClassNotFoundException e) {
-			// Ignore exception now. If necessary we'll throw
-			// a ClassNotFoundException in loadClass(String)
-		}
-		return null;
-	}
-
-	protected Class loadClassPlugins(String name) {
-		Class result = null;
-		if (pluginLoaders != null) {
-			for (int i = 0; (i < pluginLoaders.length) && (result == null); i++) {
-				try {
-					result = pluginLoaders[i].loadClass(name);
-				} catch (ClassNotFoundException e) {
-					// Ignore exception now. If necessary we'll throw
-					// a ClassNotFoundException in loadClass(String)
-				}
-			}
-		}
-		return result;
-	}
-}
diff --git a/ant/org.eclipse.ant.core/src/org/eclipse/ant/internal/core/AntObject.java b/ant/org.eclipse.ant.core/src/org/eclipse/ant/internal/core/AntObject.java
deleted file mode 100644
index e516860..0000000
--- a/ant/org.eclipse.ant.core/src/org/eclipse/ant/internal/core/AntObject.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.internal.core;
-
-
-import java.net.URL;
-
-public abstract class AntObject {
-
-	protected String fClassName;
-	protected URL fLibrary;
-	protected String fName;
-	private boolean fIsDefault= false;
-	
-	/**
-	 * Gets the className.
-	 * @return Returns a String
-	 */
-	public String getClassName() {
-		return fClassName;
-	}
-	/**
-	 * Sets the className.
-	 * @param className The className to set
-	 */
-	public void setClassName(String className) {
-		fClassName = className;
-	}
-	/**
-	 * Gets the library.
-	 * @return Returns a URL
-	 */
-	public URL getLibrary() {
-		return fLibrary;
-	}
-	/**
-	 * Sets the library.
-	 * @param library The library to set
-	 */
-	public void setLibrary(URL library) {
-		fLibrary = library;
-	}
-	
-	/**
-	 * @see java.lang.Object#toString()
-	 */
-	public String toString() {
-		return fName;
-	}
-	/**
-	 * Returns whether this ant object has been created because of an extension
-	 * point definition.
-	 * @return boolean
-	 */
-	public boolean isDefault() {
-		return fIsDefault;
-	}
-
-	/**
-	 * Sets that this ant object has been created by the appropriate extension
-	 * point.
-	 * @param isDefault Whether this ant object has been created because of an
-	 * extension point defintion.
-	 */
-	public void setIsDefault(boolean isDefault) {
-		this.fIsDefault = isDefault;
-	}
-
-}
diff --git a/ant/org.eclipse.ant.core/src/org/eclipse/ant/internal/core/IAntCoreConstants.java b/ant/org.eclipse.ant.core/src/org/eclipse/ant/internal/core/IAntCoreConstants.java
deleted file mode 100644
index f63245a..0000000
--- a/ant/org.eclipse.ant.core/src/org/eclipse/ant/internal/core/IAntCoreConstants.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.internal.core;
-
-
-/**
- * Common constants.
- */
-public interface IAntCoreConstants {
-
-	// default values
-	public static final String DEFAULT_BUILD_FILENAME = "build.xml"; //$NON-NLS-1$
-
-	// preferences
-	public static final String PREFERENCE_TASKS = "tasks"; //$NON-NLS-1$
-	public static final String PREFERENCE_TYPES = "types"; //$NON-NLS-1$
-	public static final String PREFERENCE_URLS = "urls"; //$NON-NLS-1$
-	
-	public static final String PREFIX_TASK = "task."; //$NON-NLS-1$
-	public static final String PREFIX_TYPE = "type."; //$NON-NLS-1$
-	
-	/**
-	 * Preferences
-	 * @since 2.1
-	 */
-	public static final String PREFERENCE_ANT_URLS = "ant_urls"; //$NON-NLS-1$
-	public static final String PREFERENCE_ANT_HOME = "ant_home"; //$NON-NLS-1$
-	public static final String PREFERENCE_PROPERTIES = "properties"; //$NON-NLS-1$
-	public static final String PREFERENCE_PROPERTY_FILES = "propertyfiles"; //$NON-NLS-1$
-	public static final String PREFIX_PROPERTY = "property."; //$NON-NLS-1$
-}
diff --git a/ant/org.eclipse.ant.core/src/org/eclipse/ant/internal/core/InternalCoreAntMessages.java b/ant/org.eclipse.ant.core/src/org/eclipse/ant/internal/core/InternalCoreAntMessages.java
deleted file mode 100644
index 6c78b5f..0000000
--- a/ant/org.eclipse.ant.core/src/org/eclipse/ant/internal/core/InternalCoreAntMessages.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.internal.core;
-
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-public class InternalCoreAntMessages {
-
-	private static final String BUNDLE_NAME = "org.eclipse.ant.internal.core.InternalCoreAntMessages"; //$NON-NLS-1$
-
-	private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME);
-
-	private InternalCoreAntMessages() {
-	}
-
-	public static String getString(String key) {
-		try {
-			return RESOURCE_BUNDLE.getString(key);
-		} catch (MissingResourceException e) {
-			return '!' + key + '!';
-		}
-	}
-}
diff --git a/ant/org.eclipse.ant.core/src/org/eclipse/ant/internal/core/InternalCoreAntMessages.properties b/ant/org.eclipse.ant.core/src/org/eclipse/ant/internal/core/InternalCoreAntMessages.properties
deleted file mode 100644
index ed99e4c..0000000
--- a/ant/org.eclipse.ant.core/src/org/eclipse/ant/internal/core/InternalCoreAntMessages.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2003 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Common Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/cpl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-AntCorePreferences.Malformed_URL._1=Malformed URL.
-AntCorePreferences.Library_not_specified_for__{0}_4=Library not specified for: {0}
-AntCorePreferences.No_library_for_task=The library {0} specified via the antTasks extension point of {1} does not exist
-AntCorePreferences.No_library_for_type=The library {0} specified via the antTypes extension point of {1} does not exist
-AntCorePreferences.No_library_for_extraClasspathEntry=The library {0} specified via the extraClasspathEntries extension point of {1} does not exist
-
-AntRunner.Could_not_find_one_or_more_classes._Please_check_the_Ant_classpath._1=Could not find one or more classes. Please check the Ant classpath.
-AntRunner.Could_not_find_one_or_more_classes._Please_check_the_Ant_classpath._2=Could not find one or more classes: \"{0}\". Please check the Ant classpath.
-AntRunner.Build_Failed._3=BUILD FAILED
-AntRunner.Already_in_progess=Ant build {0} already in progress
diff --git a/ant/org.eclipse.ant.core/src_ant/org/eclipse/ant/internal/core/ant/AntSecurityManager.java b/ant/org.eclipse.ant.core/src_ant/org/eclipse/ant/internal/core/ant/AntSecurityManager.java
deleted file mode 100644
index f246339..0000000
--- a/ant/org.eclipse.ant.core/src_ant/org/eclipse/ant/internal/core/ant/AntSecurityManager.java
+++ /dev/null
@@ -1,404 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.internal.core.ant;
-
-
-import java.io.FileDescriptor;
-import java.net.InetAddress;
-import java.net.SocketPermission;
-import java.security.Permission;
-
-import org.eclipse.ant.core.AntSecurityException;
-
-/**
- * A security manager that always throws an <code>AntSecurityException</code>
- * if the calling thread attempts to cause the Java Virtual Machine to 
- * exit/halt.
- * Otherwise this manager just delegates to the pre-existing manager
- * passed in the constructor.
- */
-public class AntSecurityManager extends SecurityManager {
-
-	protected SecurityManager securityManager= null;
-	
-	protected AntSecurityManager(SecurityManager securityManager) {
-		this.securityManager= securityManager;
-	}
-	/**
-	 * @see java.lang.SecurityManager#checkExit(int)
-	 */
-	public void checkExit(int status) {
-		//no exit allowed...System.exit is being called
-		//by some ant task...do not want Eclipse to exit if
-		//in the same VM,
-		//The message is used in loggers to determine that this is
-		//not really an exception case.
-		throw new AntSecurityException();
-	}
-	/**
-	 * @see java.lang.SecurityManager#checkAccept(java.lang.String, int)
-	 */
-	public void checkAccept(String host, int port) {
-		if (securityManager != null) {
-			securityManager.checkAccept(host, port);
-		}
-	}
-
-	/**
-	 * @see java.lang.SecurityManager#checkAccess(java.lang.Thread)
-	 */
-	public void checkAccess(Thread t) {
-		if (securityManager != null) {
-			securityManager.checkAccess(t);
-		}
-	}
-
-	/**
-	 * @see java.lang.SecurityManager#checkAccess(java.lang.ThreadGroup)
-	 */
-	public void checkAccess(ThreadGroup g) {
-		if (securityManager != null) {
-			securityManager.checkAccess(g);
-		}
-	}
-
-	/**
-	 * @see java.lang.SecurityManager#checkAwtEventQueueAccess()
-	 */
-	public void checkAwtEventQueueAccess() {
-		if (securityManager != null) {
-			securityManager.checkAwtEventQueueAccess();
-		}
-	}
-
-	/**
-	 * @see java.lang.SecurityManager#checkConnect(java.lang.String, int, java.lang.Object)
-	 */
-	public void checkConnect(String host, int port, Object context) {
-		if (securityManager != null) {
-			securityManager.checkConnect(host, port, context);
-		}
-	}
-
-	/**
-	 * @see java.lang.SecurityManager#checkConnect(java.lang.String, int)
-	 */
-	public void checkConnect(String host, int port) {
-		if (securityManager != null) {
-			securityManager.checkConnect(host, port);
-		}
-	}
-
-	/**
-	 * @see java.lang.SecurityManager#checkCreateClassLoader()
-	 */
-	public void checkCreateClassLoader() {
-		if (securityManager != null) {
-			securityManager.checkCreateClassLoader();
-		}
-	}
-
-	/**
-	 * @see java.lang.SecurityManager#checkDelete(java.lang.String)
-	 */
-	public void checkDelete(String file) {
-		if (securityManager != null) {
-			securityManager.checkDelete(file);
-		}
-	}
-
-	/**
-	 * @see java.lang.SecurityManager#checkExec(java.lang.String)
-	 */
-	public void checkExec(String cmd) {
-		if (securityManager != null) {
-			securityManager.checkExec(cmd);
-		}
-	}
-
-	/**
-	 * @see java.lang.SecurityManager#checkLink(java.lang.String)
-	 */
-	public void checkLink(String lib) {
-		if (securityManager != null) {
-			securityManager.checkLink(lib);
-		}
-	}
-
-	/**
-	 * @see java.lang.SecurityManager#checkListen(int)
-	 */
-	public void checkListen(int port) {
-		if (securityManager != null) {
-			securityManager.checkListen(port);
-		}
-	}
-
-	/**
-	 * @see java.lang.SecurityManager#checkMemberAccess(java.lang.Class, int)
-	 */
-	public void checkMemberAccess(Class clazz, int which) {
-		if (securityManager != null) {
-			securityManager.checkMemberAccess(clazz, which);
-		}
-	}
-
-	/**
-	 * @see java.lang.SecurityManager#checkMulticast(java.net.InetAddress, byte)
-	 * @deprecated
-	 */
-	public void checkMulticast(InetAddress maddr, byte ttl) {
-		if (securityManager != null) {
-			String host = maddr.getHostAddress();
-			if (!host.startsWith("[") && host.indexOf(':') != -1) { //$NON-NLS-1$
-	   			host = "[" + host + "]"; //$NON-NLS-1$ //$NON-NLS-2$
-			}
-	    	checkPermission(new SocketPermission(host, "accept,connect")); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @see java.lang.SecurityManager#checkMulticast(java.net.InetAddress)
-	 */
-	public void checkMulticast(InetAddress maddr) {
-		if (securityManager != null) {
-			securityManager.checkMulticast(maddr);
-		}
-	}
-
-	/**
-	 * @see java.lang.SecurityManager#checkPackageAccess(java.lang.String)
-	 */
-	public void checkPackageAccess(String pkg) {
-		if (securityManager != null) {
-			securityManager.checkPackageAccess(pkg);
-		}
-	}
-
-	/**
-	 * @see java.lang.SecurityManager#checkPackageDefinition(java.lang.String)
-	 */
-	public void checkPackageDefinition(String pkg) {
-		if (securityManager != null) {
-			securityManager.checkPackageDefinition(pkg);
-		}
-	}
-
-	/**
-	 * @see java.lang.SecurityManager#checkPermission(java.security.Permission, java.lang.Object)
-	 */
-	public void checkPermission(Permission perm, Object context) {
-		if (securityManager != null) {
-			securityManager.checkPermission(perm, context);
-		}
-	}
-
-	/**
-	 * @see java.lang.SecurityManager#checkPermission(java.security.Permission)
-	 */
-	public void checkPermission(Permission perm) {
-		if (securityManager != null) {
-			securityManager.checkPermission(perm);
-		}
-	}
-
-	/**
-	 * @see java.lang.SecurityManager#checkPrintJobAccess()
-	 */
-	public void checkPrintJobAccess() {
-		if (securityManager != null) {
-			securityManager.checkPrintJobAccess();
-		}
-	}
-
-	/**
-	 * @see java.lang.SecurityManager#checkPropertiesAccess()
-	 */
-	public void checkPropertiesAccess() {
-		if (securityManager != null) {
-			securityManager.checkPropertiesAccess();
-		}
-	}
-
-	/**
-	 * @see java.lang.SecurityManager#checkPropertyAccess(java.lang.String)
-	 */
-	public void checkPropertyAccess(String key) {
-		if (securityManager != null) {
-			securityManager.checkPropertyAccess(key);
-		}
-	}
-
-	/**
-	 * @see java.lang.SecurityManager#checkRead(java.io.FileDescriptor)
-	 */
-	public void checkRead(FileDescriptor fd) {
-		if (securityManager != null) {
-			securityManager.checkRead(fd);
-		}
-	}
-
-	/**
-	 * @see java.lang.SecurityManager#checkRead(java.lang.String, java.lang.Object)
-	 */
-	public void checkRead(String file, Object context) {
-		if (securityManager != null) {
-			securityManager.checkRead(file, context);
-		}
-	}
-
-	/**
-	 * @see java.lang.SecurityManager#checkRead(java.lang.String)
-	 */
-	public void checkRead(String file) {
-		if (securityManager != null) {
-			securityManager.checkRead(file);
-		}
-	}
-
-	/**
-	 * @see java.lang.SecurityManager#checkSecurityAccess(java.lang.String)
-	 */
-	public void checkSecurityAccess(String target) {
-		if (securityManager != null) {
-			securityManager.checkSecurityAccess(target);
-		}
-	}
-
-	/**
-	 * @see java.lang.SecurityManager#checkSetFactory()
-	 */
-	public void checkSetFactory() {
-		if (securityManager != null) {
-			securityManager.checkSetFactory();
-		}
-	}
-
-	/**
-	 * @see java.lang.SecurityManager#checkSystemClipboardAccess()
-	 */
-	public void checkSystemClipboardAccess() {
-		if (securityManager != null) {
-			securityManager.checkSystemClipboardAccess();
-		}
-	}
-
-	/**
-	 * @see java.lang.SecurityManager#checkTopLevelWindow(java.lang.Object)
-	 */
-	public boolean checkTopLevelWindow(Object window) {
-		if (securityManager != null) {
-			return securityManager.checkTopLevelWindow(window);
-		}
-		return false;
-	}
-
-	/**
-	 * @see java.lang.SecurityManager#checkWrite(java.io.FileDescriptor)
-	 */
-	public void checkWrite(FileDescriptor fd) {
-		if (securityManager != null) {
-			securityManager.checkWrite(fd);
-		}
-	}
-
-	/**
-	 * @see java.lang.SecurityManager#checkWrite(java.lang.String)
-	 */
-	public void checkWrite(String file) {
-		if (securityManager != null) {
-			securityManager.checkWrite(file);
-		}
-	}
-
-	/**
-	 * @see java.lang.SecurityManager#classDepth(java.lang.String)
-	 * @deprecated
-	 */
-	protected int classDepth(String name) {
-		return -1;
-	}
-
-	/**
-	 * @see java.lang.SecurityManager#classLoaderDepth()
-	 * @deprecated
-	 */
-	protected int classLoaderDepth() {
-		return -1;
-	}
-
-	/**
-	 * @see java.lang.SecurityManager#currentClassLoader()
-	 * @deprecated
-	 */
-	protected ClassLoader currentClassLoader() {
-		return null;
-	}
-
-	/**
-	 * @see java.lang.SecurityManager#currentLoadedClass()
-	 * @deprecated
-	 */
-	protected Class currentLoadedClass() {
-		return null;
-	}
-
-	/**
-	 * @see java.lang.SecurityManager#getClassContext()
-	 */
-	protected Class[] getClassContext() {
-		return super.getClassContext();
-	}
-
-	/**
-	 * @see java.lang.SecurityManager#getInCheck()
-	 * @deprecated
-	 */
-	public boolean getInCheck() {
-		return false;
-	}
-
-	/**
-	 * @see java.lang.SecurityManager#getSecurityContext()
-	 */
-	public Object getSecurityContext() {
-		if (securityManager != null) {
-			return securityManager.getSecurityContext();
-		}
-		return null;
-	}
-
-	/**
-	 * @see java.lang.SecurityManager#getThreadGroup()
-	 */
-	public ThreadGroup getThreadGroup() {
-		if (securityManager != null) {
-			securityManager.getThreadGroup();
-		}
-		return null;
-	}
-
-	/**
-	 * @see java.lang.SecurityManager#inClass(java.lang.String)
-	 * @deprecated
-	 */
-	protected boolean inClass(String name) {
-		return false;
-	}
-
-	/**
-	 * @see java.lang.SecurityManager#inClassLoader()
-	 * @deprecated
-	 */
-	protected boolean inClassLoader() {
-		return false;
-	}
-}
diff --git a/ant/org.eclipse.ant.core/src_ant/org/eclipse/ant/internal/core/ant/InputHandlerSetter.java b/ant/org.eclipse.ant.core/src_ant/org/eclipse/ant/internal/core/ant/InputHandlerSetter.java
deleted file mode 100644
index 772a01c..0000000
--- a/ant/org.eclipse.ant.core/src_ant/org/eclipse/ant/internal/core/ant/InputHandlerSetter.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.internal.core.ant;
-
-
-import java.text.MessageFormat;
-
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.input.DefaultInputHandler;
-import org.apache.tools.ant.input.InputHandler;
-
-/**
- * This class exists so that the Ant integration has backwards compatibility
- * with Ant releases previous to 1.5. InputHandlers are a new feature of Ant 1.5.
- */
-class InputHandlerSetter {
-
-	protected void setInputHandler(Project project, String inputHandlerClassname) {
-		InputHandler handler = null;
-		if (inputHandlerClassname == null) {
-			handler = new DefaultInputHandler();
-		} else {
-			try {
-				handler = (InputHandler)(Class.forName(inputHandlerClassname).newInstance());
-			} catch (ClassCastException e) {
-				String msg = MessageFormat.format(InternalAntMessages.getString("InternalAntRunner.The_specified_input_handler_class_{0}_does_not_implement_the_org.apache.tools.ant.input.InputHandler_interface_5"), new String[]{inputHandlerClassname}); //$NON-NLS-1$
-				throw new BuildException(msg, e);
-			} catch (Exception e) {
-				String msg = MessageFormat.format(InternalAntMessages.getString("InternalAntRunner.Unable_to_instantiate_specified_input_handler_class_{0}___{1}_6"), new String[]{inputHandlerClassname, e.getClass().getName()}); //$NON-NLS-1$
-				throw new BuildException(msg, e);
-			}
-		}
-		project.setInputHandler(handler);
-	}
-}
diff --git a/ant/org.eclipse.ant.core/src_ant/org/eclipse/ant/internal/core/ant/InternalAntMessages.java b/ant/org.eclipse.ant.core/src_ant/org/eclipse/ant/internal/core/ant/InternalAntMessages.java
deleted file mode 100644
index 957f3b1..0000000
--- a/ant/org.eclipse.ant.core/src_ant/org/eclipse/ant/internal/core/ant/InternalAntMessages.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.internal.core.ant;
-
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-public class InternalAntMessages {
-
-	private static final String BUNDLE_NAME = "org.eclipse.ant.internal.core.ant.InternalAntMessages"; //$NON-NLS-1$
-
-	private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME);
-
-	private InternalAntMessages() {
-	}
-
-	public static String getString(String key) {
-		try {
-			return RESOURCE_BUNDLE.getString(key);
-		} catch (MissingResourceException e) {
-			return '!' + key + '!';
-		}
-	}
-}
diff --git a/ant/org.eclipse.ant.core/src_ant/org/eclipse/ant/internal/core/ant/InternalAntMessages.properties b/ant/org.eclipse.ant.core/src_ant/org/eclipse/ant/internal/core/ant/InternalAntMessages.properties
deleted file mode 100644
index 5504fed..0000000
--- a/ant/org.eclipse.ant.core/src_ant/org/eclipse/ant/internal/core/ant/InternalAntMessages.properties
+++ /dev/null
@@ -1,72 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2003 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Common Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/cpl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-InternalAntRunner.Build_file__{0}_1=Buildfile: {0}
-InternalAntRunner.Arguments__{0}_2=Arguments: {0}
-InternalAntRunner.Default_target__3=Default target:
-InternalAntRunner.Main_targets__4=Main targets:
-InternalAntRunner.Subtargets__5=Subtargets:
-InternalAntRunner.Unable_to_instantiate_logger__{0}_6=Unable to instantiate logger: {0}
-InternalAntRunner.Could_not_load_the_version_information._{0}_9=Could not load the version information. {0}
-InternalAntRunner.Could_not_load_the_version_information._10=Could not load the version information.
-InternalAntRunner.options_13=options
-InternalAntRunner.target_15=target
-InternalAntRunner.Options___21=Options: 
-InternalAntRunner.print_this_message_23=print this message
-InternalAntRunner.print_project_help_information_25=print project help information
-InternalAntRunner.print_the_version_information_and_exit_27=print the version information and exit
-InternalAntRunner.be_extra_quiet_29=be extra quiet
-InternalAntRunner.be_extra_verbose_31=be extra verbose
-InternalAntRunner.print_debugging_information_33=print debugging information
-InternalAntRunner.produce_logging_information_without_adornments_35=produce logging information without adornments
-InternalAntRunner.use_given_file_for_log_37=use given file for log
-InternalAntRunner.the_class_which_is_to_perform_logging_39=the class which is to perform logging
-InternalAntRunner.add_an_instance_of_class_as_a_project_listener_41=add an instance of class as a project listener
-InternalAntRunner.use_given_buildfile_43=use given buildfile
-InternalAntRunner.use_value_for_given_property_45=use value for given property
-InternalAntRunner.Using_{0}_file_as_build_log._1=Using {0} file as build log.
-InternalAntRunner.Could_not_write_to_the_specified_log_file__{0}._Make_sure_the_path_exists_and_you_have_write_permissions._2=Cannot write on the specified log file: {0}. Make sure the path exists and you have write permissions.
-InternalAntRunner.BUILD_SUCCESSFUL_1=BUILD SUCCESSFUL
-InternalAntRunner.Unknown_argument__{0}_2=Unknown argument: {0}
-InternalAntRunner.Buildfile__{0}_does_not_exist_!_1=Buildfile: {0} does not exist\!
-InternalAntRunner.{0}_which_was_specified_to_be_a_build_listener_is_not_an_instance_of_org.apache.tools.ant.BuildListener._1={0} which was specified to be a build listener is not an instance of org.apache.tools.ant.BuildListener.
-InternalAntRunner.{0}_which_was_specified_to_perform_logging_is_not_an_instance_of_org.apache.tools.ant.BuildLogger._2={0} which was specified to perform logging is not an instance of org.apache.tools.ant.BuildLogger.
-InternalAntRunner.You_must_specify_a_classname_when_using_the_-listener_argument_1=You must specify a classname when using the -listener argument
-InternalAntRunner.You_must_specify_a_classname_when_using_the_-logger_argument_2=You must specify a classname when using the -logger argument
-InternalAntRunner.You_must_specify_a_log_file_when_using_the_-log_argument_3=You must specify a log file when using the -log argument
-InternalAntRunner.You_must_specify_a_buildfile_when_using_the_-buildfile_argument_4=You must specify a buildfile when using the -buildfile argument
-InternalAntRunner.print_information_that_might_be_helpful_to_12=print information that might be helpful to
-InternalAntRunner._t_t_t_t_t_t_t_t_t_t_tdiagnose_or_report_problems._13=\t\t\t\t\t\t\t\t\t\t\tdiagnose or report problems.
-InternalAntRunner._t_t_t_t_t_t_t_t_____15=\t\t\t\t\t\t\t\t\'\'
-InternalAntRunner.load_all_properties_from_file_with_-D_19=load all properties from file with -D
-InternalAntRunner._t_t_t_t_t_t_t_t_t_t_tproperties_taking_precedence_20=\t\t\t\t\t\t\t\t\t\t\tproperties taking precedence
-InternalAntRunner.the_class_which_will_handle_input_requests_22=the class which will handle input requests
-InternalAntRunner._t_t_t_t_t_t_t_____1=\t\t\t\t\t\t\t\'\'
-InternalAntRunner.Class_{0}_not_found_for_task_{1}_1=Class {0} not found for task {1}
-InternalAntRunner.Class_{0}_not_found_for_type_{1}_2=Class {0} not found for type {1}
-InternalAntRunner.Only_one_logger_class_may_be_specified_1=Only one logger class may be specified
-InternalAntRunner.You_must_specify_a_classname_when_using_the_-inputhandler_argument_1=You must specify a classname when using the -inputhandler argument
-InternalAntRunner.Only_one_input_handler_class_may_be_specified._2=Only one input handler class may be specified.
-InternalAntRunner.You_must_specify_a_property_filename_when_using_the_-propertyfile_argument_3=You must specify a property filename when using the -propertyfile argument
-InternalAntRunner.Could_not_load_property_file_{0}__{1}_4=Could not load property file {0}: {1}
-InternalAntRunner.The_specified_input_handler_class_{0}_does_not_implement_the_org.apache.tools.ant.input.InputHandler_interface_5=The specified input handler class {0} does not implement the org.apache.tools.ant.input.InputHandler interface
-InternalAntRunner.Unable_to_instantiate_specified_input_handler_class_{0}___{1}_6=Unable to instantiate specified input handler class {0} : {1}
-InternalAntRunner.Specifying_an_InputHandler_is_an_Ant_1.5.*_feature._Please_update_your_Ant_classpath_to_include_an_Ant_version_greater_than_this._2=Specifying an InputHandler is an Ant 1.5.* feature. Please update your Ant classpath to include an Ant version greater than this.
-InternalAntRunner.The_diagnositics_options_is_an_Ant_1.5.*_feature._Please_update_your_Ant_classpath_to_include_an_Ant_version_greater_than_this._4=The diagnositics options is an Ant 1.5.* feature. Please update your Ant classpath to include an Ant version greater than this.
-InternalAntRunner.Specifying_property_files_is_a_Ant_1.5.*_feature._Please_update_your_Ant_classpath._6=Specifying property files is a Ant 1.5.* feature. Please update your Ant classpath to include an Ant version greater than this.
-InternalAntRunner.Default_target_{0}{1}{2}_does_not_exist_in_this_project_1=Default target {0}{1}{2} does not exist in this project
-InternalAntRunner.ANT_HOME_must_be_set_to_use_Ant_diagnostics_2=ANT_HOME must be set to use Ant diagnostics
-InternalAntRunner.Buildfile__{0}_is_not_a_file_1=Buildfile: {0} is not a file
-InternalAntRunner.-find_not_supported=-find not supported.\nCan be emulated using Run As > Ant Build located\nin the Run > External Tools menu
-InternalAntRunner.Error_setting_Ant_task=Error setting Ant task {0}
-InternalAntRunner.Missing_Class=Could not load a class required for parsing targets
-
-ProgressBuildListener.Build_cancelled._5=Build cancelled.
\ No newline at end of file
diff --git a/ant/org.eclipse.ant.core/src_ant/org/eclipse/ant/internal/core/ant/InternalAntRunner.java b/ant/org.eclipse.ant.core/src_ant/org/eclipse/ant/internal/core/ant/InternalAntRunner.java
deleted file mode 100644
index f129b4c..0000000
--- a/ant/org.eclipse.ant.core/src_ant/org/eclipse/ant/internal/core/ant/InternalAntRunner.java
+++ /dev/null
Binary files differ
diff --git a/ant/org.eclipse.ant.core/src_ant/org/eclipse/ant/internal/core/ant/InternalProject.java b/ant/org.eclipse.ant.core/src_ant/org/eclipse/ant/internal/core/ant/InternalProject.java
deleted file mode 100644
index 5f4b871..0000000
--- a/ant/org.eclipse.ant.core/src_ant/org/eclipse/ant/internal/core/ant/InternalProject.java
+++ /dev/null
@@ -1,224 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ant.internal.core.ant;
-
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999, 2000 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
- * <http://www.apache.org/>.
- */
- 
- 
-/**********************************************************************
-Copyright (c) 2003 IBM Corp.  All rights reserved.
-This file is made available under the terms of the Common Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v10.html
-**********************************************************************/
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Properties;
-
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.ProjectComponent;
-
-/**
- * A subclass of Project to facilitate "faster" parsing with
- * less garbage generated. This class is not used on Ant 1.6 and newer
- * due to the improvements in lazy loading of these Ant versions.
- * 
- * Only three tasks are loaded (property, taskdef and 
- * typedef: three tasks that can be defined outside of a target on Ant 1.5.1 or older).
- *
- * Datatypes are loaded if requested.
- * 
- * Derived from the original Ant Project class
- */
-public class InternalProject extends Project {
-
-	private Hashtable typeNameToClass = null;
-	
-	public InternalProject() {
-		super();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.apache.tools.ant.Project#init()
-	 */
-	public void init() throws BuildException {
-		setJavaVersionProperty();
-
-		try {
-			Class taskClass = Class.forName("org.apache.tools.ant.taskdefs.Property"); //$NON-NLS-1$
-			addTaskDefinition("property", taskClass); //$NON-NLS-1$
-			taskClass = Class.forName("org.apache.tools.ant.taskdefs.Typedef"); //$NON-NLS-1$
-			addTaskDefinition("typedef", taskClass); //$NON-NLS-1$
-			taskClass = Class.forName("org.apache.tools.ant.taskdefs.Taskdef"); //$NON-NLS-1$
-			addTaskDefinition("taskdef", taskClass); //$NON-NLS-1$
-		} catch (NoClassDefFoundError e) {
-			throw new BuildException(InternalAntMessages.getString("InternalAntRunner.Missing_Class"), e); //$NON-NLS-1$
-		} catch (ClassNotFoundException c) {
-			throw new BuildException(InternalAntMessages.getString("InternalAntRunner.Missing_Class"), c); //$NON-NLS-1$
-		}
-
-		setSystemProperties();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.apache.tools.ant.Project#createDataType(java.lang.String)
-	 */
-	public Object createDataType(String typeName) throws BuildException {
-		if (typeNameToClass == null) {
-			initializeTypes();
-		}
-		Class typeClass = (Class) typeNameToClass.get(typeName);
-
-		if (typeClass == null) {
-			return null;
-		}
-
-		try {
-			Constructor ctor = null;
-			boolean noArg = false;
-			// DataType can have a "no arg" constructor or take a single
-			// Project argument.
-			try {
-				ctor = typeClass.getConstructor(new Class[0]);
-				noArg = true;
-			} catch (NoSuchMethodException nse) {
-				ctor = typeClass.getConstructor(new Class[] { Project.class });
-				noArg = false;
-			}
-
-			Object o = null;
-			if (noArg) {
-				o = ctor.newInstance(new Object[0]);
-			} else {
-				o = ctor.newInstance(new Object[] { this });
-			}
-			if (o instanceof ProjectComponent) {
-				((ProjectComponent) o).setProject(this);
-			}
-			return o;
-		} catch (InvocationTargetException ite) {
-			return null;
-		} catch (Throwable t) {
-			return null;
-		}
-	}
-
-	/**
-	 * Initialize the mapping of data type name to data type classname
-	 */
-	private void initializeTypes() {
-		typeNameToClass = new Hashtable(18);
-		String dataDefs = "/org/apache/tools/ant/types/defaults.properties"; //$NON-NLS-1$
-		try {
-			Properties props = new Properties();
-			InputStream in = Project.class.getResourceAsStream(dataDefs);
-			if (in == null) {
-				return;
-			}
-			props.load(in);
-			in.close();
-
-			Enumeration enum = props.propertyNames();
-			while (enum.hasMoreElements()) {
-				String typeName = (String) enum.nextElement();
-				String className = props.getProperty(typeName);
-				try {
-					Class typeClass= Class.forName(className);
-					typeNameToClass.put(typeName, typeClass);
-				} catch (NoClassDefFoundError e) {
-					//ignore
-				} catch (ClassNotFoundException c) {
-					//ignore
-				}
-			}
-		} catch (IOException ioe) {
-			return;
-		}
-
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.apache.tools.ant.Project#getDataTypeDefinitions()
-	 */
-	public Hashtable getDataTypeDefinitions() {
-		if (typeNameToClass == null) {
-			initializeTypes();
-		}
-		return typeNameToClass;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.apache.tools.ant.Project#addDataTypeDefinition(java.lang.String, java.lang.Class)
-	 */
-	public void addDataTypeDefinition(String typeName, Class typeClass) {
-		getDataTypeDefinitions();
-		typeNameToClass.put(typeName, typeClass);
-	}
-}
diff --git a/ant/org.eclipse.ant.core/src_ant/org/eclipse/ant/internal/core/ant/ProgressBuildListener.java b/ant/org.eclipse.ant.core/src_ant/org/eclipse/ant/internal/core/ant/ProgressBuildListener.java
deleted file mode 100644
index 37a98c6..0000000
--- a/ant/org.eclipse.ant.core/src_ant/org/eclipse/ant/internal/core/ant/ProgressBuildListener.java
+++ /dev/null
@@ -1,295 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.internal.core.ant;
-
-
-import java.util.*;
-
-import org.apache.tools.ant.*;
-import org.apache.tools.ant.taskdefs.Ant;
-import org.apache.tools.ant.taskdefs.CallTarget;
-import org.eclipse.ant.core.AntCorePlugin;
-import org.eclipse.core.runtime.*;
-
-/**
- * Reports progress and checks for cancelation of a script execution.
- */
-public class ProgressBuildListener implements BuildListener {
-
-	protected Map projects;
-	protected Project mainProject;
-	protected Project parentProject;
-	private Thread currentTaskThread;
-
-	/**
-	 *  Contains the progress monitor instances for the various
-	 *	projects in a chain.
-	 */
-	protected class ProjectMonitors {
-		/**
-		 *  This field is null for the main project
-		 */
-		private Target mainTarget;
-		private IProgressMonitor mainMonitor;
-		private IProgressMonitor targetMonitor;
-		private IProgressMonitor taskMonitor;
-		
-		protected IProgressMonitor getMainMonitor() {
-			return mainMonitor;
-		}
-
-		protected Target getMainTarget() {
-			return mainTarget;
-		}
-
-		protected IProgressMonitor getTargetMonitor() {
-			return targetMonitor;
-		}
-
-		protected IProgressMonitor getTaskMonitor() {
-			return taskMonitor;
-		}
-
-		protected void setMainMonitor(IProgressMonitor mainMonitor) {
-			this.mainMonitor = mainMonitor;
-		}
-
-		protected void setMainTarget(Target mainTarget) {
-			this.mainTarget = mainTarget;
-		}
-
-		protected void setTargetMonitor(IProgressMonitor targetMonitor) {
-			this.targetMonitor = targetMonitor;
-		}
-
-		protected void setTaskMonitor(IProgressMonitor taskMonitor) {
-			this.taskMonitor = taskMonitor;
-		}
-
-	}
-
-	public ProgressBuildListener(Project project, List targetNames, IProgressMonitor monitor) {
-		projects = new HashMap();
-		mainProject = project;
-		ProjectMonitors monitors = new ProjectMonitors();
-		if (monitor == null) {
-			monitor= new NullProgressMonitor();
-		}
-		monitors.setMainMonitor(monitor);
-		projects.put(mainProject, monitors);
-		List targets= new ArrayList(targetNames.size());
-		for (int i = 0; i < targetNames.size(); i++) {
-			String targetName = (String) targetNames.get(i);
-			Target target= (Target) mainProject.getTargets().get(targetName);
-			if (target != null) {
-				targets.add(target);
-			}
-		}
-		int work = computeWork(targets);
-		monitors.getMainMonitor().beginTask("", work);  //$NON-NLS-1$
-	}
-
-	/**
-	 * @see org.apache.tools.ant.BuildListener#buildStarted(org.apache.tools.ant.BuildEvent)
-	 */
-	public void buildStarted(BuildEvent event) {
-		checkCanceled();
-	}
-
-	protected int computeWork(List targets) {
-		int result = 0;
-		for (int i = 0; i < targets.size(); i++) {
-			result = result + countTarget((Target)targets.get(i));
-		}
-		return result;
-	}
-
-	protected int countTarget(Target target) {
-		int result = 1;
-		Project project = target.getProject();
-		Hashtable targets= project.getTargets();
-		for (Enumeration dependencies = target.getDependencies(); dependencies.hasMoreElements();) {
-			String targetName = (String) dependencies.nextElement();
-			Target dependency = (Target)targets.get(targetName);
-			if (dependency != null) {
-				result = result + countTarget(dependency);
-			}
-		}
-		// we have to handle antcall tasks as well
-		Task[] tasks = target.getTasks();
-		for (int i = 0; i < tasks.length; i++) {
-			if (tasks[i] instanceof CallTarget) {
-				// As we do not have access to the information (at least in Ant 1.4.1)
-				// describing what target is executed by this antcall task, we assume
-				// a scenario where it depends on all targets of the project but itself.
-				result = result + (targets.size() - 1);
-			}
-		}
-		return result;
-	}
-
-	/**
-	 * @see org.apache.tools.ant.BuildListener#buildFinished(org.apache.tools.ant.BuildEvent)
-	 */
-	public void buildFinished(BuildEvent event) {
-		ProjectMonitors monitors = (ProjectMonitors) projects.get(mainProject);
-		monitors.getMainMonitor().done();
-		Set keys= projects.keySet();
-		Iterator itr= keys.iterator();
-		while (itr.hasNext()) {
-			Project project = (Project) itr.next();
-			project.removeBuildListener(this);
-			project.getReferences().remove(AntCorePlugin.ECLIPSE_PROGRESS_MONITOR);
-		}
-	}
-
-	/**
-	 * @see org.apache.tools.ant.BuildListener#targetStarted(org.apache.tools.ant.BuildEvent)
-	 */
-	public void targetStarted(BuildEvent event) {
-		checkCanceled();
-		Project currentProject = event.getProject();
-		if (currentProject == null) {
-			return;
-		}
-		Target target = event.getTarget();
-		ProjectMonitors monitors = (ProjectMonitors) projects.get(currentProject);
-
-		// if monitors is null we are in a new script
-		if (monitors == null) {
-			monitors = createMonitors(currentProject, target);
-		}
-
-		monitors.setTargetMonitor(subMonitorFor(monitors.getMainMonitor(), 1));
-		int work = (target != null) ? target.getTasks().length : 100;
-		monitors.getTargetMonitor().beginTask("", work);  //$NON-NLS-1$
-	}
-
-	protected ProjectMonitors createMonitors(Project currentProject, Target target) {
-		ProjectMonitors monitors = new ProjectMonitors();
-		// remember the target so we can remove this monitors object later
-		monitors.setMainTarget(target);
-		List targets= new ArrayList(1);
-		targets.add(target);
-		int work = computeWork(targets);
-		ProjectMonitors parentMonitors = null;
-		if (parentProject == null) {
-			parentMonitors = (ProjectMonitors) projects.get(mainProject);
-			monitors.setMainMonitor(subMonitorFor(parentMonitors.getMainMonitor(), 1));
-		} else {
-			parentMonitors = (ProjectMonitors) projects.get(parentProject);
-			parentProject = null;
-			monitors.setMainMonitor(subMonitorFor(parentMonitors.getTaskMonitor(), 1));
-		}
-		monitors.getMainMonitor().beginTask("", work);  //$NON-NLS-1$
-		projects.put(currentProject, monitors);
-		return monitors;
-	}
-
-	/**
-	 * @see org.apache.tools.ant.BuildListener#targetFinished(org.apache.tools.ant.BuildEvent)
-	 */
-	public void targetFinished(BuildEvent event) {
-		checkCanceled();
-		Project currentProject = event.getProject();
-		if (currentProject == null) {
-			return;
-		}
-		ProjectMonitors monitors = (ProjectMonitors) projects.get(currentProject);
-		if (monitors == null) {
-			return;
-		}
-		monitors.getTargetMonitor().done();
-		// if this is not the main project test if we are done with this project
-		if ((currentProject != mainProject) && (monitors.getMainTarget() == event.getTarget())) {
-			monitors.getMainMonitor().done();
-			projects.remove(currentProject);
-		}
-	}
-
-	/**
-	 * @see org.apache.tools.ant.BuildListener#taskStarted(org.apache.tools.ant.BuildEvent)
-	 */
-	public void taskStarted(BuildEvent event) {
-		checkCanceled();
-		Project currentProject = event.getProject();
-		if (currentProject == null) {
-			return;
-		}
-		currentProject.getReferences().remove(AntCorePlugin.ECLIPSE_PROGRESS_MONITOR);
-		ProjectMonitors monitors = (ProjectMonitors) projects.get(currentProject);
-		if (monitors == null) {
-			return;
-		}
-		Task task = event.getTask();
-		if (task == null) {
-			return;
-		}
-		currentTaskThread= Thread.currentThread();
-		monitors.setTaskMonitor(subMonitorFor(monitors.getTargetMonitor(), 1));
-		monitors.getTaskMonitor().beginTask("", 1);  //$NON-NLS-1$
-		// If this script is calling another one, track the project chain.
-		if (task instanceof Ant) {
-			parentProject = currentProject;
-		} else {
-			currentProject.addReference(AntCorePlugin.ECLIPSE_PROGRESS_MONITOR, monitors.getTaskMonitor());
-		}
-	}
-
-	/**
-	 * @see org.apache.tools.ant.BuildListener#taskFinished(org.apache.tools.ant.BuildEvent)
-	 */
-	public void taskFinished(BuildEvent event) {
-		checkCanceled();
-		Project project = event.getProject();
-		if (project == null) {
-			return;
-		}
-		project.getReferences().remove(AntCorePlugin.ECLIPSE_PROGRESS_MONITOR);
-		ProjectMonitors monitors = (ProjectMonitors) projects.get(project);
-		if (monitors == null) {
-			return;
-		}
-		monitors.getTaskMonitor().done();
-		currentTaskThread= null;
-	}
-
-	/**
-	 * @see org.apache.tools.ant.BuildListener#messageLogged(org.apache.tools.ant.BuildEvent)
-	 */
-	public void messageLogged(BuildEvent event) {
-		checkCanceled();
-	}
-
-	protected void checkCanceled() {
-		//only cancel if the current task thread matches the current thread
-		//do not want to throw an exception in a separate thread or process
-		//see bug 32657
-		if (currentTaskThread != null && currentTaskThread != Thread.currentThread()) {
-			return;
-		}
-		ProjectMonitors monitors = (ProjectMonitors) projects.get(mainProject);
-		if (monitors.getMainMonitor().isCanceled()) {
-			currentTaskThread= null;
-			throw new OperationCanceledException(InternalAntMessages.getString("ProgressBuildListener.Build_cancelled._5")); //$NON-NLS-1$
-		}
-	}
-
-	protected IProgressMonitor subMonitorFor(IProgressMonitor monitor, int ticks) {
-		if (monitor == null) {
-			return new NullProgressMonitor();
-		}
-		if (monitor instanceof NullProgressMonitor) {
-			return monitor;
-		}
-		return new SubProgressMonitor(monitor, ticks);
-	}
-}
diff --git a/ant/org.eclipse.ant.tests.core/.classpath b/ant/org.eclipse.ant.tests.core/.classpath
deleted file mode 100644
index 6026612..0000000
--- a/ant/org.eclipse.ant.tests.core/.classpath
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-    <classpathentry kind="src" path="test plugin"/>
-    <classpathentry kind="src" path="tests"/>
-    <classpathentry kind="src" path="test support"/>
-    <classpathentry kind="src" path="/org.apache.ant"/>
-    <classpathentry kind="src" path="/org.junit"/>
-    <classpathentry kind="src" path="/org.eclipse.core.resources"/>
-    <classpathentry kind="src" path="/org.apache.xerces"/>
-    <classpathentry kind="src" path="/org.eclipse.jdt.core"/>
-    <classpathentry kind="src" path="/org.eclipse.ui"/>
-    <classpathentry kind="src" path="/org.eclipse.ant.core"/>
-    <classpathentry kind="src" path="/org.eclipse.update.core"/>
-    <classpathentry kind="src" path="/org.eclipse.core.runtime"/>
-    <classpathentry kind="src" path="/org.eclipse.core.boot"/>
-    <classpathentry kind="var" path="JRE_LIB" rootpath="JRE_SRCROOT" sourcepath="JRE_SRC"/>
-    <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/ant/org.eclipse.ant.tests.core/.cvsignore b/ant/org.eclipse.ant.tests.core/.cvsignore
deleted file mode 100644
index 57b480f..0000000
--- a/ant/org.eclipse.ant.tests.core/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-bin
-lib
diff --git a/ant/org.eclipse.ant.tests.core/.project b/ant/org.eclipse.ant.tests.core/.project
deleted file mode 100644
index 87d1449..0000000
--- a/ant/org.eclipse.ant.tests.core/.project
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ant.tests.core</name>
-	<comment></comment>
-	<projects>
-		<project>org.apache.ant</project>
-		<project>org.apache.xerces</project>
-		<project>org.eclipse.ant.core</project>
-		<project>org.eclipse.core.boot</project>
-		<project>org.eclipse.core.resources</project>
-		<project>org.eclipse.core.runtime</project>
-		<project>org.eclipse.jdt.core</project>
-		<project>org.eclipse.ui</project>
-		<project>org.eclipse.update.core</project>
-		<project>org.junit</project>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/ant/org.eclipse.ant.tests.core/about.html b/ant/org.eclipse.ant.tests.core/about.html
deleted file mode 100644
index d57b432..0000000
--- a/ant/org.eclipse.ant.tests.core/about.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>16th October, 2002</p>	
-<h3>License</h3>
-<p>Eclipse.org makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Common Public License Version 1.0 (&quot;CPL&quot;).  A copy of the CPL is available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>.
-For purposes of the CPL, &quot;Program&quot; will mean the Content.</p>
-
-<h3>Contributions</h3>
-
-<p>If this Content is licensed to you under the terms and conditions of the CPL, any Contributions, as defined in the CPL, uploaded, submitted, or otherwise
-made available to Eclipse.org, members of Eclipse.org and/or the host of Eclipse.org web site, by you that relate to such
-Content are provided under the terms and conditions of the CPL and can be made available to others under the terms of the CPL.</p>
-
-<p>If this Content is licensed to you under license terms and conditions other than the CPL (&quot;Other License&quot;), any modifications, enhancements and/or
-other code and/or documentation (&quot;Modifications&quot;) uploaded, submitted, or otherwise made available to Eclipse.org, members of Eclipse.org and/or the
-host of Eclipse.org, by you that relate to such Content are provided under terms and conditions of the Other License and can be made available
-to others under the terms of the Other License.  In addition, with regard to Modifications for which you are the copyright holder, you are also
-providing the Modifications under the terms and conditions of the CPL and such Modifications can be made available to others under the terms of
-the CPL.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/ant/org.eclipse.ant.tests.core/build.properties b/ant/org.eclipse.ant.tests.core/build.properties
deleted file mode 100644
index b5a6a8b..0000000
--- a/ant/org.eclipse.ant.tests.core/build.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2003 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Common Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/cpl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-bin.includes = plugin.xml,\
-			   plugin.properties,\
-               test.xml,\
-               about.html,\
-               testbuildfiles/,\
-               testresources/,\
-               testlib/,\
-               lib/,\
-               lib/*.jar,\
-               *.jar
-               
-source.anttestscore.jar = test plugin/,\
-                         tests/,\
-                         buildfiles/
-source.lib/antTestsSupport.jar = test support/
diff --git a/ant/org.eclipse.ant.tests.core/buildfiles/buildAntTestsSupportJAR.xml b/ant/org.eclipse.ant.tests.core/buildfiles/buildAntTestsSupportJAR.xml
deleted file mode 100644
index 8e963b8..0000000
--- a/ant/org.eclipse.ant.tests.core/buildfiles/buildAntTestsSupportJAR.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="build tests support jar" default="build" basedir="..">
-
-	<property name="bootclasspath" value=""/>
-
-	<target name="build" description="Removes all build artifacts, recreates the support jar, and refreshes this plugin's resources">
-		<antcall target="clean"/>
-		<antcall target="lib/antTestsSupport.jar"/>
-		<antcall target="refresh"/>
-	</target>
-
-	<target name="init" depends="properties">
-		<property name="plugin" value="org.eclipse.ant.tests.core"/>
-		<property name="version.suffix" value="_2.1.0"/>
-		<property name="full.name" value="${plugin}${version.suffix}"/>
-		<property name="temp.folder" value="${basedir}/temp.folder"/>
-		<property name="plugin.destination" value="${basedir}"/>
-		<property name="build.result.folder" value="${basedir}"/>
-		<property name="win32.jar" value="${basedir}/../org.eclipse.swt.win32/ws/win32/swt.jar"/>
-		<property name="gtk.jar" value="${basedir}/../org.eclipse.swt.gtk/ws/gtk/swt.jar"/>
-		<property name="motif.jar" value="${basedir}/../org.eclipse.swt.motif/ws/motif/swt.jar"/>
-		<available file="${win32.jar}" property="swt.jar" value="${win32.jar}"/>
-		<available file="${gtk.jar}" property="swt.jar" value="${gtk.jar}"/>
-		<available file="${motif.jar}" property="swt.jar" value="${motif.jar}"/>
-	</target>
-
-	<target name="properties" if="eclipse.running">
-		<property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter"/>
-	</target>
-
-	<target name="lib/antTestsSupport.jar" depends="init" description= "Builds the support JAR">
-		<property name="destdir" value="${temp.folder}/lib/antTestsSupport.jar.bin"/>
-		<delete dir="${temp.folder}/lib/antTestsSupport.jar.bin"/>
-		<mkdir dir="${temp.folder}/lib/antTestsSupport.jar.bin"/>
-		<!-- compile the source code -->
-		<javac target="1.3" source="1.3" destdir="${temp.folder}/lib/antTestsSupport.jar.bin" failonerror="false" verbose="false" debug="on" includeAntRuntime="no" bootclasspath="${bootclasspath}" classpath="${basedir}/../org.eclipse.core.runtime/runtime.jar;${basedir}/../org.apache.ant/ant.jar;${basedir}/../org.apache.xerces/xercesImpl.jar;${basedir}/../org.apache.xerces/xmlParserAPIs.jar;${basedir}/bin;${basedir}/../org.eclipse.core.boot/boot.jar;${basedir}/../org.eclipse.ant.core/bin">
-			<src path="test support/"/>
-		</javac>
-		<mkdir dir="${build.result.folder}/lib"/>
-		<jar jarfile="${build.result.folder}/lib/antTestsSupport.jar" basedir="${temp.folder}/lib/antTestsSupport.jar.bin"/>
-		<delete dir="${temp.folder}"/>
-	</target>
-
-	<target name="clean" depends="init">
-		<delete file="${build.result.folder}/lib/antTestsSupport.jar"/>
-		<delete dir="${temp.folder}"/>
-	</target>
-
-	<target name="refresh" depends="init" if="eclipse.running" description= "Refreshes the project's resources">
-		<eclipse.refreshLocal resource="${plugin}" depth="infinite"/>
-	</target>
-</project>
diff --git a/ant/org.eclipse.ant.tests.core/lib/antTestsSupport.jar b/ant/org.eclipse.ant.tests.core/lib/antTestsSupport.jar
deleted file mode 100644
index 5fd624a..0000000
--- a/ant/org.eclipse.ant.tests.core/lib/antTestsSupport.jar
+++ /dev/null
Binary files differ
diff --git a/ant/org.eclipse.ant.tests.core/plugin.properties b/ant/org.eclipse.ant.tests.core/plugin.properties
deleted file mode 100644
index a815294..0000000
--- a/ant/org.eclipse.ant.tests.core/plugin.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2003 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Common Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/cpl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-pluginName=Ant Core Test Plugin
-providerName=Eclipse.org
diff --git a/ant/org.eclipse.ant.tests.core/plugin.xml b/ant/org.eclipse.ant.tests.core/plugin.xml
deleted file mode 100644
index 4fd7989..0000000
--- a/ant/org.eclipse.ant.tests.core/plugin.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<plugin
-   id="org.eclipse.ant.tests.core"
-   name="%pluginName"
-   version="2.1.0"
-   provider-name="%providerName"
-   class="org.eclipse.ant.tests.core.testplugin.AntTestPlugin">
-   
-   <requires>
-      <import plugin="org.apache.ant"/>
-	  <import plugin="org.junit"/>   
-      <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.apache.xerces"/>
-      <import plugin="org.eclipse.jdt.core"/>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.ant.core"/>
-      <import plugin="org.eclipse.update.core"/>
-   </requires>
-
-<runtime>
-  <library name="anttestscore.jar" >
-     <export name = "*"/>
-  </library> 
-</runtime>
-
-<extension point="org.eclipse.ant.core.extraClasspathEntries">
-		<extraClasspathEntry
-		library="lib/antTestsSupport.jar">
-	</extraClasspathEntry>
-</extension>
-
-</plugin>
diff --git a/ant/org.eclipse.ant.tests.core/test plugin/org/eclipse/ant/tests/core/testplugin/AntFileRunner.java b/ant/org.eclipse.ant.tests.core/test plugin/org/eclipse/ant/tests/core/testplugin/AntFileRunner.java
deleted file mode 100644
index 64e8216..0000000
--- a/ant/org.eclipse.ant.tests.core/test plugin/org/eclipse/ant/tests/core/testplugin/AntFileRunner.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.tests.core.testplugin;
-
-
-import org.eclipse.ant.core.AntRunner;
-import org.eclipse.ant.tests.core.AbstractAntTest;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
-
-/**
- * Responsible for running test ant build files.
- */
-public class AntFileRunner {
-	
-	private static final String BASE_DIR_PREFIX = "-Dbasedir="; //$NON-NLS-1$
-
-	public void run(IFile buildFile, String[] targets, String[] args, String baseDir, boolean captureOutput) throws CoreException {
-	
-		AntRunner runner = new AntRunner();
-
-		String[] runnerArgs = args;
-
-		if (baseDir.length() > 0) {
-			// Ant requires the working directory to be specified
-			// as one of the arguments, so it needs to be appended.
-			int length = 1;
-			if (args != null) {
-				length = args.length + 1;
-			} 
-			
-			runnerArgs = new String[length];
-			if (args != null) {
-				System.arraycopy(args, 0, runnerArgs, 0, args.length);
-			}
-			runnerArgs[length - 1] = BASE_DIR_PREFIX + baseDir;
-		}
-		runner.setArguments(runnerArgs);
-
-		if (buildFile != null) {
-			runner.setBuildFileLocation(buildFile.getLocation().toFile().toString());
-		}
-		if (targets != null && targets.length > 0) {
-			runner.setExecutionTargets(targets);
-		}
-		if (captureOutput) {
-			runner.addBuildLogger(AbstractAntTest.ANT_TEST_BUILD_LOGGER);
-		}
-
-		runner.run(null);
-	}
-	
-	public void run(String[] args, String baseDir) throws Exception {
-	
-		AntRunner runner = new AntRunner();
-
-		String[] runnerArgs = args;
-
-		if (baseDir.length() > 0) {
-			// Ant requires the working directory to be specified
-			// as one of the arguments, so it needs to be appended.
-			runnerArgs = new String[args.length + 1];
-			System.arraycopy(args, 0, runnerArgs, 0, args.length);
-			runnerArgs[args.length] = BASE_DIR_PREFIX + baseDir;
-		}
-		runner.setArguments(runnerArgs);
-
-		runner.run(args);
-	}
-}
diff --git a/ant/org.eclipse.ant.tests.core/test plugin/org/eclipse/ant/tests/core/testplugin/AntTestChecker.java b/ant/org.eclipse.ant.tests.core/test plugin/org/eclipse/ant/tests/core/testplugin/AntTestChecker.java
deleted file mode 100644
index 56abbf1..0000000
--- a/ant/org.eclipse.ant.tests.core/test plugin/org/eclipse/ant/tests/core/testplugin/AntTestChecker.java
+++ /dev/null
@@ -1,229 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.tests.core.testplugin;
-
-
-import java.util.ArrayList;
-import java.util.Hashtable;
-import java.util.List;
-
-public class AntTestChecker {
-	
-	private static AntTestChecker deflt= null;
-	
-	private int taskStartedCount;
-	
-	private int taskFinishedCount;
-	
-	private int targetsStartedCount;
-	
-	private int targetsFinishedCount;
-	
-	private int buildsStartedCount;
-	
-	private int buildsFinishedCount;
-	
-	private List messages= new ArrayList();
-	
-	private List targets= new ArrayList();
-	
-	private List tasks= new ArrayList();
-	
-	private List projects= new ArrayList();
-	
-	private Hashtable userProperties;
-	
-	private List nameOfListeners= new ArrayList();
-	
-	private AntTestChecker()  {
-	}
-	
-	/**
-	 * Returns the singleton AntLoggerChecker
-	 */
-	public static AntTestChecker getDefault() {
-		if (deflt == null) {
-			deflt= new AntTestChecker();
-		}
-		return deflt;
-	}
-	
-	/**
-	 * Returns the singleton AntLoggerChecker
-	 */
-	public static void reset() {
-		if (deflt != null) {
-			deflt.resetState();
-		}
-	}
-	/**
-	 * @see org.apache.tools.ant.BuildListener#buildFinished(org.apache.tools.ant.BuildEvent)
-	 */
-	public void buildFinished(String projectName) {
-		buildsFinishedCount++;
-	}
-
-	
-	public void buildStarted(String projectName) {
-		buildsStartedCount++;
-		projects.add(projectName);
-	}
-
-	
-	public void messageLogged(String message) {
-		messages.add(message);
-	}
-
-	/**
-	 * @see org.apache.tools.ant.BuildListener#targetFinished(org.apache.tools.ant.BuildEvent)
-	 */
-	public void targetFinished(String targetName) {
-		targetsFinishedCount++;
-	}
-
-	/**
-	 * @see org.apache.tools.ant.BuildListener#targetStarted(org.apache.tools.ant.BuildEvent)
-	 */
-	public void targetStarted(String targetName) {
-		targetsStartedCount++;
-		targets.add(targetName);
-	}
-
-	/**
-	 * @see org.apache.tools.ant.BuildListener#taskFinished(org.apache.tools.ant.BuildEvent)
-	 */
-	public void taskFinished(String taskName) {
-		taskFinishedCount++;
-	}
-
-	/**
-	 * @see org.apache.tools.ant.BuildListener#taskStarted(org.apache.tools.ant.BuildEvent)
-	 */
-	public void taskStarted(String taskName) {
-		taskStartedCount++;
-		tasks.add(taskName);
-	}
-	
-	/**
-	 * Returns the buildsFinishedCount.
-	 * @return int
-	 */
-	public int getBuildsFinishedCount() {
-		return buildsFinishedCount;
-	}
-
-	/**
-	 * Returns the buildsStartedCount.
-	 * @return int
-	 */
-	public int getBuildsStartedCount() {
-		return buildsStartedCount;
-	}
-
-	/**
-	 * Returns the messagesLoggedCount.
-	 * @return int
-	 */
-	public int getMessagesLoggedCount() {
-		return messages.size();
-	}
-
-	/**
-	 * Returns the targetsFinishedCount.
-	 * @return int
-	 */
-	public int getTargetsFinishedCount() {
-		return targetsFinishedCount;
-	}
-
-	/**
-	 * Returns the targetsStartedCount.
-	 * @return int
-	 */
-	public int getTargetsStartedCount() {
-		return targetsStartedCount;
-	}
-
-	/**
-	 * Returns the taskFinishedCount.
-	 * @return int
-	 */
-	public int getTaskFinishedCount() {
-		return taskFinishedCount;
-	}
-
-	/**
-	 * Returns the taskStartedCount.
-	 * @return int
-	 */
-	public int getTaskStartedCount() {
-		return taskStartedCount;
-	}
-	
-	protected void resetState() {
-		taskStartedCount= 0;
-		taskFinishedCount= 0;
-		targetsStartedCount= 0;
-		targetsFinishedCount= 0;
-		buildsStartedCount= 0;
-		buildsFinishedCount= 0;
-		messages= new ArrayList();
-		tasks= new ArrayList();
-		targets= new ArrayList();
-		projects= new ArrayList();
-		userProperties= null;
-		nameOfListeners= new ArrayList();
-	}
-	
-	/**
-     * Return the message n from the last:
-     * e.g. getLoggedMessage(0) returns the most recent message
-     * 
-	 * @param n message index
-	 * @return the nth last message
-	 */
-    public String getLoggedMessage(int n) {
-        n = messages.size() - (n + 1);
-        if ((n < 0) || (n >= messages.size())) {
-            return null;
-        }
-        return (String) messages.get(n);
-    }
-
-    public String getLastMessageLogged() {
-        return getLoggedMessage(0);
-    }
-	
-	public void setUserProperties(Hashtable userProperties) {
-		this.userProperties= userProperties;
-	}
-
-	public String getUserProperty(String name) {
-		return (String)userProperties.get(name);
-	}
-	
-	public List getMessages() {
-		return messages;
-	}
-	
-	public List getListeners() {
-		return nameOfListeners;
-	}
-	
-	public String getLastListener() {
-		return (String)nameOfListeners.get(nameOfListeners.size() - 1);
-	}
-
-
-	public void addNameOfListener(String nameOfListener) {
-		this.nameOfListeners.add(nameOfListener);
-	}
-}
diff --git a/ant/org.eclipse.ant.tests.core/test plugin/org/eclipse/ant/tests/core/testplugin/AntTestPlugin.java b/ant/org.eclipse.ant.tests.core/test plugin/org/eclipse/ant/tests/core/testplugin/AntTestPlugin.java
deleted file mode 100644
index 831c208..0000000
--- a/ant/org.eclipse.ant.tests.core/test plugin/org/eclipse/ant/tests/core/testplugin/AntTestPlugin.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.tests.core.testplugin;
-
-
-import java.io.File;
-import java.io.IOException;
-import java.net.URL;
-
-import org.eclipse.core.resources.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-
-
-public class AntTestPlugin extends AbstractUIPlugin {
-	
-	private static AntTestPlugin deflt;
-	
-	public AntTestPlugin(IPluginDescriptor descriptor) {
-		super(descriptor);
-		deflt= this;
-	}
-	
-	public static AntTestPlugin getDefault() {
-		return deflt;
-	}
-	
-	public static IWorkspace getWorkspace() {
-		return ResourcesPlugin.getWorkspace();
-	}
-	
-	public static void enableAutobuild(boolean enable) throws CoreException {
-		// disable auto build
-		IWorkspace workspace= AntTestPlugin.getWorkspace();
-		IWorkspaceDescription desc= workspace.getDescription();
-		desc.setAutoBuilding(enable);
-		workspace.setDescription(desc);
-	}
-	
-	public File getFileInPlugin(IPath path) {
-		try {
-			URL installURL= new URL(getDescriptor().getInstallURL(), path.toString());
-			URL localURL= Platform.asLocalURL(installURL);
-			return new File(localURL.getFile());
-		} catch (IOException e) {
-			return null;
-		}
-	}
-}
diff --git a/ant/org.eclipse.ant.tests.core/test plugin/org/eclipse/ant/tests/core/testplugin/ProjectHelper.java b/ant/org.eclipse.ant.tests.core/test plugin/org/eclipse/ant/tests/core/testplugin/ProjectHelper.java
deleted file mode 100644
index 60132c3..0000000
--- a/ant/org.eclipse.ant.tests.core/test plugin/org/eclipse/ant/tests/core/testplugin/ProjectHelper.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.tests.core.testplugin;
-
-
-import java.io.File;
-import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
-import java.util.*;
-
-import org.eclipse.core.resources.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.ui.dialogs.IOverwriteQuery;
-import org.eclipse.ui.wizards.datatransfer.*;
-
-/**
- * Helper methods to set up an IProject.
- */
-public class ProjectHelper {
-	
-	public static final IPath TEST_BUILDFILES_DIR= new Path("testbuildfiles");
-	public static final IPath TEST_RESOURCES_DIR= new Path("testresources");	
-	public static final IPath TEST_LIB_DIR= new Path("testlib");
-	
-	/**
-	 * Creates a IProject.
-	 */	
-	public static IProject createProject(String projectName, String binFolderName) throws CoreException {
-		IWorkspaceRoot root= ResourcesPlugin.getWorkspace().getRoot();
-		IProject project= root.getProject(projectName);
-		if (!project.exists()) {
-			project.create(null);
-		} else {
-			project.refreshLocal(IResource.DEPTH_INFINITE, null);
-		}
-		
-		if (!project.isOpen()) {
-			project.open(null);
-		}
-		
-		return project;
-	}
-	
-	/**
-	 * Removes an IProject.
-	 */		
-	public static void delete(IProject project) throws CoreException {
-		project.delete(true, true, null);
-	}
-
-
-	/**
-	 * Adds a folder to an IProject.
-	 */		
-	public static IFolder addFolder(IProject project, String containerName) throws CoreException {
-		
-			IFolder folder= project.getFolder(containerName);
-			if (!folder.exists()) {
-				folder.create(false, true, null);
-			}
-		
-		return folder;
-		
-	}
-	
-	public static void importFilesFromDirectory(File rootDir, IPath destPath, IProgressMonitor monitor) throws InvocationTargetException, IOException {		
-		IImportStructureProvider structureProvider = FileSystemStructureProvider.INSTANCE;
-		List files = new ArrayList(100);
-		addFiles(rootDir, files);
-		try {
-			ImportOperation op= new ImportOperation(destPath, rootDir, structureProvider, new ImportOverwriteQuery(), files);
-			op.setCreateContainerStructure(false);
-			op.run(monitor);
-		} catch (InterruptedException e) {
-			// should not happen
-		}
-	}	
-	
-	private static void addFiles(File dir, List collection) throws IOException {
-		File[] files = dir.listFiles();
-		List subDirs = new ArrayList(2);
-		for (int i = 0; i < files.length; i++) {
-			if (files[i].isFile()) {
-				collection.add(files[i]);
-			} else if (files[i].isDirectory()) {
-				subDirs.add(files[i]);
-			}
-		}
-		Iterator iter = subDirs.iterator();
-		while (iter.hasNext()) {
-			File subDir = (File)iter.next();
-			addFiles(subDir, collection);
-		}
-	}
-	
-	private static class ImportOverwriteQuery implements IOverwriteQuery {
-		public String queryOverwrite(String file) {
-			return ALL;
-		}	
-	}			
-}
-
diff --git a/ant/org.eclipse.ant.tests.core/test support/org/eclipse/ant/tests/core/support/inputHandlers/AntTestInputHandler.java b/ant/org.eclipse.ant.tests.core/test support/org/eclipse/ant/tests/core/support/inputHandlers/AntTestInputHandler.java
deleted file mode 100644
index 9441b1f..0000000
--- a/ant/org.eclipse.ant.tests.core/test support/org/eclipse/ant/tests/core/support/inputHandlers/AntTestInputHandler.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.tests.core.support.inputHandlers;
-
-
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.input.DefaultInputHandler;
-import org.apache.tools.ant.input.InputRequest;
-
-/**
- * A test input handler when using Ant within Eclipse.
- * This is the class that will respond to <input> requests from
- * within an Ant build file.
- */
-public class AntTestInputHandler extends DefaultInputHandler {
-	
-	/**
-	 * @see org.apache.tools.ant.input.InputHandler#handleInput(org.apache.tools.ant.input.InputRequest)
-	 */
-	public void handleInput(InputRequest request) throws BuildException {
-		request.setInput("testing handling input requests");
-	}
-}
diff --git a/ant/org.eclipse.ant.tests.core/test support/org/eclipse/ant/tests/core/support/tasks/AntTestTask.java b/ant/org.eclipse.ant.tests.core/test support/org/eclipse/ant/tests/core/support/tasks/AntTestTask.java
deleted file mode 100644
index c73c836..0000000
--- a/ant/org.eclipse.ant.tests.core/test support/org/eclipse/ant/tests/core/support/tasks/AntTestTask.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.tests.core.support.tasks;
-
-
-
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Task;
-import org.apache.tools.ant.taskdefs.Echo;
-
-
-public class AntTestTask extends Task {
-	
-	public AntTestTask() {
-		super();
-	}
-	
-	/**
-	 * @see org.apache.tools.ant.Task#execute()
-	 */
-	public void execute() throws BuildException {
-		Echo echo= new Echo();
-		echo.setProject(getProject());
-		echo.setMessage("Testing Ant in Eclipse with a custom task");
-		echo.execute();
-	}
-}
diff --git a/ant/org.eclipse.ant.tests.core/test support/org/eclipse/ant/tests/core/support/tasks/AntTestTask2.java b/ant/org.eclipse.ant.tests.core/test support/org/eclipse/ant/tests/core/support/tasks/AntTestTask2.java
deleted file mode 100644
index 59dddc7..0000000
--- a/ant/org.eclipse.ant.tests.core/test support/org/eclipse/ant/tests/core/support/tasks/AntTestTask2.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.tests.core.support.tasks;
-
-
-
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Task;
-import org.apache.tools.ant.taskdefs.Echo;
-
-
-public class AntTestTask2 extends Task {
-	
-	public AntTestTask2() {
-		super();
-	}
-	
-	/**
-	 * @see org.apache.tools.ant.Task#execute()
-	 */
-	public void execute() throws BuildException {
-		Echo echo= new Echo();
-		echo.setProject(getProject());
-		echo.setMessage("Testing Ant in Eclipse with a custom task");
-		echo.execute();
-	}
-}
diff --git a/ant/org.eclipse.ant.tests.core/test support/org/eclipse/ant/tests/core/support/testloggers/TestBuildListener.java b/ant/org.eclipse.ant.tests.core/test support/org/eclipse/ant/tests/core/support/testloggers/TestBuildListener.java
deleted file mode 100644
index 30d4ddf..0000000
--- a/ant/org.eclipse.ant.tests.core/test support/org/eclipse/ant/tests/core/support/testloggers/TestBuildListener.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.tests.core.support.testloggers;
-
-
-import org.apache.tools.ant.BuildEvent;
-import org.apache.tools.ant.BuildListener;
-import org.eclipse.ant.tests.core.testplugin.AntTestChecker;
-
-
-public class TestBuildListener implements BuildListener {
-
-	/**
-	 * @see org.apache.tools.ant.BuildListener#buildFinished(org.apache.tools.ant.BuildEvent)
-	 */
-	public void buildFinished(BuildEvent event) {
-	}
-
-	/**
-	 * @see org.apache.tools.ant.BuildListener#buildStarted(org.apache.tools.ant.BuildEvent)
-	 */
-	public void buildStarted(BuildEvent event) {
-		AntTestChecker.getDefault().addNameOfListener(this.getClass().getName());
-	}
-
-	/**
-	 * @see org.apache.tools.ant.BuildListener#messageLogged(org.apache.tools.ant.BuildEvent)
-	 */
-	public void messageLogged(BuildEvent event) {
-	}
-
-	/**
-	 * @see org.apache.tools.ant.BuildListener#targetFinished(org.apache.tools.ant.BuildEvent)
-	 */
-	public void targetFinished(BuildEvent event) {
-	}
-
-	/**
-	 * @see org.apache.tools.ant.BuildListener#targetStarted(org.apache.tools.ant.BuildEvent)
-	 */
-	public void targetStarted(BuildEvent event) {
-	}
-
-	/**
-	 * @see org.apache.tools.ant.BuildListener#taskFinished(org.apache.tools.ant.BuildEvent)
-	 */
-	public void taskFinished(BuildEvent event) {
-	}
-
-	/**
-	 * @see org.apache.tools.ant.BuildListener#taskStarted(org.apache.tools.ant.BuildEvent)
-	 */
-	public void taskStarted(BuildEvent event) {
-	}
-
-}
diff --git a/ant/org.eclipse.ant.tests.core/test support/org/eclipse/ant/tests/core/support/testloggers/TestBuildLogger.java b/ant/org.eclipse.ant.tests.core/test support/org/eclipse/ant/tests/core/support/testloggers/TestBuildLogger.java
deleted file mode 100644
index d9c1414..0000000
--- a/ant/org.eclipse.ant.tests.core/test support/org/eclipse/ant/tests/core/support/testloggers/TestBuildLogger.java
+++ /dev/null
@@ -1,172 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.tests.core.support.testloggers;
-
-
-import java.io.PrintStream;
-
-import org.apache.tools.ant.*;
-import org.eclipse.ant.core.AntSecurityException;
-import org.eclipse.ant.tests.core.testplugin.AntTestChecker;
-import org.eclipse.core.runtime.OperationCanceledException;
-
-public class TestBuildLogger implements BuildLogger {
-
-	private int messageOutputLevel =Project.MSG_INFO;
-	private PrintStream fErr= null;
-	private PrintStream fOut= null;
-	
-	/**
-	 * An exception that has already been logged.
-	 */
-	private Throwable fHandledException= null;
-	
-	
-	public TestBuildLogger() {
-	}
-	
-	/**
-	 * @see org.apache.tools.ant.BuildLogger#setMessageOutputLevel(int)
-	 */
-	public void setMessageOutputLevel(int level) {
-		messageOutputLevel= level;
-	}
-	
-	protected int getMessageOutputLevel() {
-		return messageOutputLevel;
-	}
-
-	/**
-	 * @see org.apache.tools.ant.BuildLogger#setEmacsMode(boolean)
-	 */
-	public void setEmacsMode(boolean emacsMode) {
-	}
-
-	/**
-	 * @see org.apache.tools.ant.BuildListener#buildStarted(org.apache.tools.ant.BuildEvent)
-	 */
-	public void buildStarted(BuildEvent event) {
-		AntTestChecker.getDefault().buildStarted(event.getProject().getName());
-		AntTestChecker.getDefault().setUserProperties(event.getProject().getProperties());
-	}
-
-	/**
-	 * @see org.apache.tools.ant.BuildListener#buildFinished(org.apache.tools.ant.BuildEvent)
-	 */
-	public void buildFinished(BuildEvent event) {
-		handleException(event);
-		fHandledException= null;
-		AntTestChecker.getDefault().buildFinished(event.getProject().getName());
-	}
-
-	/**
-	 * @see org.apache.tools.ant.BuildListener#targetStarted(org.apache.tools.ant.BuildEvent)
-	 */
-	public void targetStarted(BuildEvent event) {
-		AntTestChecker.getDefault().targetStarted(event.getTarget().getName());
-	}
-
-	/**
-	 * @see org.apache.tools.ant.BuildListener#targetFinished(org.apache.tools.ant.BuildEvent)
-	 */
-	public void targetFinished(BuildEvent event) {
-		handleException(event);
-		AntTestChecker.getDefault().targetFinished(event.getTarget().getName());
-	}
-
-	/**
-	 * @see org.apache.tools.ant.BuildListener#taskStarted(org.apache.tools.ant.BuildEvent)
-	 */
-	public void taskStarted(BuildEvent event) {
-		AntTestChecker.getDefault().taskStarted(event.getTask().getTaskName());
-	}
-
-	/**
-	 * @see org.apache.tools.ant.BuildListener#taskFinished(org.apache.tools.ant.BuildEvent)
-	 */
-	public void taskFinished(BuildEvent event) {
-		handleException(event);
-		AntTestChecker.getDefault().targetFinished(event.getTask().getTaskName());
-	}
-
-	/**
-	 * @see BuildListener#messageLogged(BuildEvent)
-	 */
-	public void messageLogged(BuildEvent event) {
-		if (event.getPriority() > getMessageOutputLevel()) {
-			return;
-		}
-		logMessage(event.getMessage(), event.getPriority());
-		AntTestChecker.getDefault().messageLogged(event.getMessage());
-	}
-
-	protected PrintStream getErrorPrintStream() {
-		return fErr;
-	}
-	
-	protected PrintStream getOutputPrintStream() {
-		return fOut;
-	}
-	
-	/**
-	 * @see org.apache.tools.ant.BuildLogger#setErrorPrintStream(java.io.PrintStream)
-	 */
-	public void setErrorPrintStream(PrintStream err) {
-		//this build logger logs to "null" unless
-		//the user has explicitly set a logfile to use
-		if (err == System.err) {
-			fErr= null;
-		} else {
-			fErr= err;
-		}
-	}
-
-	/**
-	 * @see org.apache.tools.ant.BuildLogger#setOutputPrintStream(java.io.PrintStream)
-	 */
-	public void setOutputPrintStream(PrintStream output) {
-		//this build logger logs to "null" unless
-		//the user has explicitly set a logfile to use
-		if (output == System.out) {
-			fOut= null;
-		} else {
-			fOut= output;
-		}
-	}
-	
-	protected void logMessage(String message, int priority) {
-		if (priority > getMessageOutputLevel()) {
-			return;
-		}
-		
-		if (priority == Project.MSG_ERR) {
-			if (getErrorPrintStream() != null && getErrorPrintStream() != System.err) {
-				//user has designated to log to a logfile
-				getErrorPrintStream().println(message);
-			}
-		} else {
-			if (getOutputPrintStream() != null && getOutputPrintStream() != System.out) {
-				//user has designated to log to a logfile
-				getOutputPrintStream().println(message);
-			} 
-		}
-	}
-	
-	protected void handleException(BuildEvent event) {
-		Throwable exception = event.getException();
-		if (exception == null || exception == fHandledException
-		|| exception instanceof OperationCanceledException
-		|| exception instanceof AntSecurityException) {
-			return;
-		}
-		fHandledException= exception;
-	}
-}
diff --git a/ant/org.eclipse.ant.tests.core/test support/org/eclipse/ant/tests/core/support/types/AntTestPath.java b/ant/org.eclipse.ant.tests.core/test support/org/eclipse/ant/tests/core/support/types/AntTestPath.java
deleted file mode 100644
index 408ac4a..0000000
--- a/ant/org.eclipse.ant.tests.core/test support/org/eclipse/ant/tests/core/support/types/AntTestPath.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.tests.core.support.types;
-
-
-
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.types.Path;
-
-public class AntTestPath extends Path {
-	
-	String message;
-	
-	public AntTestPath(Project project) {
-		super(project);
-	}
-	
-	public void setMessage(String message) {
-		this.message= message;
-	}
-	
-	public String getMessage() {
-		return message;
-	}
-	
-}
diff --git a/ant/org.eclipse.ant.tests.core/test.xml b/ant/org.eclipse.ant.tests.core/test.xml
deleted file mode 100644
index 47d3ab0..0000000
--- a/ant/org.eclipse.ant.tests.core/test.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="testsuite" default="run" basedir=".">
-  <!-- sets the properties eclipse-home, and library-file -->
-  <!-- The property ${eclipse-home} should be passed into this script -->
-  <!-- Set a meaningful default value for when it is not. -->
-  <property name="eclipse-home" value="${basedir}\..\.."/>
-<property name="plugin-name" value="org.eclipse.ant.tests.core"/>
-  <property name="library-file"
-            value="${eclipse-home}/plugins/org.eclipse.test/library.xml"/>
- 
-  <!-- This target holds all initialization code that needs to be done for -->
-  <!-- all tests that are to be run. Initialization for individual tests -->
-  <!-- should be done within the body of the suite target. -->
-  <target name="init">
-    <tstamp/>
-    <delete>
-      <fileset dir="${eclipse-home}" includes="org*.xml"/>
-    </delete>
-  </target>
-
-  <!-- This target defines the tests that need to be run. -->
-  <target name="suite">
-    <property name="jdt-folder" 
-              value="${eclipse-home}/jdt_folder"/>
-    <delete dir="${jdt-folder}" quiet="true"/>
-    <ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
-      <property name="data-dir" value="${jdt-folder}"/>
-      <property name="plugin-name" value="${plugin-name}"/>
-      <property name="classname" 
-                value="org.eclipse.ant.tests.core.AutomatedSuite"/>
-    </ant>
-  </target>
-
-  <!-- This target holds code to cleanup the testing environment after -->
-  <!-- after all of the tests have been run. You can use this target to -->
-  <!-- delete temporary files that have been created. -->
-  <target name="cleanup">
-  </target>
-
-  <!-- This target runs the test suite. Any actions that need to happen -->
-  <!-- after all the tests have been run should go here. -->
-  <target name="run" depends="init,suite,cleanup">
-    <ant target="collect" antfile="${library-file}" dir="${eclipse-home}">
-      <property name="includes" value="org*.xml"/>
-      <property name="output-file" value="${plugin-name}.xml"/>
-    </ant>
-  </target>
-
-</project>
diff --git a/ant/org.eclipse.ant.tests.core/testbuildfiles/Bug32551.xml b/ant/org.eclipse.ant.tests.core/testbuildfiles/Bug32551.xml
deleted file mode 100644
index e543997..0000000
--- a/ant/org.eclipse.ant.tests.core/testbuildfiles/Bug32551.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<project name="bug" default="all">
- <path id="myclasspath">
- 	<fileset dir="..\lib">
-  		<include name="antTestsSupport.jar" /> 
-  	</fileset>
-  </path>
-  
- <taskdef name="hello" classname="org.eclipse.ant.tests.core.support.tasks.AntTestTask">
-  	<classpath refid="myclasspath" /> 
-  </taskdef>
-  
- <target name="all">
-  	<hello /> 
-  </target>
-  </project>
\ No newline at end of file
diff --git a/ant/org.eclipse.ant.tests.core/testbuildfiles/Bug34663.xml b/ant/org.eclipse.ant.tests.core/testbuildfiles/Bug34663.xml
deleted file mode 100644
index 4ba03f1..0000000
--- a/ant/org.eclipse.ant.tests.core/testbuildfiles/Bug34663.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<project name="34663.xml" default="echoP">
-
-<taskdef file="${ROOTDIR}/taskdefs.properties" />
- 
- <target name="echoP">
- 	<echoProperties/>
- </target>
-</project>
\ No newline at end of file
diff --git a/ant/org.eclipse.ant.tests.core/testbuildfiles/ClasspathOrdering.xml b/ant/org.eclipse.ant.tests.core/testbuildfiles/ClasspathOrdering.xml
deleted file mode 100644
index c99b65e..0000000
--- a/ant/org.eclipse.ant.tests.core/testbuildfiles/ClasspathOrdering.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<project name="ClasspathOrdering" default="ordered" basedir="..">
-
-	<target name="ordered">
-		<java classname= "ClasspathOrdering"/>
-	</target>
-</project>
diff --git a/ant/org.eclipse.ant.tests.core/testbuildfiles/CustomTask.xml b/ant/org.eclipse.ant.tests.core/testbuildfiles/CustomTask.xml
deleted file mode 100644
index c9dc442..0000000
--- a/ant/org.eclipse.ant.tests.core/testbuildfiles/CustomTask.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<project name="Custom Task" default="Custom Task" basedir=".">
-	<target name="init">
-		<tstamp/>
-	</target>
-
-	<target name="Custom Task" description= "Test adding a custom task" depends="init">
-		<AntTestTask/>
-	</target>
-</project>
diff --git a/ant/org.eclipse.ant.tests.core/testbuildfiles/CustomType.xml b/ant/org.eclipse.ant.tests.core/testbuildfiles/CustomType.xml
deleted file mode 100644
index 1ae1ef5..0000000
--- a/ant/org.eclipse.ant.tests.core/testbuildfiles/CustomType.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<project name="Custom Type" default="Custom Type" basedir=".">
-
-	<anttestpath id="compile.classpath">
-      <fileset dir="lib">
-        <include name="**/*.jar"/>
-      </fileset>
-    </anttestpath>
-    
-	<target name="init">
-		<tstamp/>
-	</target>
-
-	<target name="Custom Type" description= "Test adding a custom type" depends="init">
-		<echo message="Test adding a custom type"/>
-	</target>
-</project>
diff --git a/ant/org.eclipse.ant.tests.core/testbuildfiles/NoDefault.xml b/ant/org.eclipse.ant.tests.core/testbuildfiles/NoDefault.xml
deleted file mode 100644
index 305d7e9..0000000
--- a/ant/org.eclipse.ant.tests.core/testbuildfiles/NoDefault.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<project name= "Testing" default="build">
-
-	<target name= "test">
-		<echo message="testing"/>
-	</target>
-</project>
\ No newline at end of file
diff --git a/ant/org.eclipse.ant.tests.core/testbuildfiles/TestForEcho.xml b/ant/org.eclipse.ant.tests.core/testbuildfiles/TestForEcho.xml
deleted file mode 100644
index 2213e5e..0000000
--- a/ant/org.eclipse.ant.tests.core/testbuildfiles/TestForEcho.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<project name="Echo Test" default="Test for Echo" basedir=".">
-	<target name="init">
-		<tstamp/>
-	</target>
-
-	<target name="Test for Echo" description= "Calls other echos" depends="init">
-		<ant antfile="buildfiles/echoing.xml" dir="../../AntTests" target="echo1"/>
-		<ant antfile="buildfiles/echoing.xml" dir="../../AntTests" target="echo2"/>
-		<ant antfile="buildfiles/echoing.xml" dir="../../AntTests" target="echo3"/>
-	</target>
-</project>
diff --git a/ant/org.eclipse.ant.tests.core/testbuildfiles/build.xml b/ant/org.eclipse.ant.tests.core/testbuildfiles/build.xml
deleted file mode 100644
index 7638a53..0000000
--- a/ant/org.eclipse.ant.tests.core/testbuildfiles/build.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<project name="Eching" default="echo1" basedir="..">
-
-	<target name="echo1">
-		<echo message="echo1"/>
-	</target>
-	
-	<target name="echo2">
-		<echo message="echo2"/>
-	</target>
-	
-	<target name="echo3" description= "An echo3!">
-		<echo message="echo3"/>
-	</target>
-</project>
diff --git a/ant/org.eclipse.ant.tests.core/testbuildfiles/echoing.xml b/ant/org.eclipse.ant.tests.core/testbuildfiles/echoing.xml
deleted file mode 100644
index 7638a53..0000000
--- a/ant/org.eclipse.ant.tests.core/testbuildfiles/echoing.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<project name="Eching" default="echo1" basedir="..">
-
-	<target name="echo1">
-		<echo message="echo1"/>
-	</target>
-	
-	<target name="echo2">
-		<echo message="echo2"/>
-	</target>
-	
-	<target name="echo3" description= "An echo3!">
-		<echo message="echo3"/>
-	</target>
-</project>
diff --git a/ant/org.eclipse.ant.tests.core/testbuildfiles/input.xml b/ant/org.eclipse.ant.tests.core/testbuildfiles/input.xml
deleted file mode 100644
index 8d70ab5..0000000
--- a/ant/org.eclipse.ant.tests.core/testbuildfiles/input.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<project name="input testing" default= "input test">
-	<target name="input test">
-		<input message="Enter for echo" addproperty= "inputTest">
-		</input>
-		<echo message="${inputTest}"/>
-	</target>	
-</project>
\ No newline at end of file
diff --git a/ant/org.eclipse.ant.tests.core/testbuildfiles/javac.xml b/ant/org.eclipse.ant.tests.core/testbuildfiles/javac.xml
deleted file mode 100644
index 42f0225..0000000
--- a/ant/org.eclipse.ant.tests.core/testbuildfiles/javac.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="org.eclipse.ant.core" default="build" basedir="..">
-
-	
-	<target name="init" depends="properties">
-		<property name="plugin" value="AntTests"/>
-		<property name="temp.folder" value="${basedir}/temp.folder"/>
-		<property name="plugin.destination" value="${basedir}"/>
-		<property name="build.result.folder" value="${basedir}"/>
-	</target>
-	
-	<target name="properties" if="use.eclipse.JDTCompiler">
-		<property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter"/>
-	</target>
-	
-	<target name="build" depends="init">
-		<property name="destdir" value="${temp.folder}/javac.bin"/>
-		<delete dir="${temp.folder}/javac.bin"/>
-		<mkdir dir="${temp.folder}/javac.bin"/>
-		<!-- compile the source code -->
-		<javac destdir="${temp.folder}/javac.bin" failonerror="false" verbose="false" debug="on" includeAntRuntime="yes">
-			<src path="resources"/>
-		</javac>
-	</target>
-	
-	<target name="clean" depends="init">
-		<delete dir="${temp.folder}"/>
-	</target>
-
-	<target name="refresh" depends="init" if="eclipse.running">
-		<eclipse.refreshLocal resource="${plugin}" depth="infinite"/>
-	</target>
-</project>
diff --git a/ant/org.eclipse.ant.tests.core/testlib/classpathOrdering1.jar b/ant/org.eclipse.ant.tests.core/testlib/classpathOrdering1.jar
deleted file mode 100644
index b10cb7f..0000000
--- a/ant/org.eclipse.ant.tests.core/testlib/classpathOrdering1.jar
+++ /dev/null
Binary files differ
diff --git a/ant/org.eclipse.ant.tests.core/testlib/classpathOrdering2.jar b/ant/org.eclipse.ant.tests.core/testlib/classpathOrdering2.jar
deleted file mode 100644
index 6816741..0000000
--- a/ant/org.eclipse.ant.tests.core/testlib/classpathOrdering2.jar
+++ /dev/null
Binary files differ
diff --git a/ant/org.eclipse.ant.tests.core/testlib/taskFolder/org/eclipse/ant/tests/core/support/tasks/AntTestTask2.class b/ant/org.eclipse.ant.tests.core/testlib/taskFolder/org/eclipse/ant/tests/core/support/tasks/AntTestTask2.class
deleted file mode 100644
index 6a37eb5..0000000
--- a/ant/org.eclipse.ant.tests.core/testlib/taskFolder/org/eclipse/ant/tests/core/support/tasks/AntTestTask2.class
+++ /dev/null
Binary files differ
diff --git a/ant/org.eclipse.ant.tests.core/testresources/AntTestTask.java b/ant/org.eclipse.ant.tests.core/testresources/AntTestTask.java
deleted file mode 100644
index bc4f602..0000000
--- a/ant/org.eclipse.ant.tests.core/testresources/AntTestTask.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-
-
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Task;
-import org.apache.tools.ant.taskdefs.Echo;
-
-
-public class AntTestTask extends Task {
-	
-	public AntTestTask() {
-		super();
-	}
-	
-	/**
-	 * @see org.apache.tools.ant.Task#execute()
-	 */
-	public void execute() throws BuildException {
-		Echo echo= new Echo();
-		echo.setProject(getProject());
-		echo.setMessage("Testing Ant in Eclipse with a custom task");
-		echo.execute();
-	}
-}
diff --git a/ant/org.eclipse.ant.tests.core/testresources/taskdefs.properties b/ant/org.eclipse.ant.tests.core/testresources/taskdefs.properties
deleted file mode 100644
index 52049ff..0000000
--- a/ant/org.eclipse.ant.tests.core/testresources/taskdefs.properties
+++ /dev/null
@@ -1 +0,0 @@
-echoProperties=org.apache.tools.ant.taskdefs.optional.EchoProperties
\ No newline at end of file
diff --git a/ant/org.eclipse.ant.tests.core/testresources/test.properties b/ant/org.eclipse.ant.tests.core/testresources/test.properties
deleted file mode 100644
index 7eacd3a..0000000
--- a/ant/org.eclipse.ant.tests.core/testresources/test.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2003 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Common Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/cpl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-AntTests=testing from properties file
-eclipse.is.cool=Yep
diff --git a/ant/org.eclipse.ant.tests.core/tests/org/eclipse/ant/tests/core/AbstractAntTest.java b/ant/org.eclipse.ant.tests.core/tests/org/eclipse/ant/tests/core/AbstractAntTest.java
deleted file mode 100644
index 8531967..0000000
--- a/ant/org.eclipse.ant.tests.core/tests/org/eclipse/ant/tests/core/AbstractAntTest.java
+++ /dev/null
@@ -1,213 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.tests.core;
-
-
-import java.net.URL;
-import java.util.List;
-
-import junit.framework.TestCase;
-
-import org.eclipse.ant.core.*;
-import org.eclipse.ant.tests.core.testplugin.AntFileRunner;
-import org.eclipse.ant.tests.core.testplugin.AntTestChecker;
-import org.eclipse.core.resources.*;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-
-
- 
-/**
- * Tests for Ant core
- */
-public abstract class AbstractAntTest extends TestCase {
-	
-	protected static final String BUILD_SUCCESSFUL= "BUILD SUCCESSFUL";
-	public static final String ANT_TEST_BUILD_LOGGER = "org.eclipse.ant.tests.core.support.testloggers.TestBuildLogger"; //$NON-NLS-1$
-	public static final String ANT_TEST_BUILD_LISTENER= "org.eclipse.ant.tests.core.support.testloggers.TestBuildListener";
-	
-	/**
-	 * Returns the 'AntTests' project.
-	 * 
-	 * @return the test project
-	 */
-	protected IProject getProject() {
-		return ResourcesPlugin.getWorkspace().getRoot().getProject("AntTests");
-	}
-	
-	public static IProject project;
-	
-	
-	public AbstractAntTest(String name) {
-		super(name);
-	}
-	
-	protected IFile getBuildFile(String buildFileName) {
-		IFile file = getProject().getFolder("buildfiles").getFile(buildFileName);
-		assertTrue("Could not find script file named: " + buildFileName, file.exists());
-		return file;
-	}
-	
-	protected IFolder getWorkingDirectory(String workingDirectoryName) {
-		IFolder folder = getProject().getFolder(workingDirectoryName);
-		assertTrue("Could not find the working directory named: " + workingDirectoryName, folder.exists());
-		return folder;
-	}
-	
-	protected IFile checkFileExists(String fileName) throws CoreException {
-		getProject().refreshLocal(IProject.DEPTH_INFINITE, null);
-		IFile file = getProject().getFolder("buildfiles").getFile(fileName);
-		assertTrue("Could not find file named: " + fileName, file.exists());
-		return file;
-	}
-	
-	public void run(String buildFileName) throws CoreException {
-		run(buildFileName, null, true);
-	}
-	
-	public void run(String buildFileName, String[] args) throws CoreException {
-		run(buildFileName, args, true);
-	}
-	
-	public void run(String buildFileName, String[] args, boolean retrieveTargets) throws CoreException {
-		run(buildFileName, args, retrieveTargets, "");
-	}
-	
-	public void run(String buildFileName, String[] args, boolean retrieveTargets, String workingDir) throws CoreException {
-		AntTestChecker.reset();
-		IFile buildFile= null;
-		if (buildFileName != null) {
-			buildFile= getBuildFile(buildFileName);
-		}
-		AntFileRunner runner= new AntFileRunner();
-		String[] targets= null;
-		if (retrieveTargets) {
-			targets= getTargetNames(buildFileName);
-		}
-		if (workingDir.length() > 0) {
-			workingDir= getWorkingDirectory(workingDir).getLocation().toFile().getAbsolutePath();
-		} 
-		runner.run(buildFile, targets, args, workingDir, true);
-		assertTrue("Build starts did not equal build finishes", AntTestChecker.getDefault().getBuildsStartedCount() == AntTestChecker.getDefault().getBuildsFinishedCount());
-	}
-	
-	protected TargetInfo[] getTargets(String buildFileName) throws CoreException {
-		IFile buildFile= getBuildFile(buildFileName);
-		
-		AntRunner runner = new AntRunner();
-		runner.setBuildFileLocation(buildFile.getLocation().toFile().getAbsolutePath());
-	 	return runner.getAvailableTargets();
-	}
-	
-	protected String[] getTargetNames(String buildFileName) throws CoreException {
-		TargetInfo[] infos= getTargets(buildFileName);
-		String[] names= new String[infos.length];
-		for (int i = 0; i < infos.length; i++) {
-			TargetInfo info = infos[i];
-			names[i]= info.getName();
-		}
-		return names;
-	}
-	
-	protected String[] getTargetDescriptions(String buildFileName) throws CoreException {
-		TargetInfo[] infos= getTargets(buildFileName);
-		String[] descriptions= new String[infos.length];
-		for (int i = 0; i < infos.length; i++) {
-			TargetInfo info = infos[i];
-			descriptions[i]= info.getDescription();
-		}
-		return descriptions;
-	}
-	
-	/**
-	 * Returns the name of the project containing the given target in the given build file or
-	 * <code>null</code> if no project name can be found.
-	 */
-	protected String getProjectName(String buildFileName, String targetName) throws CoreException {
-		TargetInfo info= getTarget(buildFileName, targetName);
-		if (info != null) {
-			return info.getProject().getName();
-		}
-		return null;
-	}
-	
-	/**
-	 * Returns the dependencies of the target with the given name in the given build file or <code>null</code>
-	 * if no such target can be found.
-	 */
-	protected String[] getDependencies(String buildFileName, String targetName) throws CoreException {
-		TargetInfo info= getTarget(buildFileName, targetName);
-		if (info != null) {
-			return info.getDependencies();
-		}
-		return null;
-	}
-	
-	/**
-	 * Returns the target with the given name in the given build file or <code>null</code>
-	 * if no such target can be found.
-	 */
-	protected TargetInfo getTarget(String buildFileName, String targetName) throws CoreException {
-		TargetInfo[] infos= getTargets(buildFileName);
-		for (int i= 0, numTargets= infos.length; i < numTargets; i++) {
-			if (infos[i].getName().equals(targetName)) {
-				return infos[i];
-			}
-		}
-		return null;
-	}
-    
-    /**
-     * Return the log message n from the last:
-     * e.g. getLoggedMessage(0) returns the most recent message
-     * 
-     * @param n message index
-     * @return the nth last message
-     */
-    protected String getLoggedMessage(int n) {
-        return AntTestChecker.getDefault().getLoggedMessage(n);
-    }
-	
-	protected String getLastMessageLogged() {
-		return getLoggedMessage(0);
-	}
-	
-	protected void assertSuccessful() {
-		List messages= AntTestChecker.getDefault().getMessages();
-		String success= (String)messages.get(messages.size() - 1);
-		assertTrue("Build was not flagged as successful: " + success, BUILD_SUCCESSFUL.equals(success));
-	}
-	
-	protected String getPropertyFileName() {
-		return getProject().getFolder("resources").getFile("test.properties").getLocation().toFile().getAbsolutePath();
-	}
-	
-	protected void restorePreferenceDefaults() {
-		AntCorePreferences prefs= AntCorePlugin.getPlugin().getPreferences();
-		prefs.setCustomURLs(prefs.getDefaultAntURLs());
-		prefs.setCustomTasks(new Task[]{});
-		prefs.setCustomTypes(new Type[]{});
-		prefs.setCustomPropertyFiles(new String[]{});
-		prefs.setCustomProperties(new Property[]{});
-		prefs.setAntHome("");
-	}
-	
-	protected String getAntHome() {
-		AntCorePreferences prefs= AntCorePlugin.getPlugin().getPreferences();
-		URL[] urls= prefs.getDefaultAntURLs();
-		URL antjar= urls[0];
-		IPath antHomePath= new Path(antjar.getFile());
-		antHomePath= antHomePath.removeLastSegments(1);
-		return antHomePath.toFile().getAbsolutePath();
-	}
-}
-
diff --git a/ant/org.eclipse.ant.tests.core/tests/org/eclipse/ant/tests/core/AutomatedSuite.java b/ant/org.eclipse.ant.tests.core/tests/org/eclipse/ant/tests/core/AutomatedSuite.java
deleted file mode 100644
index 379baba..0000000
--- a/ant/org.eclipse.ant.tests.core/tests/org/eclipse/ant/tests/core/AutomatedSuite.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.tests.core;
-
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.ant.tests.core.tests.*;
-
-/**
- * Test all areas of Ant.
- * 
- * To run this test suite:
- * <ol>
- * <li>Create a new JUnit plugin test launch configuration</li>
- * <li>Set the Test class to "org.eclipse.ant.tests.core.AutomatedSuite"</li>
- * <li>Set the Project to "org.eclipse.ant.tests.core"</li>
- * <li>Run the launch configuration. Output from the tests will be displayed in a JUnit view</li>
- * </ol>
- */
-public class AutomatedSuite extends TestSuite {
-	
-	/**
-	 * Flag that indicates test are in progress
-	 */
-	protected boolean testing = true;
-
-	/**
-	 * Returns the suite.  This is required to
-	 * use the JUnit Launcher.
-	 */
-	public static Test suite() {
-		return new AutomatedSuite();
-	}
-
-	/**
-	 * Construct the test suite.
-	 */
-	public AutomatedSuite() {
-		addTest(new TestSuite(ProjectCreationDecorator.class));
-		addTest(new TestSuite(FrameworkTests.class));
-		addTest(new TestSuite(TargetTests.class));
-		addTest(new TestSuite(ProjectTests.class));
-		addTest(new TestSuite(OptionTests.class));
-		addTest(new TestSuite(TaskTests.class));
-		addTest(new TestSuite(TypeTests.class));
-	}
-
-	/**
-	 * Runs the tests and collects their result in a TestResult without blocking.
-	 * the UI thread. Not normally needed but nice to have to check on the state of
-	 * environment during a test run.
-	 */
-//	public void run(final TestResult result) {
-//		final Display display = Display.getCurrent();
-//		Thread thread = null;
-//		try {
-//			Runnable r = new Runnable() {
-//				public void run() {
-//					for (Enumeration e= tests(); e.hasMoreElements(); ) {
-//				  		if (result.shouldStop() )
-//				  			break;
-//						Test test= (Test)e.nextElement();
-//						runTest(test, result);
-//					}					
-//					testing = false;
-//					display.wake();
-//				}
-//			};
-//			thread = new Thread(r);
-//			thread.start();
-//		} catch (Exception e) {
-//			e.printStackTrace();
-//		}
-//				
-//		while (testing) {
-//			try {
-//				if (!display.readAndDispatch())
-//					display.sleep();
-//			} catch (Throwable e) {
-//				e.printStackTrace();
-//			}			
-//		}		
-//	}
-}
-
diff --git a/ant/org.eclipse.ant.tests.core/tests/org/eclipse/ant/tests/core/ProjectCreationDecorator.java b/ant/org.eclipse.ant.tests.core/tests/org/eclipse/ant/tests/core/ProjectCreationDecorator.java
deleted file mode 100644
index 535089f..0000000
--- a/ant/org.eclipse.ant.tests.core/tests/org/eclipse/ant/tests/core/ProjectCreationDecorator.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.tests.core;
-
-
-import java.io.File;
-
-import org.eclipse.ant.tests.core.testplugin.AntTestPlugin;
-import org.eclipse.ant.tests.core.testplugin.ProjectHelper;
-import org.eclipse.core.resources.*;
-
-/**
- * Test to close the workbench, since debug tests do not run in the UI
- * thread.
- */
-public class ProjectCreationDecorator extends AbstractAntTest {
-	
-	public ProjectCreationDecorator(String name) {
-		super(name);
-	}
-	
-	public void testProjectCreation() throws Exception {
-		// delete any pre-existing project
-		IProject pro = ResourcesPlugin.getWorkspace().getRoot().getProject("AntTests");
-		if (pro.exists()) {
-			pro.delete(true, true, null);
-		}
-		// create project and import buildfiles and support files
-		project = ProjectHelper.createProject("AntTests", "bin");
-		IFolder folder = ProjectHelper.addFolder(project, "buildfiles");
-		File root = AntTestPlugin.getDefault().getFileInPlugin(ProjectHelper.TEST_BUILDFILES_DIR);
-		ProjectHelper.importFilesFromDirectory(root, folder.getFullPath(), null);
-		
-		folder = ProjectHelper.addFolder(project, "resources");
-		root = AntTestPlugin.getDefault().getFileInPlugin(ProjectHelper.TEST_RESOURCES_DIR);
-		ProjectHelper.importFilesFromDirectory(root, folder.getFullPath(), null);
-		
-		folder = ProjectHelper.addFolder(project, "lib");
-		root = AntTestPlugin.getDefault().getFileInPlugin(ProjectHelper.TEST_LIB_DIR);
-		ProjectHelper.importFilesFromDirectory(root, folder.getFullPath(), null);
-	}
-}
diff --git a/ant/org.eclipse.ant.tests.core/tests/org/eclipse/ant/tests/core/tests/FrameworkTests.java b/ant/org.eclipse.ant.tests.core/tests/org/eclipse/ant/tests/core/tests/FrameworkTests.java
deleted file mode 100644
index 1f5df28..0000000
--- a/ant/org.eclipse.ant.tests.core/tests/org/eclipse/ant/tests/core/tests/FrameworkTests.java
+++ /dev/null
@@ -1,170 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.tests.core.tests;
-
-
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import org.eclipse.ant.core.AntCorePlugin;
-import org.eclipse.ant.core.AntCorePreferences;
-import org.eclipse.ant.core.Property;
-import org.eclipse.ant.tests.core.AbstractAntTest;
-import org.eclipse.ant.tests.core.testplugin.AntTestChecker;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
-
-public class FrameworkTests extends AbstractAntTest {
-	
-	public FrameworkTests(String name) {
-		super(name);
-	}
-	
-	public void testClasspathOrdering() throws MalformedURLException, CoreException {
-		AntCorePreferences prefs =AntCorePlugin.getPlugin().getPreferences();
-		
-		String path= getProject().getFolder("lib").getFile("classpathOrdering1.jar").getLocation().toFile().getAbsolutePath();
-		URL url= new URL("file:" + path);
-		
-		path= getProject().getFolder("lib").getFile("classpathOrdering2.jar").getLocation().toFile().getAbsolutePath();
-		URL url2= new URL("file:" + path);
-		
-		URL urls[] = prefs.getCustomURLs();
-		URL newUrls[] = new URL[urls.length + 2];
-		System.arraycopy(urls, 0, newUrls, 0, urls.length);
-		newUrls[urls.length] = url;
-		newUrls[urls.length + 1] = url2;
-		prefs.setCustomURLs(newUrls);
-		
-		prefs.updatePluginPreferences();
-		
-		run("ClasspathOrdering.xml");
-		String msg= (String)AntTestChecker.getDefault().getMessages().get(1);
-		assertTrue("Message incorrect: " + msg, msg.equals("classpathOrdering1"));
-		assertSuccessful();
-		
-		restorePreferenceDefaults();
-		
-		urls = prefs.getCustomURLs();
-		newUrls = new URL[urls.length + 2];
-		System.arraycopy(urls, 0, newUrls, 0, urls.length);
-		newUrls[urls.length] = url2;
-		newUrls[urls.length + 1] = url;
-		prefs.setCustomURLs(newUrls);
-		
-		prefs.updatePluginPreferences();
-		
-		run("ClasspathOrdering.xml");
-		msg= (String)AntTestChecker.getDefault().getMessages().get(1);
-		assertTrue("Message incorrect: " + msg, msg.equals("classpathOrdering2"));
-		assertSuccessful();
-	}
-	
-	public void testNoDefaultTarget() {
-		try {
-			run("NoDefault.xml", new String[]{"test"}, false);
-		} catch (CoreException e) {
-			String msg= e.getMessage();
-			assertTrue("Message incorrect: " + msg, msg.equals("Default target 'build' does not exist in this project"));
-			return;
-		}
-		assertTrue("Build files with no default targets should not be accepted", false);
-	}
-	
-	/**
-	 * Ensures that tasks like javac work when includeAntRuntime is specified
-	 * bug 20857.
-	 * This test will just return if the tests are conducted on a JRE (no tools.jar).
-	 */
-	public void testIncludeAntRuntime() throws CoreException {
-		URL toolsURL= AntCorePlugin.getPlugin().getPreferences().getToolsJarURL();
-		if (toolsURL == null) {
-			//running on a JRE where tools.jar could not be found
-			return;
-		}
-		run("javac.xml", new String[]{"build","refresh"}, false); //standard compiler
-		assertSuccessful();
-		IFile classFile= getProject().getFolder("temp.folder").getFolder("javac.bin").getFile("AntTestTask.class");
-		assertTrue("Class file was not generated", classFile.exists());
-		run("javac.xml", new String[]{"-Duse.eclipse.compiler=true", "clean", "build", "refresh"}, false); //JDTCompiler
-		assertSuccessful();
-		classFile= getProject().getFolder("temp.folder").getFolder("javac.bin").getFile("AntTestTask.class");
-		assertTrue("Class file was not generated", classFile.exists());
-	}
-	
-	/**
-	 * Tests the properties added using a global property file
-	 */
-	public void testGlobalPropertyFile() throws CoreException {
-		
-		AntCorePreferences prefs =AntCorePlugin.getPlugin().getPreferences();
-		
-		String path= getPropertyFileName();
-		prefs.setCustomPropertyFiles(new String[]{path});
-		
-		run("TestForEcho.xml", new String[]{});
-		assertSuccessful();
-		assertTrue("eclipse.is.cool should have been set as Yep", "Yep".equals(AntTestChecker.getDefault().getUserProperty("eclipse.is.cool")));
-		assertTrue("AntTests should have a value of testing", "testing from properties file".equals(AntTestChecker.getDefault().getUserProperty("AntTests")));
-		assertNull("my.name was not set and should be null", AntTestChecker.getDefault().getUserProperty("my.name"));
-		
-		restorePreferenceDefaults();
-	}
-	
-	/**
-	 * Tests the properties added using a global property
-	 */
-	public void testGlobalProperty() throws CoreException {
-		
-		AntCorePreferences prefs =AntCorePlugin.getPlugin().getPreferences();
-		prefs.setCustomProperties(new Property[]{new Property("eclipse.is.cool", "Yep"), new Property("JUnitTest", "true")});
-		
-		run("TestForEcho.xml", new String[]{});
-		assertSuccessful();
-		assertTrue("eclipse.is.cool should have been set as Yep", "Yep".equals(AntTestChecker.getDefault().getUserProperty("eclipse.is.cool")));
-		assertTrue("JUnitTests should have a value of true", "true".equals(AntTestChecker.getDefault().getUserProperty("JUnitTest")));
-		assertNull("my.name was not set and should be null", AntTestChecker.getDefault().getUserProperty("my.name"));
-		
-		restorePreferenceDefaults();
-	}
-	
-	public void testGlobalPropertyFileWithMinusDTakingPrecedence() throws CoreException {
-		AntCorePreferences prefs =AntCorePlugin.getPlugin().getPreferences();
-		
-		String path= getPropertyFileName();
-		prefs.setCustomPropertyFiles(new String[]{path});
-		
-		run("echoing.xml", new String[]{"-DAntTests=testing", "-Declipse.is.cool=true"}, false);
-		assertSuccessful();
-		assertTrue("eclipse.is.cool should have been set as true", "true".equals(AntTestChecker.getDefault().getUserProperty("eclipse.is.cool")));
-		assertTrue("AntTests should have a value of testing", "testing".equals(AntTestChecker.getDefault().getUserProperty("AntTests")));
-		assertNull("my.name was not set and should be null", AntTestChecker.getDefault().getUserProperty("my.name"));
-		restorePreferenceDefaults();
-	}
-	
-	/**
-	 * Tests setting ANT_HOME
-	 */
-	public void testSettingAntHome() throws CoreException {
-		try {
-			AntCorePlugin.getPlugin().getPreferences().setAntHome(getAntHome());
-			run("echoing.xml");
-			assertTrue("ANT_HOME not set correctly", getAntHome().equals(System.getProperty("ant.home")));
-			AntCorePlugin.getPlugin().getPreferences().setAntHome("");
-			run("echoing.xml");
-			assertTrue("ANT_HOME not set correctly", null == System.getProperty("ant.home"));
-		} finally {
-			restorePreferenceDefaults();
-		}
-		
-		
-	}
-}
diff --git a/ant/org.eclipse.ant.tests.core/tests/org/eclipse/ant/tests/core/tests/OptionTests.java b/ant/org.eclipse.ant.tests.core/tests/org/eclipse/ant/tests/core/tests/OptionTests.java
deleted file mode 100644
index ce9e138..0000000
--- a/ant/org.eclipse.ant.tests.core/tests/org/eclipse/ant/tests/core/tests/OptionTests.java
+++ /dev/null
@@ -1,479 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.tests.core.tests;
-
-
-import java.io.BufferedInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.util.List;
-
-import org.eclipse.ant.core.AntCorePlugin;
-import org.eclipse.ant.tests.core.AbstractAntTest;
-import org.eclipse.ant.tests.core.testplugin.AntTestChecker;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
-
-public class OptionTests extends AbstractAntTest {
-	
-	protected static final String UNKNOWN_ARG= "Unknown argument: ";
-	protected static final String START_OF_HELP= "ant [options] [target [target2 [target3] ...]]";
-	protected static final String VERSION= "Apache Ant version 1.5.3 compiled on April 9 2003";
-	 
-	public OptionTests(String name) {
-		super(name);
-	}
-	
-	/**
-	 * Tests the "-help" option
-	 */
-	public void testHelp() throws CoreException {
-		run("TestForEcho.xml", new String[]{"-help"});
-		assertTrue("One message should have been logged", AntTestChecker.getDefault().getMessagesLoggedCount() == 1);
-		assertTrue("Help is incorrect", getLastMessageLogged() != null && getLastMessageLogged().startsWith(START_OF_HELP));
-	}
-	
-	/**
-	 * Tests the "-version" option
-	 */
-	public void testVersion() throws CoreException {
-		run("TestForEcho.xml", new String[]{"-version"});
-		assertTrue("One message should have been logged", AntTestChecker.getDefault().getMessagesLoggedCount() == 1);
-		assertTrue("Version is incorrect", VERSION.equals(getLastMessageLogged()));
-	}
-	
-	/**
-	 * Tests the "-projecthelp" option when it will not show (quite mode)
-	 */
-	public void testProjecthelp() throws CoreException {
-		run("TestForEcho.xml", new String[]{"-projecthelp"});
-		assertTrue("4 messages should have been logged; was " + AntTestChecker.getDefault().getMessagesLoggedCount(), AntTestChecker.getDefault().getMessagesLoggedCount() == 4);
-		assertTrue("Project help is incorrect", getLastMessageLogged().startsWith("Subtargets:"));
-	}
-	
-	/**
-	 * Tests the "-projecthelp" option when it will not show (quite mode)
-	 */
-	public void testProjecthelpQuiet() throws CoreException {
-		run("TestForEcho.xml", new String[]{"-projecthelp", "-q"});
-		assertTrue("no messages should have been logged; was " + AntTestChecker.getDefault().getMessagesLoggedCount(), AntTestChecker.getDefault().getMessagesLoggedCount() == 0);
-	}
-	
-	/**
-	 * Tests the "-listener" option with a listener that is not an instance of BuildListener
-	 */
-	public void testListenerBad() throws CoreException {
-		try {
-			run("TestForEcho.xml", new String[]{"-listener", "java.lang.String"});
-		} catch (CoreException ce) {
-			String msg= ce.getMessage();
-			assertTrue("Message incorrect!: " + msg, msg.equals("java.lang.String which was specified to be a build listener is not an instance of org.apache.tools.ant.BuildListener."));
-			return;
-		}
-		assertTrue("A core exception should have occurred wrappering a class cast exception", false);
-	}
-	
-	/**
-	 * Tests passing an unrecognized argument
-	 */
-	public void testUnknownArg() throws CoreException {	
-		run("TestForEcho.xml", new String[]{"-listenr"});
-        assertTrue("Unrecognized option message should have been logged before successful build",
-					(AntTestChecker.getDefault().getMessagesLoggedCount() == 6)
-					 && (getLoggedMessage(5).startsWith(UNKNOWN_ARG))
-                     && (getLastMessageLogged().startsWith(BUILD_SUCCESSFUL)));
-	}
-	
-	/**
-	 * Tests specifying the -logfile with no arg
-	 */
-	public void testLogFileWithNoArg() throws CoreException {
-		try {
-			run("TestForEcho.xml", new String[]{"-logfile"});
-		} catch (CoreException ce) {
-			return;
-		}
-		assertTrue("You must specify a log file when using the -log argument", false);
-	}
-	
-	/**
-	 * Tests specifying the -logfile
-	 */
-	public void testLogFile() throws CoreException, IOException {
-		run("TestForEcho.xml", new String[]{"-logfile", "TestLogFile.txt"});
-		IFile file= checkFileExists("TestLogFile.txt");
-		InputStream stream =file.getContents();
-		
-		InputStreamReader in= null;
-		try {		
-			in= new InputStreamReader(new BufferedInputStream(stream));
-			StringBuffer buffer= new StringBuffer();
-			char[] readBuffer= new char[2048];
-			int n= in.read(readBuffer);
-			while (n > 0) {
-				buffer.append(readBuffer, 0, n);
-				n= in.read(readBuffer);
-			}
-			assertTrue("File should have started with Buildfile", buffer.toString().startsWith("Buildfile"));
-		} finally {
-			in.close();
-			stream.close();
-		}
-		
-	}
-	
-	/**
-	 * Tests specifying the -logger with no arg
-	 */
-	public void testLoggerWithNoArg() throws CoreException {
-		try {
-			run("TestForEcho.xml", new String[]{"-logger"});
-		} catch (CoreException ce) {
-			return;
-		}
-		assertTrue("You must specify a classname when using the -logger argument", false);
-	}
-	
-	/**
-	 * Tests the "-logger" option with a logger that is not an instance of BuildLogger
-	 */
-	public void testLoggerBad() throws CoreException {
-		try {
-			run("TestForEcho.xml", new String[]{"-logger", "java.lang.String"});
-		} catch (CoreException ce) {
-			return;
-		}
-		assertTrue("A core exception should have occurred wrappering a class cast exception", false);
-	}
-	
-	/**
-	 * Tests the "-logger" option with two loggers specified...only one is allowed
-	 */
-	public void testTwoLoggers() throws CoreException {
-		try {
-			run("TestForEcho.xml", new String[]{"-logger", "java.lang.String", "-q", "-logger", "java.lang.String"});
-		} catch (CoreException ce) {
-			return;
-		}
-		assertTrue("As only one logger can be specified", false);
-	}
-	
-	/**
-	 * Tests specifying the -listener with no arg
-	 */
-	public void testListenerWithNoArg() throws CoreException {
-		try {
-			run("TestForEcho.xml", new String[]{"-listener"});
-		} catch (CoreException ce) {
-			return;
-		}
-		assertTrue("You must specify a listeners when using the -listener argument ", false);
-	}
-	
-	/**
-	 * Tests specifying the -listener with a class that will not be found
-	 */
-	public void testListenerClassNotFound() throws CoreException {
-		try {
-			run("TestForEcho.xml", new String[]{"-listener", "TestBuildListener"});
-		} catch (CoreException e) {
-			String message= e.getStatus().getException().getMessage();
-			assertTrue("Should be ClassNotFoundException", "java.lang.ClassNotFoundException: TestBuildListener".equals(message));
-			return;
-		}
-		assertTrue("A CoreException should have occurred as the listener class will not be found", false);
-		
-	}
-	/**
-	 * Tests specifying the -listener option
-	 */
-	public void testListener() throws CoreException {
-		run("TestForEcho.xml", new String[]{"-listener", ANT_TEST_BUILD_LISTENER});
-		assertSuccessful();
-		assertTrue("A listener should have been added named: " + ANT_TEST_BUILD_LISTENER, ANT_TEST_BUILD_LISTENER.equals(AntTestChecker.getDefault().getLastListener()));
-	}
-	
-	/**
-	 * Tests specifying the -listener option multiple times...which is allowed
-	 */
-	public void testListenerMultiple() throws CoreException {
-		run("TestForEcho.xml", new String[]{"-listener", ANT_TEST_BUILD_LISTENER, "-listener", ANT_TEST_BUILD_LISTENER});
-		assertSuccessful();
-		assertTrue("A listener should have been added named: " + ANT_TEST_BUILD_LISTENER, ANT_TEST_BUILD_LISTENER.equals(AntTestChecker.getDefault().getLastListener()));
-		assertTrue("Two listeners should have been added", AntTestChecker.getDefault().getListeners().size() == 2);
-	}
-	
-	/**
-	 * Tests specifying the -listener option multiple times, with one missing the arg
-	 */
-	public void testListenerMultipleWithBad() throws CoreException {
-		try {
-			run("TestForEcho.xml", new String[]{"-listener", ANT_TEST_BUILD_LISTENER, "-q", "-listener", "-verbose"});
-		} catch(CoreException e) {
-			//You must specify a listener for all -listener arguments
-			return;
-		}
-		assertTrue("You must specify a listener for all -listener arguments ", false);
-	}
-	
-	/**
-	 * Tests specifying the -buildfile with no arg
-	 */
-	public void testBuildFileWithNoArg() throws CoreException {
-		try {
-			run("TestForEcho.xml", new String[]{"-buildfile"});
-		} catch (CoreException ce) {
-			//You must specify a buildfile when using the -buildfile argument
-			return;
-		}
-		assertTrue("You must specify a buildfile when using the -buildfile argument", false);
-	}
-	
-	/**
-	 * Tests specifying the -buildfile
-	 */
-	public void testBuildFile() throws CoreException {
-		String buildFileName= getProject().getFolder("buildfiles").getFile("echoing.xml").getLocation().toFile().getAbsolutePath();
-		run("TestForEcho.xml", new String[]{"-buildfile", buildFileName}, false, "buildfiles");
-		
-		assertTrue("Should have been 1 tasks, was: " + AntTestChecker.getDefault().getTaskStartedCount(), AntTestChecker.getDefault().getTaskStartedCount() == 1);
-	}
-	
-	/**
-	 * Tests specifying a target at the command line that does not exist.
-	 */
-	public void testSpecifyBadTargetAsArg() throws CoreException {
-		try {
-			run("TestForEcho.xml", new String[]{"echo2"}, false);
-		} catch (CoreException ce) {
-			return;
-		}
-		assertTrue("A core exception should have occurred as the target does not exist", false);
-	}
-	
-	/**
-	 * Tests specifying a target at the command line
-	 */
-	public void testSpecifyTargetAsArg() throws CoreException {
-		run("echoing.xml", new String[]{"echo3"}, false);
-		assertTrue("3 messages should have been logged; was " + AntTestChecker.getDefault().getMessagesLoggedCount(), AntTestChecker.getDefault().getMessagesLoggedCount() == 3);
-		assertSuccessful();
-	}
-	
-	/**
-	 * Tests specifying a target at the command line with other options
-	 */
-	public void testSpecifyTargetAsArgWithOtherOptions() throws CoreException {
-		run("echoing.xml", new String[]{"-logfile", "TestLogFile.txt", "echo3"}, false);
-		assertTrue("4 messages should have been logged; was " + AntTestChecker.getDefault().getMessagesLoggedCount(), AntTestChecker.getDefault().getMessagesLoggedCount() == 4);
-		List messages= AntTestChecker.getDefault().getMessages();
-		//ensure that echo3 target executed and only that target
-		assertTrue("echo3 target not executed", messages.get(2).equals("echo3"));
-		assertSuccessful();
-	}
-	
-	/**
-	 * Tests specifying targets at the command line with other options
-	 */
-	public void testSpecifyTargetsAsArgWithOtherOptions() throws CoreException {
-		run("echoing.xml", new String[]{"-logfile", "TestLogFile.txt", "echo2", "echo3"}, false);
-		assertTrue("5 messages should have been logged; was " + AntTestChecker.getDefault().getMessagesLoggedCount(), AntTestChecker.getDefault().getMessagesLoggedCount() == 5);
-		List messages= AntTestChecker.getDefault().getMessages();
-		//ensure that echo2 target executed
-		assertTrue("echo2 target not executed", messages.get(2).equals("echo2"));
-		assertSuccessful();
-	}
-	
-	/**
-	 * Tests specifying a target at the command line and quiet reporting
-	 */
-	public void testSpecifyTargetAsArgAndQuiet() throws CoreException {
-		run("echoing.xml", new String[]{"-logfile", "TestLogFile.txt", "echo3", "-quiet"}, false);
-		assertTrue("2 messages should have been logged; was " + AntTestChecker.getDefault().getMessagesLoggedCount(), AntTestChecker.getDefault().getMessagesLoggedCount() == 2);
-	}
-	
-	/**
-	 * Tests properties using "-D"
-	 */
-	public void testMinusD() throws CoreException {
-		run("echoing.xml", new String[]{"-DAntTests=testing", "-Declipse.is.cool=true"}, false);
-		assertSuccessful();
-		assertTrue("eclipse.is.cool should have been set as true", "true".equals(AntTestChecker.getDefault().getUserProperty("eclipse.is.cool")));
-		assertTrue("AntTests should have a value of testing", "testing".equals(AntTestChecker.getDefault().getUserProperty("AntTests")));
-		assertNull("my.name was not set and should be null", AntTestChecker.getDefault().getUserProperty("my.name"));
-	}
-	
-	/**
-	 * Tests specifying a property such as "-D=emptyStringIsMyName
-	 * Bug 37007
-	 */
-	public void testMinusDEmpty() throws CoreException {
-		run("echoing.xml", new String[]{"-D=emptyStringIsMyName", "-Declipse.is.cool=true"}, false);
-		assertSuccessful();
-		assertTrue("eclipse.is.cool should have been set as true", "true".equals(AntTestChecker.getDefault().getUserProperty("eclipse.is.cool")));
-		assertTrue("\"\" should have a value of emptyStringIsMyName", "emptyStringIsMyName".equals(AntTestChecker.getDefault().getUserProperty("")));
-		assertNull("my.name was not set and should be null", AntTestChecker.getDefault().getUserProperty("my.name"));
-	}
-	
-	/**
-	 * Tests specifying properties that contain spaces
-	 * Bug 37094
-	 */
-	public void testMinusDWithSpaces() throws CoreException {
-		run("echoing.xml", new String[]{"-DAntTests= testing", "-Declipse.is.cool=    true"}, false);
-		assertSuccessful();
-		assertTrue("eclipse.is.cool should have been set as true", "true".equals(AntTestChecker.getDefault().getUserProperty("eclipse.is.cool")));
-		assertTrue("AntTests should have a value of testing", "testing".equals(AntTestChecker.getDefault().getUserProperty("AntTests")));
-		assertNull("my.name was not set and should be null", AntTestChecker.getDefault().getUserProperty("my.name"));
-	}
-	
-	public void testPropertyFileWithNoArg() throws CoreException {
-		try {
-			run("TestForEcho.xml", new String[]{"-propertyfile"});
-		} catch (CoreException ce) {
-			String msg= (String)AntTestChecker.getDefault().getMessages().get(0);
-			assertTrue("Message incorrect!: " + msg, msg.equals("You must specify a property filename when using the -propertyfile argument"));
-			return;
-		}
-		assertTrue("You must specify a property filename when using the -propertyfile argument", false);
-	}
-	
-	/**
-	 * A build should succeed when a property file is not found.
-	 * The error is reported and the build continues.
-	 */
-	public void testPropertyFileFileNotFound() throws CoreException {
-		
-		run("TestForEcho.xml", new String[]{"-propertyfile", "qq.txt"});
-		assertSuccessful();
-		String msg= (String)AntTestChecker.getDefault().getMessages().get(0);
-		assertTrue("Message incorrect!: " + msg, msg.startsWith("Could not load property file qq.txt:"));
-	}
-	
-	public void testPropertyFile() throws CoreException {
-		run("TestForEcho.xml", new String[]{"-propertyfile", getPropertyFileName()});
-		assertSuccessful();
-		assertTrue("eclipse.is.cool should have been set as Yep", "Yep".equals(AntTestChecker.getDefault().getUserProperty("eclipse.is.cool")));
-		assertTrue("AntTests should have a value of testing", "testing from properties file".equals(AntTestChecker.getDefault().getUserProperty("AntTests")));
-		assertNull("my.name was not set and should be null", AntTestChecker.getDefault().getUserProperty("my.name"));
-	}
-	
-	public void testPropertyFileWithMinusDTakingPrecedence() throws CoreException {
-		run("echoing.xml", new String[]{"-propertyfile", getPropertyFileName(), "-DAntTests=testing", "-Declipse.is.cool=true"}, false);
-		assertSuccessful();
-		assertTrue("eclipse.is.cool should have been set as true", "true".equals(AntTestChecker.getDefault().getUserProperty("eclipse.is.cool")));
-		assertTrue("AntTests should have a value of testing", "testing".equals(AntTestChecker.getDefault().getUserProperty("AntTests")));
-		assertNull("my.name was not set and should be null", AntTestChecker.getDefault().getUserProperty("my.name"));
-	}
-	
-	public void testInputHandlerWithNoArg() throws CoreException {
-		try {
-			run("TestForEcho.xml", new String[]{"-inputhandler"});
-		} catch (CoreException ce) {
-			String msg= ce.getMessage();
-			assertTrue("Message incorrect!: " + msg, msg.equals("You must specify a classname when using the -inputhandler argument"));
-			return;
-		}
-		assertTrue("You must specify a classname when using the -inputhandler argument", false);
-	}
-	
-	/**
-	 * Tests the "-inputhandler" option with two handlers specified...only one is allowed
-	 */
-	public void testInputHandlerMultiple() throws CoreException {
-		try {
-			run("TestForEcho.xml", new String[]{"-inputhandler", "org.apache.tools.ant.input.DefaultInputHandler", "-q", "-inputhandler", "org.apache.tools.ant.input.DefaultInputHandler"});
-		} catch (CoreException ce) {
-			String msg= ce.getMessage();
-			assertTrue("Message incorrect!: " + msg, msg.equals("Only one input handler class may be specified."));
-			return;
-		}
-		assertTrue("As only one input handler can be specified", false);
-	}
-	
-	/**
-	 * Tests the "-inputhandler" option with a input handler that is not an instance of InputHandler
-	 */
-	public void testInputHandlerBad() throws CoreException {
-		try {
-			run("TestForEcho.xml", new String[]{"-inputhandler", "java.lang.StringBuffer"});
-		} catch (CoreException ce) {
-			String msg= ce.getMessage();
-			assertTrue("Message incorrect!: " + msg, msg.equals("The specified input handler class java.lang.StringBuffer does not implement the org.apache.tools.ant.input.InputHandler interface"));
-			return;
-		}
-		assertTrue("Incorrect inputhandler", false);
-	}
-	
-	/**
-	 * Tests the "-inputhandler" option with a input handler that is not a defined class
-	 */
-	public void testInputHandlerBad2() throws CoreException {
-		try {
-			run("TestForEcho.xml", new String[]{"-inputhandler", "ja.lang.StringBuffer"});
-		} catch (CoreException ce) {
-			String msg= ce.getMessage();
-			assertTrue("Message incorrect!: " + msg, msg.startsWith("Unable to instantiate specified input handler class ja.lang.StringBuffer"));
-			return;
-		}
-		assertTrue("Incorrect inputhandler", false);
-	}
-	
-	/**
-	 * Tests the "-inputhandler" option with a test input handler
-	 */
-	public void testInputHandler() throws CoreException {
-		
-		run("input.xml", new String[]{"-inputhandler", "org.eclipse.ant.tests.core.support.inputHandlers.AntTestInputHandler"});
-		assertSuccessful();
-		String msg= (String)AntTestChecker.getDefault().getMessages().get(1);
-		assertTrue("Message incorrect: " + msg, msg.equals("testing handling input requests"));
-		
-	}
-	
-	/**
-	 * Tests the "-diagnostics" option with no ANT_HOME set
-	 * bug 25693
-	 */
-	public void testDiagnosticsWithNoAntHome() throws CoreException {
-		
-		run("input.xml", new String[]{"-diagnostics"});
-		String msg= (String)AntTestChecker.getDefault().getMessages().get(0);
-		assertTrue("Message incorrect: " + msg, msg.equals("------- Ant diagnostics report -------"));
-	}
-		
-	/**
-	 * Tests the "-diagnostics" option with ANT_HOME set
-	 * bug 25693
-	 */
-	public void testDiagnostics() throws CoreException {
-		AntCorePlugin.getPlugin().getPreferences().setAntHome(getAntHome());
-		try {
-			run("input.xml", new String[]{"-diagnostics"});
-		} finally {
-			restorePreferenceDefaults();
-		}
-		
-		String msg= (String)AntTestChecker.getDefault().getMessages().get(12);
-		//msg depends on whether self hosting testing or build testing
-		assertTrue("Message incorrect: " + msg, msg.endsWith("org.apache.ant") || msg.endsWith("org.apache.ant_1.5.3"));
-	}
-	
-	/**
-	 * Tests the "-quiet" still reports build successful
-	 * bug 34488
-	 */
-	public void testMinusQuiet() throws CoreException {
-		run("TestForEcho.xml", new String[]{"-quiet"});
-		assertSuccessful();	
-	}
-}
diff --git a/ant/org.eclipse.ant.tests.core/tests/org/eclipse/ant/tests/core/tests/ProjectTests.java b/ant/org.eclipse.ant.tests.core/tests/org/eclipse/ant/tests/core/tests/ProjectTests.java
deleted file mode 100644
index 1b25ce8..0000000
--- a/ant/org.eclipse.ant.tests.core/tests/org/eclipse/ant/tests/core/tests/ProjectTests.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.tests.core.tests;
-
-
-import org.eclipse.ant.tests.core.AbstractAntTest;
-import org.eclipse.ant.tests.core.testplugin.AntTestChecker;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
-
-
-public class ProjectTests extends AbstractAntTest {
-	
-	public ProjectTests(String name) {
-		super(name);
-	}
-	
-	/**
-	 * Tests that the three properties that should always be set are correct
-	 */
-	public void testBasePropertiesSet() throws CoreException {
-		String buildFileName="TestForEcho.xml"; 
-		run(buildFileName);
-		IFile buildFile= getBuildFile(buildFileName);
-		String fullName= buildFile.getLocation().toFile().getAbsolutePath();
-		assertTrue("eclipse.running should have been set as true", "true".equals(AntTestChecker.getDefault().getUserProperty("eclipse.running")));
-		assertTrue("ant.file should have been set as the build file name", fullName.equals(AntTestChecker.getDefault().getUserProperty("ant.file")));
-		assertNotNull("ant.version should have been set", AntTestChecker.getDefault().getUserProperty("ant.version"));
-	}
-}
-
diff --git a/ant/org.eclipse.ant.tests.core/tests/org/eclipse/ant/tests/core/tests/TargetTests.java b/ant/org.eclipse.ant.tests.core/tests/org/eclipse/ant/tests/core/tests/TargetTests.java
deleted file mode 100644
index 19de044..0000000
--- a/ant/org.eclipse.ant.tests.core/tests/org/eclipse/ant/tests/core/tests/TargetTests.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.tests.core.tests;
-
-
-import java.io.File;
-
-import org.eclipse.ant.core.TargetInfo;
-import org.eclipse.ant.tests.core.AbstractAntTest;
-import org.eclipse.ant.tests.core.testplugin.AntTestChecker;
-import org.eclipse.core.runtime.CoreException;
-
-
-public class TargetTests extends AbstractAntTest {
-	
-	public TargetTests(String name) {
-		super(name);
-	}
-	
-	/**
-	 * Ensures that a default target is found
-	 */
-	public void testDefaultTarget() throws CoreException {
-		TargetInfo[] targets= getTargets("TestForEcho.xml");
-		assertTrue("Should be two targets in TestForEcho.xml", targets.length == 2);
-		assertTrue("Test for Echo should be the default target", targets[1].isDefault());
-	}
-	
-	/**
-	 * Ensures that targets are found in a build file with data types
-	 */
-	public void testGetTargetsWithDataTypes() throws CoreException {
-		TargetInfo[] targets= getTargets("Bug32551.xml");
-		assertTrue("Should be one targets in Bug32551.xml", targets.length == 1);
-	}
-	
-	/**
-	 * Ensures that target names are retrieved properly
-	 */
-	public void testTargetNames() throws CoreException {
-		String[] targetNames= getTargetNames("TestForEcho.xml");
-		assertTrue("Should be two targets in TestForEcho.xml", targetNames.length == 2);
-		assertTrue("First name should be init", targetNames[0].equals("init"));
-		assertTrue("Second name should be Test for Echo", targetNames[1].equals("Test for Echo"));
-	}
-	
-	/**
-	 * Ensures that target descriptions are retrieved properly
-	 */
-	public void testTargetDescription() throws CoreException {
-		String[] targetDescriptions= getTargetDescriptions("TestForEcho.xml");
-		assertTrue("Should be two targets in TestForEcho.xml", targetDescriptions.length == 2);
-		assertNull("First description should be null", targetDescriptions[0]);
-		assertTrue("Second description should be Calls other targets", targetDescriptions[1].equals("Calls other echos"));
-	}
-	
-	/**
-	 * Ensures that target projects are retrieved properly
-	 */
-	public void testTargetProject() throws CoreException {
-		String targetProject= getProjectName("TestForEcho.xml", "Test for Echo");
-		assertTrue("Project name should be Echo Test", "Echo Test".equals(targetProject));
-	}
-	
-	/**
-	 * Ensures that target dependencies are retrieved properly
-	 */
-	public void testTargetDependencies() throws CoreException {
-		String[] dependencies= getDependencies("TestForEcho.xml", "Test for Echo");
-		assertNotNull("Dependencies should not be null", dependencies);
-		assertTrue("Should be one dependency in Test for Echo", dependencies.length == 1);
-		assertTrue("First dependency should be init", "init".equals(dependencies[0]));
-	}
-	
-	/**
-	 * Runs an Ant build and ensure that the build file location is logged
-	 */
-	public void testRunScript() throws CoreException {
-		run("TestForEcho.xml");
-		String message= (String)AntTestChecker.getDefault().getMessages().get(0);
-		assertTrue("Build file location should be logged as the first message", message != null && message.endsWith("AntTests" + File.separator + "buildfiles" + File.separator + "TestForEcho.xml"));
-		assertSuccessful();
-	}
-}
-
diff --git a/ant/org.eclipse.ant.tests.core/tests/org/eclipse/ant/tests/core/tests/TaskTests.java b/ant/org.eclipse.ant.tests.core/tests/org/eclipse/ant/tests/core/tests/TaskTests.java
deleted file mode 100644
index 9f370cd..0000000
--- a/ant/org.eclipse.ant.tests.core/tests/org/eclipse/ant/tests/core/tests/TaskTests.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.tests.core.tests;
-
-import java.io.File;
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import org.eclipse.ant.core.AntCorePlugin;
-import org.eclipse.ant.core.AntCorePreferences;
-import org.eclipse.ant.core.Property;
-import org.eclipse.ant.core.Task;
-import org.eclipse.ant.tests.core.AbstractAntTest;
-import org.eclipse.ant.tests.core.testplugin.AntTestChecker;
-import org.eclipse.core.runtime.CoreException;
-
-public class TaskTests extends AbstractAntTest {
-
-	
-	public TaskTests(String name) {
-		super(name);
-	}
-	
-	public void testAddTask() throws MalformedURLException, CoreException {
-		AntCorePreferences prefs =AntCorePlugin.getPlugin().getPreferences();
-		Task newTask= new Task();
-		String path= getProject().getFolder("lib").getFile("antTestsSupport.jar").getLocation().toFile().getAbsolutePath();
-		URL url= new URL("file:" + path);
-		URL urls[] = prefs.getCustomURLs();
-		URL newUrls[] = new URL[urls.length + 1];
-		System.arraycopy(urls, 0, newUrls, 0, urls.length);
-		newUrls[urls.length] = url;
-		prefs.setCustomURLs(newUrls);
-		
-		newTask.setLibrary(url);
-		newTask.setTaskName("AntTestTask");
-		newTask.setClassName("org.eclipse.ant.tests.core.support.tasks.AntTestTask");
-		prefs.setCustomTasks(new Task[]{newTask});
-		
-		prefs.updatePluginPreferences();
-		
-		run("CustomTask.xml");
-		String msg= (String)AntTestChecker.getDefault().getMessages().get(1);
-		assertTrue("Message incorrect: " + msg, msg.equals("Testing Ant in Eclipse with a custom task"));
-		assertSuccessful();
-	}
-	
-	public void testRemoveTask() throws CoreException {
-		AntCorePreferences prefs =AntCorePlugin.getPlugin().getPreferences();
-		prefs.setCustomTasks(new Task[]{});
-		try {
-			run("CustomTask.xml");
-		} catch (CoreException ce) {
-			assertTrue("Exception from undefined task is incorrect", ce.getMessage().endsWith("as this is not an Ant bug."));
-			return;
-		}
-		assertTrue("Build should have failed as task no longer defined", false);
-		restorePreferenceDefaults();
-	}
-	
-	public void testAddTaskFromFolder() throws MalformedURLException, CoreException {
-		try {
-			AntCorePreferences prefs =AntCorePlugin.getPlugin().getPreferences();
-			Task newTask= new Task();
-			String path= getProject().getFolder("lib").getFile("taskFolder").getLocation().toFile().getAbsolutePath();
-			URL url= new URL("file:" + path + File.separatorChar);
-			URL urls[] = prefs.getCustomURLs();
-			URL newUrls[] = new URL[urls.length + 1];
-			System.arraycopy(urls, 0, newUrls, 0, urls.length);
-			newUrls[urls.length] = url;
-			prefs.setCustomURLs(newUrls);
-		
-			newTask.setLibrary(url);
-			newTask.setTaskName("AntTestTask");
-			newTask.setClassName("org.eclipse.ant.tests.core.support.tasks.AntTestTask2");
-			prefs.setCustomTasks(new Task[]{newTask});
-		
-			prefs.updatePluginPreferences();
-		
-			run("CustomTask.xml");
-			String msg= (String)AntTestChecker.getDefault().getMessages().get(1);
-			assertTrue("Message incorrect: " + msg, msg.equals("Testing Ant in Eclipse with a custom task"));
-			assertSuccessful();
-		} finally {
-			restorePreferenceDefaults();
-		}
-	}
-		
-	public void testTasksDefinedInPropertyFile() throws CoreException {
-		try {
-			AntCorePreferences prefs =AntCorePlugin.getPlugin().getPreferences();
-			Property newProp= new Property("ROOTDIR", "..//resources");
-			prefs.setCustomProperties(new Property[]{newProp});
-			run("Bug34663.xml");
-		} finally {
-			restorePreferenceDefaults();
-		}
-	}
-}
diff --git a/ant/org.eclipse.ant.tests.core/tests/org/eclipse/ant/tests/core/tests/TypeTests.java b/ant/org.eclipse.ant.tests.core/tests/org/eclipse/ant/tests/core/tests/TypeTests.java
deleted file mode 100644
index e029705..0000000
--- a/ant/org.eclipse.ant.tests.core/tests/org/eclipse/ant/tests/core/tests/TypeTests.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.tests.core.tests;
-
-
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import org.eclipse.ant.core.AntCorePlugin;
-import org.eclipse.ant.core.AntCorePreferences;
-import org.eclipse.ant.core.Type;
-import org.eclipse.ant.tests.core.AbstractAntTest;
-import org.eclipse.ant.tests.core.testplugin.AntTestChecker;
-import org.eclipse.core.runtime.CoreException;
-
-public class TypeTests extends AbstractAntTest {
-
-	public TypeTests(String name) {
-		super(name);
-	}
-
-	public void testAddType() throws MalformedURLException, CoreException {
-		AntCorePreferences prefs =AntCorePlugin.getPlugin().getPreferences();
-		Type newType= new Type();
-		String path= getProject().getFolder("lib").getFile("antTestsSupport.jar").getLocation().toFile().getAbsolutePath();
-		URL url= new URL("file:" + path);
-		newType.setLibrary(url);
-		newType.setTypeName("anttestpath");
-		newType.setClassName("org.eclipse.ant.tests.core.support.types.AntTestPath");
-		prefs.setCustomTypes(new Type[]{newType});
-		
-		run("CustomType.xml");
-		String msg= (String)AntTestChecker.getDefault().getMessages().get(1);
-		assertTrue("Message incorrect: " + msg, msg.equals("Test adding a custom type"));
-		assertSuccessful();
-	}
-	
-	public void testRemoveType() throws CoreException {
-		AntCorePreferences prefs =AntCorePlugin.getPlugin().getPreferences();
-		prefs.setCustomTypes(new Type[]{});
-		try {
-			run("CustomType.xml");
-		} catch (CoreException ce) {
-			assertTrue("Exception from undefined type is incorrect", ce.getMessage().endsWith("Unexpected element \"anttestpath\""));
-			return;
-		}
-		assertTrue("Build should have failed as type no longer defined", false);
-		restorePreferenceDefaults();
-	}
-}
diff --git a/ant/org.eclipse.ant.tests.ui/.classpath b/ant/org.eclipse.ant.tests.ui/.classpath
deleted file mode 100644
index 350c163..0000000
--- a/ant/org.eclipse.ant.tests.ui/.classpath
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-    <classpathentry kind="src" path="Ant Editor Tests/"/>
-    <classpathentry kind="src" path="/org.apache.ant"/>
-    <classpathentry kind="src" path="/org.junit"/>
-    <classpathentry kind="src" path="/org.eclipse.core.resources"/>
-    <classpathentry kind="src" path="/org.apache.xerces"/>
-    <classpathentry kind="src" path="/org.eclipse.jdt.core"/>
-    <classpathentry kind="src" path="/org.eclipse.ui"/>
-    <classpathentry kind="src" path="/org.eclipse.ant.core"/>
-    <classpathentry kind="src" path="/org.eclipse.update.core"/>
-    <classpathentry kind="src" path="/org.eclipse.core.boot"/>
-    <classpathentry kind="src" path="/org.eclipse.core.runtime"/>
-    <classpathentry kind="var" path="JRE_LIB" sourcepath="JRE_SRC"/>
-    <classpathentry kind="src" path="/org.eclipse.ant.ui"/>
-    <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/ant/org.eclipse.ant.tests.ui/.cvsignore b/ant/org.eclipse.ant.tests.ui/.cvsignore
deleted file mode 100644
index ba077a4..0000000
--- a/ant/org.eclipse.ant.tests.ui/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
diff --git a/ant/org.eclipse.ant.tests.ui/.project b/ant/org.eclipse.ant.tests.ui/.project
deleted file mode 100644
index 8aa90ef..0000000
--- a/ant/org.eclipse.ant.tests.ui/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ant.tests.ui</name>
-	<comment></comment>
-	<projects>
-		<project>org.apache.ant</project>
-		<project>org.apache.xerces</project>
-		<project>org.eclipse.ant.core</project>
-		<project>org.eclipse.ant.ui</project>
-		<project>org.eclipse.core.boot</project>
-		<project>org.eclipse.core.resources</project>
-		<project>org.eclipse.core.runtime</project>
-		<project>org.eclipse.jdt.core</project>
-		<project>org.eclipse.ui</project>
-		<project>org.eclipse.update.core</project>
-		<project>org.junit</project>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ui/externaltools/internal/ant/dtd/test/dumper.java b/ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ui/externaltools/internal/ant/dtd/test/dumper.java
deleted file mode 100644
index 699790e..0000000
--- a/ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ui/externaltools/internal/ant/dtd/test/dumper.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2003 Object Factory Inc.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     Object Factory Inc. - Initial implementation
- *******************************************************************************/
-
-package org.eclipse.ui.externaltools.internal.ant.dtd.test;
-
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.Map;
-
-import org.eclipse.ant.ui.internal.dtd.IDfm;
-import org.eclipse.ant.ui.internal.dtd.IElement;
-import org.eclipse.ant.ui.internal.dtd.IModel;
-import org.eclipse.ant.ui.internal.dtd.ISchema;
-import org.eclipse.ant.ui.internal.dtd.ParseError;
-import org.eclipse.ant.ui.internal.dtd.Parser;
-
-/**
- * This class is intended to be used from the command line (hence the
- * uncapitalized class name).
- * @author Bob Foster
- */
-public class dumper {
-
-	public static int main(String[] args) {
-
-		if (args.length <= 0) {
-			System.out.println("Usage: java DTDMerger URL");
-			return 0;
-		}
-		String document = args[0];
-
-		Parser parser = new Parser();
-		
-		ISchema schema;
-		try {
-			schema = parser.parse(document);
-		} catch (ParseError e) {
-			System.out.println(e.getMessage());
-			e.printStackTrace();
-			return 1;
-		} catch (IOException e) {
-			e.printStackTrace();
-			return 1;
-		}
-		System.out.println("DTD successfully parsed");
-		dumpSchema(schema);
-		return 0;
-	}
-	
-	/**
-	 * Write schema contents to standard output.
-	 */
-	private static void dumpSchema(ISchema schema) {
-		IElement[] elements = schema.getElements();
-		System.out.println(""+elements.length+" elements defined");
-		for (int i = 0; i < elements.length; i++) {
-			IElement element = elements[i];
-			IModel model = element.getContentModel();
-			System.out.println("ELEMENT "+element.getName()
-				+'"'+model.stringRep()+'"');
-			dumpDfm(element.getDfm());
-		}
-	}
-
-	/**
-	 * Dump dfm as a series of states.
-	 * <pre>
-	 * S0  a=>S1 b=>S2 
-	 * S1  c=>S2
-	 * S2* d=>S2
-	 * </pre>
-	 * Where * indicates accepting state.
-	 * @param dfm to dump
-	 */
-	private static void dumpDfm(IDfm dfm) {
-		HashMap map = new HashMap();
-		dumpDfm(dfm, map, 0);
-		LinkedList list = new LinkedList();
-		Iterator it = map.entrySet().iterator();
-		while (it.hasNext()) {
-			Map.Entry entry = (Map.Entry) it.next();
-			list.add(new State((IDfm)entry.getKey(), (Integer)entry.getValue()));
-		}
-		State[] states = (State[]) list.toArray(new State[list.size()]);
-		Arrays.sort(states);
-		for (int i = 0; i < states.length; i++) {
-			print(states[i], map);
-		}
-	}
-
-	private static void print(State state, HashMap map) {
-		System.out.print("  S"+state.n.intValue()
-			+(state.dfm.isAccepting() ? "*  " : "  "));
-		String[] accepts = state.dfm.getAccepts();
-		for (int i = 0; i < accepts.length; i++) {
-			String accept = accepts[i];
-			IDfm next = state.dfm.advance(accept);
-			int n = ((Integer)map.get(next)).intValue();
-			System.out.print(" "+accept+"=>S"+n);
-		}
-		System.out.println();
-	}
-	
-	private static int dumpDfm(IDfm dfm, HashMap map, int num) {
-		if (!map.containsKey(dfm)) {
-			map.put(dfm, new Integer(num++));
-			String[] accepts = dfm.getAccepts();
-			for (int i = 0; i < accepts.length; i++) {
-				IDfm next = dfm.advance(accepts[i]);
-				num = dumpDfm(next, map, num);
-			}
-		}
-		return num;
-	}
-	
-	private static class State implements Comparable {
-		public IDfm dfm;
-		public Integer n;
-		public State(IDfm dfm, Integer n) {
-			this.dfm = dfm;
-			this.n = n;
-		}
-		/**
-		 * @see java.lang.Comparable#compareTo(java.lang.Object)
-		 */
-		public int compareTo(Object o) {
-			State other = (State) o;
-			return n.intValue() < other.n.intValue()
-				? -1 
-				: (n.intValue() == other.n.intValue() 
-					? 0 
-					: 1);
-		}
-
-	}
-}
diff --git a/ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ui/externaltools/internal/ant/editor/support/TestEditor.java b/ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ui/externaltools/internal/ant/editor/support/TestEditor.java
deleted file mode 100644
index 1e236cd..0000000
--- a/ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ui/externaltools/internal/ant/editor/support/TestEditor.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ui.externaltools.internal.ant.editor.support;
-
-import org.eclipse.ant.ui.internal.editor.AntEditor;
-
-public class TestEditor extends AntEditor {
-	
-	TestEditor() {
-	}
-	
-    public void initializeEditor() {
-    }
-    /** 
-     * Returns '10'.
-     * @see org.eclipse.ui.texteditor.AbstractTextEditor#getCursorPosition()
-     */
-    protected String getCursorPosition() {
-        return "10";
-    }
-
-}
\ No newline at end of file
diff --git a/ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ui/externaltools/internal/ant/editor/support/TestLocationProvider.java b/ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ui/externaltools/internal/ant/editor/support/TestLocationProvider.java
deleted file mode 100644
index d08704b..0000000
--- a/ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ui/externaltools/internal/ant/editor/support/TestLocationProvider.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ui.externaltools.internal.ant.editor.support;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.ant.ui.internal.editor.outline.ILocationProvider;
-
-
-public class TestLocationProvider implements ILocationProvider {
-
-	private String buildFileName;
-	
-	public TestLocationProvider(String buildFileName) {
-		this.buildFileName= buildFileName;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ant.ui.internal.editor.outline.ILocationProvider#getLocation()
-	 */
-	public IPath getLocation() {
-		return new Path(buildFileName);
-	}
-}
diff --git a/ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ui/externaltools/internal/ant/editor/support/TestProblemRequestor.java b/ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ui/externaltools/internal/ant/editor/support/TestProblemRequestor.java
deleted file mode 100644
index 9f384ec..0000000
--- a/ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ui/externaltools/internal/ant/editor/support/TestProblemRequestor.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ui.externaltools.internal.ant.editor.support;
-
-import org.eclipse.ant.ui.internal.editor.outline.IProblem;
-import org.eclipse.ant.ui.internal.editor.outline.IProblemRequestor;
-
-public class TestProblemRequestor implements IProblemRequestor {
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ant.ui.internal.editor.outline.IProblemRequestor#acceptProblem(org.eclipse.ant.ui.internal.editor.outline.IProblem)
-	 */
-	public void acceptProblem(IProblem problem) {
-
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ant.ui.internal.editor.outline.IProblemRequestor#beginReporting()
-	 */
-	public void beginReporting() {
-
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ant.ui.internal.editor.outline.IProblemRequestor#endReporting()
-	 */
-	public void endReporting() {
-
-	}
-}
diff --git a/ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ui/externaltools/internal/ant/editor/support/TestTextCompletionProcessor.java b/ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ui/externaltools/internal/ant/editor/support/TestTextCompletionProcessor.java
deleted file mode 100644
index 8c1589c..0000000
--- a/ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ui/externaltools/internal/ant/editor/support/TestTextCompletionProcessor.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ui.externaltools.internal.ant.editor.support;
-
-import java.io.File;
-import java.io.IOException;
-
-import junit.framework.TestCase;
-
-import org.eclipse.ant.ui.internal.editor.AntEditorCompletionProcessor;
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-import org.w3c.dom.Element;
-
-public class TestTextCompletionProcessor extends AntEditorCompletionProcessor {
-
-	private File editedFile;
-
-    public ICompletionProposal[] getAttributeProposals(String aTaskName, String aPrefix) {
-    	cursorPosition= aTaskName.length();
-        return super.getAttributeProposals(aTaskName, aPrefix);
-    }
-
-    public Element findChildElementNamedOf(Element anElement, String aChildElementName) {
-        return super.findChildElementNamedOf(anElement, aChildElementName);
-    }
-
-    public ICompletionProposal[] getTaskProposals(String aWholeDocumentString, Element aParentTaskElement, String aPrefix) {
-    	cursorPosition= Math.max(0, aWholeDocumentString.length() - 1);
-        return super.getTaskProposals(aWholeDocumentString, aParentTaskElement, aPrefix);
-    }
-
-    public int determineProposalMode(String aWholeDocumentString, int aCursorPosition, String aPrefix) {
-        return super.determineProposalMode(
-            aWholeDocumentString,
-            aCursorPosition,
-            aPrefix);
-    }
-
-    public Element findParentElement(
-        String aWholeDocumentString,
-        int aLineNumber,
-        int aColumnNumber) {
-        return super.findParentElement(
-            aWholeDocumentString,
-            aLineNumber,
-            aColumnNumber);
-    }
-
-    public String getPrefixFromDocument(
-        String aDocumentText,
-        int anOffset) {
-        return super.getPrefixFromDocument(aDocumentText, anOffset);
-    }
-
-    public ICompletionProposal[] getPropertyProposals(
-        String aDocumentText,
-        String aPrefix, int aCursorPosition) {
-        return super.getPropertyProposals(aDocumentText, aPrefix, aCursorPosition);
-    }
-
-    /**
-     * Returns the edited File that org.eclipse.ant.ui.internal.editor.AntEditorCompletionProcessor sets or a temporary 
-     * file, which only serves as a dummy.
-     * @see org.eclipse.ant.ui.internal.editor.AntEditorCompletionProcessor#getEditedFile()
-     */
-	public File getEditedFile() {
-		if (editedFile != null){
-			return editedFile;
-		}
-		File tempFile = null;
-        try {
-            tempFile = File.createTempFile("test", null);
-        } catch (IOException e) {
-            TestCase.fail(e.getMessage());
-        }
-        tempFile.deleteOnExit();
-        return tempFile;
-    }
-
-	public void setLineNumber(int aLineNumber) {
-    	lineNumber = aLineNumber;
-    }
-
-	public void setColumnNumber(int aColumnNumber) {
-    	columnNumber = aColumnNumber;
-    }
-    
-	public void setEditedFile(File aFile) {
-		editedFile= aFile;
-	}
-}
\ No newline at end of file
diff --git a/ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ui/externaltools/internal/ant/editor/support/TestUtils.java b/ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ui/externaltools/internal/ant/editor/support/TestUtils.java
deleted file mode 100644
index 7e83996..0000000
--- a/ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ui/externaltools/internal/ant/editor/support/TestUtils.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ui.externaltools.internal.ant.editor.support;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.UnsupportedEncodingException;
-
-import org.eclipse.ant.ui.internal.model.AntUIPlugin;
-import org.eclipse.core.resources.ResourcesPlugin;
-
-public class TestUtils {
-
-	public static String getStreamContentAsString(InputStream inputStream) {
-		InputStreamReader reader;
-		try {
-			reader = new InputStreamReader(inputStream, ResourcesPlugin.getEncoding());
-		} catch (UnsupportedEncodingException e) {
-			AntUIPlugin.log(e);
-			return ""; //$NON-NLS-1$
-		}
-		BufferedReader tempBufferedReader = new BufferedReader(reader);
-
-		return getReaderContentAsString(tempBufferedReader);
-	}
-	
-	protected static String getReaderContentAsString(BufferedReader tempBufferedReader) {
-		StringBuffer tempResult = new StringBuffer();
-		try {
-			String tempLine= tempBufferedReader.readLine();
-    
-			while(tempLine != null) {
-				if(tempResult.length() != 0) {
-					tempResult.append("\n"); //$NON-NLS-1$
-				}
-				tempResult.append(tempLine);
-				tempLine = tempBufferedReader.readLine();
-			}
-		} catch (IOException e) {
-			AntUIPlugin.log(e);
-			return null;
-		}
-
-		return tempResult.toString();
-	}
-}
diff --git a/ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ui/externaltools/internal/ant/editor/test/AntEditorContentOutlineTests.java b/ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ui/externaltools/internal/ant/editor/test/AntEditorContentOutlineTests.java
deleted file mode 100644
index 36aaea5..0000000
--- a/ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ui/externaltools/internal/ant/editor/test/AntEditorContentOutlineTests.java
+++ /dev/null
@@ -1,298 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2003 GEBIT Gesellschaft fuer EDV-Beratung
- * und Informatik-Technologien mbH, 
- * Berlin, Duesseldorf, Frankfurt (Germany) and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     GEBIT Gesellschaft fuer EDV-Beratung und Informatik-Technologien mbH - initial implementation
- * 	   IBM Corporation - additional tests
- *******************************************************************************/
-
-package org.eclipse.ui.externaltools.internal.ant.editor.test;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.List;
-
-import javax.xml.parsers.ParserConfigurationException;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.jface.text.Document;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.ant.ui.internal.editor.outline.AntModel;
-import org.eclipse.ant.ui.internal.editor.outline.XMLCore;
-import org.eclipse.ui.externaltools.internal.ant.editor.support.TestLocationProvider;
-import org.eclipse.ui.externaltools.internal.ant.editor.support.TestUtils;
-import org.eclipse.ant.ui.internal.editor.xml.IAntEditorConstants;
-import org.eclipse.ant.ui.internal.editor.xml.XmlElement;
-import org.xml.sax.SAXException;
-
-/**
- * Tests the correct creation of the outline for an xml file.
- * 
- * @author Alf Schiefelbein
- */
-public class AntEditorContentOutlineTests extends TestCase {
-    
-    private IDocument currentDocument;
-    
-    public AntEditorContentOutlineTests(String name) {
-        super(name);
-    }
-
-    /**
-     * Tests parsing an XML file with the use of our OutlinePreparingHandler.
-     */
-    public void testOutlinePreparingHandler() throws SAXException, ParserConfigurationException, IOException {
-		AntModel model= getAntModel("test2.xml");
-        
-		XmlElement[] roots = model.getRootElements();
-		assertNotNull(roots);
-		XmlElement rootElement= roots[0];
-   
-		assertNotNull(rootElement);
-        
-        assertEquals("bla", rootElement.getName());
-        assertEquals(1, rootElement.getStartingRow());
-        assertEquals(1, rootElement.getStartingColumn());
-        assertEquals(9, rootElement.getEndingRow());
-        assertEquals(7, rootElement.getEndingColumn());
-        List childNodes = rootElement.getChildNodes();
-        assertEquals(2, childNodes.size());
-
-        XmlElement childElement = (XmlElement)childNodes.get(0);
-        assertEquals("blub", childElement.getName());
-        assertEquals(2, childElement.getStartingRow());
-        assertEquals(3, childElement.getStartingColumn());
-        assertEquals(2, childElement.getEndingRow());
-        assertEquals(16, childElement.getEndingColumn());
-
-        childElement = (XmlElement)childNodes.get(1);
-        assertEquals("klick", childElement.getName());
-        assertEquals(3, childElement.getStartingRow());
-        assertEquals(3, childElement.getStartingColumn());
-        assertEquals(8, childElement.getEndingRow());
-        assertEquals(11, childElement.getEndingColumn());
-
-		childNodes = childElement.getChildNodes();
-        assertEquals(4, childNodes.size());
-		
-		childElement = (XmlElement)childNodes.get(0);
-        assertEquals("gurgel", childElement.getName());
-        assertEquals(4, childElement.getStartingRow());
-        assertEquals(5, childElement.getStartingColumn());
-        assertEquals(4, childElement.getEndingRow());
-        assertEquals(22, childElement.getEndingColumn());
-
-		childElement = (XmlElement)childNodes.get(1);
-        assertEquals("hal", childElement.getName());
-        assertEquals(5, childElement.getStartingRow());
-        assertEquals(5, childElement.getStartingColumn());
-        assertEquals(5, childElement.getEndingRow());
-        assertEquals(16, childElement.getEndingColumn());
-
-		childElement = (XmlElement)childNodes.get(2);
-        assertEquals("klack", childElement.getName());
-        assertEquals(6, childElement.getStartingRow());
-        assertEquals(5, childElement.getStartingColumn());
-        assertEquals(6, childElement.getEndingRow());
-        assertEquals(13, childElement.getEndingColumn());
-
-		childElement = (XmlElement)childNodes.get(3);
-        assertEquals("humpf", childElement.getName());
-        assertEquals(7, childElement.getStartingRow());
-        assertEquals(5, childElement.getStartingColumn());
-        assertEquals(7, childElement.getEndingRow());
-        assertEquals(13, childElement.getEndingColumn());
-    }
-
-    /**
-     * Tests the creation of the XmlElement, that includes parsing a file
-     * and determining the correct location of the tags.
-     */
-    public void testCreationOfOutlineTree() {
-		AntModel model= getAntModel("buildtest1.xml");
-        
-		XmlElement[] roots = model.getRootElements();
-		assertNotNull(roots);
-		XmlElement project= roots[0];
-       
-        assertNotNull(project);
-        
-        // Get the content as string
-        String wholeDocumentString = currentDocument.get();
-
-        
-        // <project>
-        assertEquals(2, project.getStartingRow());
-        assertEquals(1, project.getStartingColumn());
-        int offset = wholeDocumentString.indexOf("<project");
-          
-	    assertEquals(offset, project.getOffset());
-        
-        List children = project.getChildNodes();
-		
-		// <property name="propD">
-		XmlElement element = (XmlElement)children.get(0);
-        assertEquals(3, element.getStartingRow());
-        assertEquals(2, element.getStartingColumn()); // with tab in file
-        assertEquals(3, element.getEndingRow());
-        assertEquals(40, element.getEndingColumn());  // with tab in file
-        offset = wholeDocumentString.indexOf("<property");
-       
-        assertEquals(offset, element.getOffset());
-// (T)
-        int length = "<property name=\"propD\" value=\"valD\" />".length();
-        assertEquals(length, element.getLength());
-
-		
-		// <property file="buildtest1.properties">
-		element = (XmlElement)children.get(1);
-        assertEquals(4, element.getStartingRow());
-        assertEquals(5, element.getStartingColumn()); // no tab
-        assertEquals(4, element.getEndingRow());
-        assertEquals(46, element.getEndingColumn());
-		
-		// <property name="propV">
-		element = (XmlElement)children.get(2);
-        assertEquals(5, element.getStartingRow());
-        assertEquals(5, element.getStartingColumn());
-        assertEquals(5, element.getEndingRow());
-        assertEquals(43, element.getEndingColumn());
-		
-		// <target name="main">
-		element = (XmlElement)children.get(3);
-        assertEquals(6, element.getStartingRow());
-        assertEquals(5, element.getStartingColumn());
-        assertEquals(8, element.getEndingRow());
-        assertEquals(14, element.getEndingColumn());
-		
-		// <property name="property_in_target">
-		element = (XmlElement)element.getChildNodes().get(0);
-        assertEquals(7, element.getStartingRow());
-        assertEquals(9, element.getStartingColumn());
-        assertEquals(7, element.getEndingRow());
-        assertEquals(58, element.getEndingColumn());
-        offset = wholeDocumentString.indexOf("<property name=\"property_in_target\"");
-          
-        assertEquals(offset, element.getOffset());
-		
-        assertEquals(9, project.getEndingRow());
-        assertEquals(11, project.getEndingColumn());
-                
-    }
-
-    /**
-     * Tests the creation of the XmlElement, that includes parsing a non-valid 
-     * file.
-     */
-    public void testParsingOfNonValidFile() {
-		AntModel model= getAntModel("buildtest2.xml");
-        
-		XmlElement[] roots = model.getRootElements();
-		assertNotNull(roots);
-		XmlElement root= roots[0];
-   		assertNotNull(root);
-   		
-        // Get the content as string
-        String wholeDocumentString = currentDocument.get();
-
-        List children = root.getChildNodes();
-
-		// <target name="main">
-		XmlElement element = (XmlElement)children.get(2);
-        assertEquals(5, element.getStartingRow());
-        assertEquals(2, element.getStartingColumn()); // with tab in file
-        assertEquals(5, element.getEndingRow());
-        assertEquals(43, element.getEndingColumn());
-        int offset = wholeDocumentString.indexOf("<target name=\"main\"");
-         
-	    assertEquals(offset, element.getOffset()); // ???
-    }
-
-	
-	/**
-	 * Tests whether the outline can handle a build file with only the <project></project> tags.
-	 */
-	public void testWithProjectOnlyBuildFile() {
-		AntModel model= getAntModel("projectOnly.xml");
-		XmlElement[] roots = model.getRootElements();
-		assertNotNull(roots);
-		XmlElement root= roots[0];
-		assertNotNull(root);
-	}
-	
-	/**
-	 * Tests whether the outline can handle an empty build file.
-	 */
-	public void testWithEmptyBuildFile() {
-		AntModel model= getAntModel("empty.xml");
-		XmlElement[] roots = model.getRootElements();
-		assertNotNull(roots);
-		assertTrue(roots.length == 0);
-	}		
-
-	
-	/**
-	 * Some testing of getting the right location of tags.
-	 */
-	public void testAdvancedTaskLocationing() {
-		AntModel model= getAntModel("outline_select_test_build.xml");
-        
-        XmlElement[] roots = model.getRootElements();
-        assertNotNull(roots);
-        XmlElement project= roots[0];
-        // Get the content as string
-        String wholeDocumentString = currentDocument.get();
-        
-        // <project>
-        assertNotNull(project);
-        assertEquals(2, project.getStartingRow());
-        assertEquals(1, project.getStartingColumn());
-        int offset = wholeDocumentString.indexOf("<project");
-        
-	    assertEquals(offset, project.getOffset());
-        
-		// <target name="properties">
-        XmlElement element = (XmlElement)project.getChildNodes().get(1);
-        assertNotNull(element);
-        assertEquals("properties", element.getAttributeNamed(IAntEditorConstants.ATTR_NAME).getValue());
-        assertEquals(16, element.getStartingRow());
-        assertEquals(2, element.getStartingColumn());
-        offset = wholeDocumentString.indexOf("<target name=\"properties\"");
-      
-	    assertEquals(offset, element.getOffset());
-	}
-
-
-    public static Test suite() {
-        TestSuite suite = new TestSuite("AntEditorContentOutlineTest");
-        suite.addTest(new AntEditorContentOutlineTests("testOutlinePreparingHandler"));
-        suite.addTest(new AntEditorContentOutlineTests("testCreationOfOutlineTree"));
-        suite.addTest(new AntEditorContentOutlineTests("testParsingOfNonValidFile"));
-        suite.addTest(new AntEditorContentOutlineTests("testAdvancedTaskLocationing"));
-        suite.addTest(new AntEditorContentOutlineTests("testWithEmptyBuildFile"));
-        return suite;
-    }
-    
-    private IDocument getDocument(String fileName) {
-		InputStream in = getClass().getResourceAsStream(fileName);
-		String initialContent= TestUtils.getStreamContentAsString(in);
-		return new Document(initialContent);
-    }
-    
-	private AntModel getAntModel(String fileName) {
-		currentDocument= getDocument(fileName);
-		AntModel model= new AntModel(XMLCore.getDefault(), currentDocument, null, new TestLocationProvider(fileName));
-		model.reconcile();
-		return model;
-	}
-
-}
diff --git a/ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ui/externaltools/internal/ant/editor/test/AntEditorTests.java b/ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ui/externaltools/internal/ant/editor/test/AntEditorTests.java
deleted file mode 100644
index d9f3562..0000000
--- a/ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ui/externaltools/internal/ant/editor/test/AntEditorTests.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2003 GEBIT Gesellschaft fuer EDV-Beratung
- * und Informatik-Technologien mbH, 
- * Berlin, Duesseldorf, Frankfurt (Germany) and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     GEBIT Gesellschaft fuer EDV-Beratung und Informatik-Technologien mbH - initial implementation
- * 	   IBM Corporation - additional tests
- *******************************************************************************/
-
-package org.eclipse.ui.externaltools.internal.ant.editor.test;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-
-/**
- * Test suite for the Ant Editor
- * 
- * @author Alf Schiefelbein
- */
-public class AntEditorTests extends TestSuite {
-
-    public static Test suite() {
-
-        TestSuite suite= new AntEditorTests();
-        suite.setName("Ant Editor Unit Tests");
-        suite.addTest(new TestSuite(CodeCompletionTest.class));
-        suite.addTest(new TestSuite(TaskDescriptionProviderTest.class));
-        suite.addTest(new TestSuite(AntEditorContentOutlineTests.class));
-        suite.addTest(new TestSuite(EnclosingTargetSearchingHandlerTest.class));
-        return suite;
-    }
-}
diff --git a/ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ui/externaltools/internal/ant/editor/test/CodeCompletionTest.java b/ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ui/externaltools/internal/ant/editor/test/CodeCompletionTest.java
deleted file mode 100644
index eec82c9..0000000
--- a/ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ui/externaltools/internal/ant/editor/test/CodeCompletionTest.java
+++ /dev/null
@@ -1,575 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2003 GEBIT Gesellschaft fuer EDV-Beratung
- * und Informatik-Technologien mbH, 
- * Berlin, Duesseldorf, Frankfurt (Germany) and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     GEBIT Gesellschaft fuer EDV-Beratung und Informatik-Technologien mbH - initial implementation
- * 	   IBM Corporation - additional tests
- *******************************************************************************/
-
-package org.eclipse.ui.externaltools.internal.ant.editor.test;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.net.URL;
-import java.util.Hashtable;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.ProjectHelper;
-import org.apache.xerces.parsers.SAXParser;
-import org.eclipse.ant.ui.internal.editor.AntEditorSaxDefaultHandler;
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-import org.eclipse.ui.externaltools.internal.ant.editor.support.TestTextCompletionProcessor;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Comment;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NodeList;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-
-
-/**
- * Tests everything about code completion and code assistance.
- * 
- * @version 29.11.2002
- * @author Alf Schiefelbein
- */
-public class CodeCompletionTest extends TestCase {
-
-    /**
-     * Constructor for CodeCompletionTest.
-     * @param arg0
-     */
-    public CodeCompletionTest(String arg0) {
-        super(arg0);
-    }
-
-    
-    /**
-     * Tests the code completion for attributes of tasks.
-     */
-    public void testAttributeProposals() throws IOException {
-        TestTextCompletionProcessor processor = new TestTextCompletionProcessor();
-
-        ICompletionProposal[] proposals = processor.getAttributeProposals("contains", "ca");
-        assertEquals(1, proposals.length);
-        assertEquals("casesensitive - (true | false | on | off | yes | no)", proposals[0].getDisplayString());
-
-        proposals = processor.getAttributeProposals("move", "");
-        assertEquals(14, proposals.length);
-        ICompletionProposal proposal = proposals[0];
-        String displayString = proposal.getDisplayString();
-        assertTrue(displayString.equals("id") 
-        || displayString.equals("flatten - (true | false | on | off | yes | no)")
-        || displayString.equals("encoding")
-        || displayString.equals("tofile")
-        || displayString.equals("todir")
-        || displayString.equals("file")
-        || displayString.equals("verbose - (true | false | on | off | yes | no)")
-        || displayString.equals("includeemptydirs")
-        || displayString.equals("overwrite - (true | false | on | off | yes | no)")
-        || displayString.equals("taskname")
-        || displayString.equals("failonerror - (true | false | on | off | yes | no)")
-        || displayString.equals("description")
-        || displayString.equals("preservelastmodified - (true | false | on | off | yes | no)")
-        || displayString.equals("filtering - (true | false | on | off | yes | no)"));
-
-        proposals = processor.getAttributeProposals("move", "to");
-        assertEquals(2, proposals.length);
-
-        proposals = processor.getAttributeProposals("reference", "idl");
-        assertEquals(0, proposals.length);
-
-        proposals = processor.getAttributeProposals("reference", "id");
-        assertEquals(1, proposals.length);
-        assertEquals("id", proposals[0].getDisplayString());
-
-        proposals = processor.getAttributeProposals("reference", "i");
-        assertEquals(1, proposals.length);
-        assertEquals("id", proposals[0].getDisplayString());
-
-        proposals = processor.getAttributeProposals("project", "de");
-        assertEquals(1, proposals.length);
-        
-        // assertEquals("default - #REQUIRED", tempProposals[0].getDisplayString());
-
-    }
-    
-
-    /**
-     * Test the code completion for properties.
-     */
-    public void testPropertyProposals1() {
-		TestTextCompletionProcessor processor = new TestTextCompletionProcessor();
-
-        String documentText = "<project default=\"test\"><property name=\"prop1\" value=\"val1\" />\n";
-        documentText += "<property name=\"prop2\" value=\"val2\" />\n";
-        documentText += "<property name=\"alf\" value=\"horst\" />\n";
-        documentText += "<test name=\"$";
-		processor.setLineNumber(4);
-		processor.setColumnNumber(14);
-        int cursorPos = documentText.length();
-        ICompletionProposal[] proposals = processor.getPropertyProposals(documentText, "", cursorPos);
-        assertTrue(proposals.length >= 3);
-        assertContains("alf", proposals);
-        documentText = "<project default=\"test\"><property name=\"prop1\" value=\"val1\" />\n";
-        documentText += "<property name=\"prop2\" value=\"val2\" />\n";
-        documentText += "<property name=\"alf\" value=\"horst\" />\n";
-        documentText += "<test name=\"$a}";
-		processor.setLineNumber(4);
-		processor.setColumnNumber(15);
-        cursorPos = documentText.length()-1;
-        proposals = processor.getPropertyProposals(documentText, "a", cursorPos);
-        assertTrue(proposals.length >= 1);
-        assertContains("alf", proposals);
-
-    }
- 
- 	/**
- 	 * Asserts that <code>displayString</code> is in one of the 
- 	 * completion proposals.
- 	 */
-    private void assertContains(String displayString, ICompletionProposal[] proposalArray) {
-        boolean found = false;
-        for (int i = 0; i < proposalArray.length; i++) {
-            ICompletionProposal proposal = proposalArray[i];
-            String proposalDisplayString = proposal.getDisplayString();
-            if(displayString.equals(proposalDisplayString)) {
-                found = true;
-                break;
-            }
-        }
-        assertEquals(true, found);
-    }        
-    
-	/**
-	 * Tests the property proposals in for the case that they are defined in
-	 * a seperate property file.
-	 */
-    public void testBuildWithProperties() {
-        Project project = new Project();
-        project.init();
-        URL url = getClass().getResource("buildtest1.xml");
-        assertNotNull(url);
-        File file = new File(url.getPath());
-        assertTrue(file.exists());
-        
-        project.setUserProperty("ant.file", file.getAbsolutePath());
-
-        ProjectHelper.configureProject(project, file);  // File will be parsed here
-        Hashtable table = project.getProperties();
-        assertEquals("valD", table.get("propD"));
-        assertEquals("val1", table.get("prop1"));
-        assertEquals("val2", table.get("prop2"));
-        assertEquals("valV", table.get("propV"));
-        // assertEquals("val", tempTable.get("property_in_target"));  // (T) is known and should be fixed
-
-        // test with not valid (complete) build file
-        project = new Project();
-        project.init();
-        url = getClass().getResource("buildtest2.xml");
-        assertNotNull(url);
-        file = new File(url.getPath());
-		assertTrue(file.exists());
-        project.setUserProperty("ant.file", file.getAbsolutePath());
-        try {
-            org.eclipse.ant.ui.internal.editor.utils.ProjectHelper.configureProject(project, file);  // File will be parsed here
-        }
-        catch(BuildException e) {
-            // ignore a build exception on purpose 
-        }    
-        table = project.getProperties();
-        assertEquals("valD", table.get("propD"));
-        assertEquals("val1", table.get("prop1"));
-        assertEquals("val2", table.get("prop2"));
-
-        // test with not valid whole document string
-        project = new Project();
-        project.init();
-        url = getClass().getResource("buildtest2.xml");
-        assertNotNull(url);
-        String path = url.getPath();
-        path = path.substring(0, path.lastIndexOf('/')+1) + "someNonExisting.xml";
-        file = new File(path);
-        project.setUserProperty("ant.file", file.getAbsolutePath());
-        StringBuffer buff = new StringBuffer();
-        buff.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n");
-        buff.append("<project name=\"testproject\" basedir=\".\" default=\"main\">");
-        buff.append("<property name=\"propA\" value=\"valA\" />\n");
-		buff.append("<property file=\"buildtest1.properties\" />\n");
-        buff.append("<target name=\"main\" depends=\"properties\">\n");
-        try {
-            org.eclipse.ant.ui.internal.editor.utils.ProjectHelper.configureProject(project, file, buff.toString());  // File will be parsed here
-        }
-        catch (BuildException e) {
-            //ignore a build exception on purpose
-			//as the document does not start and end within the same entity
-        }    
-        table = project.getProperties();
-        assertEquals("valA", table.get("propA"));
-        assertEquals("val2", table.get("prop2"));
-    }
-
-
-	/**
-	 * Tests the property proposals for the case that they are defined in
-	 * a dependent targets.
-	 */
-    public void testPropertyProposalDefinedInDependendTargets() throws FileNotFoundException {
-        TestTextCompletionProcessor processor = new TestTextCompletionProcessor();
-
-        URL url = getClass().getResource("dependencytest.xml");
-        assertNotNull(url);
-        File file = new File(url.getPath());
-        assertTrue(file.exists());
-        processor.setEditedFile(file);
-		String documentText = getFileContentAsString(file);
-
-		processor.setLineNumber(35);
-		processor.setColumnNumber(41);
-		int cursorPosition = documentText.lastIndexOf("${");
-		assertTrue(cursorPosition != -1);
-        ICompletionProposal[] proposals = processor.getPropertyProposals(documentText, "", cursorPosition+2);
-		assertContains("init_prop", proposals);
-		assertContains("main_prop", proposals);
-		assertContains("prop_prop", proposals);
-		assertContains("do_not_compile", proposals);
-		assertContains("adit_prop", proposals);
-		assertContains("compile_prop", proposals);
-    }
-
-    
-    /**
-     * Tests the code completion for tasks having parent tasks.
-     */
-    public void testTaskProposals() throws IOException, ParserConfigurationException {
-		TestTextCompletionProcessor processor = new TestTextCompletionProcessor();
-
-        DocumentBuilder docBuilder = DocumentBuilderFactory.newInstance().newDocumentBuilder();
-        Document doc = docBuilder.newDocument();
-
-        ICompletionProposal[] proposals = processor.getTaskProposals("         <", doc.createElement("rename"), "");
-        assertEquals(0, proposals.length);
-
-        proposals = processor.getTaskProposals("       <cl", createTestPropertyElement(doc), "cl");
-        assertEquals(1, proposals.length);
-        ICompletionProposal proposal = proposals[0];
-        assertEquals("classpath", proposal.getDisplayString());
-        
-        //case insensitivity
-		proposals = processor.getTaskProposals("       <CL", createTestPropertyElement(doc), "cl");
-	   	assertEquals(1, proposals.length);
-	   	proposal = proposals[0];
-	   	assertEquals("classpath", proposal.getDisplayString());
-
-        proposals = processor.getTaskProposals("       <cl", doc.createElement("property"), "cl");
-        assertEquals(1, proposals.length);
-        proposal = proposals[0];
-        assertEquals("classpath", proposal.getDisplayString());
-
-        proposals = processor.getTaskProposals("       <pr", doc.createElement("property"), "");
-        assertEquals(1, proposals.length);
-        proposal = proposals[0];
-        assertEquals("classpath", proposal.getDisplayString());
-
-        proposals = processor.getTaskProposals("       <pr", createTestProjectElement(doc), "pr");
-        assertEquals(1, proposals.length); // is choice and already used with classpath
-        proposal = proposals[0];
-        assertEquals("property", proposal.getDisplayString());
-        
-        proposals = processor.getTaskProposals("       <fi", createTestProjectElement(doc), "fi");
-        assertEquals(5, proposals.length); // is choice and already used with classpath
-        
-        proposals = processor.getTaskProposals("          ", doc.createElement("project"), "");
-        assertEquals(22, proposals.length);
-
-        proposals = processor.getTaskProposals("          ", null, "");
-        assertEquals(1, proposals.length);
-        proposal = proposals[0];
-        assertEquals("project", proposal.getDisplayString());
-
-        proposals = processor.getTaskProposals("            jl", null, "jl");
-        assertEquals(0, proposals.length);
-
-        proposals = processor.getTaskProposals("             ", doc.createElement("projexxx"), "");
-        assertEquals(0, proposals.length);
-
-        proposals = processor.getTaskProposals("              ", doc.createElement("filelist"), "");
-        assertEquals(0, proposals.length);
-
-        // "<project><target><mk"
-        String string = "<project><target><mk";
-        proposals = processor.getTaskProposals("             <mk", processor.findParentElement(string, 0, 20), "mk");
-        assertEquals(1, proposals.length);
-        proposal = proposals[0];
-        assertEquals("mkdir", proposal.getDisplayString());
-        
-        proposals = processor.getTaskProposals("", null, "");
-        assertEquals(1, proposals.length);
-        proposal = proposals[0];
-        assertEquals("project", proposal.getDisplayString());
-
-        proposals = processor.getTaskProposals("    \n<project></project>", null, "");
-        assertEquals(1, proposals.length);
-
-    }
-
-    /**
-     * Tests the algorithm for finding a child as used by the processor.
-     */
-    public void testFindChildElement() throws ParserConfigurationException {
-        
-        // Create the test data
-        DocumentBuilder docBuilder = DocumentBuilderFactory.newInstance().newDocumentBuilder();
-        Document doc = docBuilder.newDocument();
-        Element parentElement = doc.createElement("parent");
-        Attr attribute = doc.createAttribute("att1");
-        parentElement.setAttributeNode(attribute);
-        Comment comment = doc.createComment("lakjjflsakdfj");
-        parentElement.appendChild(comment);
-        Element childElement = doc.createElement("child");
-        parentElement.appendChild(childElement);
-        childElement = doc.createElement("secondchild");
-        parentElement.appendChild(childElement);
-        
-        // Create the processor
-        TestTextCompletionProcessor processor = new TestTextCompletionProcessor();
-        
-        // Test it!
-        childElement = processor.findChildElementNamedOf(parentElement, "jkl");
-        assertNull(childElement);
-        childElement = processor.findChildElementNamedOf(parentElement, "secondchild");
-        assertNotNull(childElement);
-        assertEquals("secondchild", childElement.getTagName());
-    }
-    
-    
-    private Element createTestProjectElement(Document aDocument) throws ParserConfigurationException {
-        Element parentElement = aDocument.createElement("project");
-        Element childElement = aDocument.createElement("property");
-        parentElement.appendChild(childElement);
-        Element classpathElement = aDocument.createElement("classpath");
-        childElement.appendChild(classpathElement);
-        
-        return parentElement;
-    }
-
-    private Element createTestPropertyElement(Document aDocument) {
-        Element childElement = aDocument.createElement("property");
-        Element classpathElement = aDocument.createElement("classpath");
-        childElement.appendChild(classpathElement);
-
-        return childElement;
-    }
-    
-    /**
-     * Tests how the processor determines the proposal mode.
-     */
-    public void testDeterminingProposalMode() throws IOException {
-        TestTextCompletionProcessor processor = new TestTextCompletionProcessor();
-
-        // Modes:
-        // 0 None
-        // 1 Task Proposal
-        // 2 Attribute Proposal
-        // 3 Task Closing Proposal
-        // 4 Attribute Value Proposal
-        // 5 Property Proposal
-        
-        int mode = processor.determineProposalMode("<project><property ta", 21, "ta");
-        assertEquals(2, mode);
-        mode = processor.determineProposalMode("<project><property ", 19, "");
-        assertEquals(2, mode);
-        // (T) has to be implemented still
-        mode = processor.determineProposalMode("<project><property   ", 21, "");
-        assertEquals(2, mode);
-        mode = processor.determineProposalMode("<project><prop", 14, "prop");
-        assertEquals(1, mode);
-        mode = processor.determineProposalMode("<project><prop bla", 18, "bla");
-        assertEquals(0, mode); // task not known
-        mode = processor.determineProposalMode("<project> hjk", 13, "");
-        assertEquals(0, mode);
-        mode = processor.determineProposalMode("<project> hjk<", 14, "");
-        assertEquals(1, mode); // allow this case though it is not valid with Ant
-        mode = processor.determineProposalMode("<project>", 9, "");
-        assertEquals(1, mode);
-        mode = processor.determineProposalMode("<project> ", 10, "");
-        assertEquals(1, mode);
-        mode = processor.determineProposalMode("<project></", 11, "");
-        assertEquals(3, mode);
-        mode = processor.determineProposalMode("<project>< </project>", 10, "");
-        assertEquals(1, mode);
-        mode = processor.determineProposalMode("<property id=\"hu\" ", 18, "");
-        assertEquals(2, mode);
-        mode = processor.determineProposalMode("<property id=\"hu\" \r\n ", 21, "");
-        assertEquals(2, mode);
-        mode = processor.determineProposalMode("<property\n", 10, "");
-        assertEquals(2, mode);
-        mode = processor.determineProposalMode("<property id=\"\" \r\n ", 14, "");
-        assertEquals(4, mode);
-        mode = processor.determineProposalMode("<target name=\"main\"><zip><size></size></zip></", 46, "");
-        assertEquals(3, mode);
-        mode = processor.determineProposalMode("<project><target name=\"$\"", 24, "");
-        assertEquals(5, mode);
-        mode = processor.determineProposalMode("<project><target name=\"${\"", 25, "");
-        assertEquals(5, mode);
-        mode = processor.determineProposalMode("<project><target name=\"${ja.bl\"", 30, "ja.bl");
-        assertEquals(5, mode);
-        mode = processor.determineProposalMode("", 0, "");
-        assertEquals(1, mode);
-    }
-
-
-    /**
-     * Tests how the prefix will be determined.
-     */
-    public void testDeterminingPrefix() {
-        TestTextCompletionProcessor processor = new TestTextCompletionProcessor();
-
-        // cursor after ${
-        String prefix = processor.getPrefixFromDocument("<project><target name=\"${}\"", 25);
-        assertEquals("", prefix);
-
-        // cursor after $
-        prefix = processor.getPrefixFromDocument("<project><target name=\"${\"", 24);
-        assertEquals("", prefix);
-
-        // cursor after ${ja.
-        prefix = processor.getPrefixFromDocument("<project><target name=\"${ja.\"", 28);
-        assertEquals("ja.", prefix);
-        
-        // cursor after <
-		prefix = processor.getPrefixFromDocument("<project><", 10);
-		assertEquals("", prefix);
-		
-		prefix = processor.getPrefixFromDocument("<project name= \"test\"><tar", 26);
-		assertEquals("tar", prefix);
-    }    
-
-
-    /**
-     * Tests parsing an XML file with the use of our AntEditorSaxDefaultHandler.
-     */
-    public void testXMLParsingWithAntEditorDefaultHandler() throws SAXException, ParserConfigurationException, IOException {
-        SAXParser parser = getSAXParser();
-
-		URL url= getClass().getResource("test1.xml");
-		File file= new File(url.getFile());
-        AntEditorSaxDefaultHandler handler = new AntEditorSaxDefaultHandler(file.getParentFile(), 4, 8);
-        InputStream stream = getClass().getResourceAsStream("test1.xml");
-		parse(stream, parser, handler, file);
-        Element element = handler.getParentElement(true);
-        assertNotNull(element);
-        assertEquals("klick", element.getTagName());
-        NodeList childNodes = element.getChildNodes();
-        assertEquals(1, childNodes.getLength());
-        assertEquals("gurgel", ((Element)childNodes.item(0)).getTagName());
-
-		url= getClass().getResource("test2.xml");
-		file= new File(url.getFile());
-        handler = new AntEditorSaxDefaultHandler(file.getParentFile(), 4, 8);
-        stream = getClass().getResourceAsStream("test2.xml");
-		parse(stream, parser, handler, file);
-        element = handler.getParentElement(false);
-        assertNotNull(element);
-        assertEquals("klick", element.getTagName());
-        childNodes = element.getChildNodes();
-        assertEquals(4, childNodes.getLength());
-        assertEquals("gurgel", ((Element)childNodes.item(0)).getTagName());
-        assertEquals("hal", ((Element)childNodes.item(1)).getTagName());
-        assertEquals("klack", ((Element)childNodes.item(2)).getTagName());
-        assertEquals("humpf", ((Element)childNodes.item(3)).getTagName());
-
-		url= getClass().getResource("test3.xml");
-		file= new File(url.getFile());
-        handler = new AntEditorSaxDefaultHandler(file.getParentFile(), 3, 1);
-        stream = getClass().getResourceAsStream("test3.xml");
-		parse(stream, parser, handler, file);
-        element = handler.getParentElement(true);
-        assertNotNull(element);
-        assertEquals("bla", element.getTagName());
-
-		url= getClass().getResource("test4.xml");
-		file= new File(url.getFile());
-        handler = new AntEditorSaxDefaultHandler(file.getParentFile(), 0, 46);
-        stream = getClass().getResourceAsStream("test4.xml");
-		parse(stream, parser, handler, file);
-        element = handler.getParentElement(true);
-        assertNotNull(element);
-        assertEquals("target", element.getTagName());
-    }
-    
-    
-	/**
-	 * Returns the content of the specified file as <code>String</code>.
-	 */
-	private String getFileContentAsString(File aFile) throws FileNotFoundException {
-        InputStream stream = new FileInputStream(aFile);
-        InputStreamReader reader = new InputStreamReader(stream);
-        BufferedReader bufferedReader = new BufferedReader(reader);
-
-        String result = "";
-        try {
-            String line= bufferedReader.readLine();
-        
-            while(line != null) {
-                result += "\n";
-                result += line;
-                line = bufferedReader.readLine();
-            }
-        } catch (IOException e) {
-            e.printStackTrace();
-            return null;
-        }
-		return result;
-	}
-
-
-    public static Test suite() {
-        return new TestSuite(CodeCompletionTest.class);
-    }
-    
-	private SAXParser getSAXParser() throws SAXException {
-		SAXParser parser = parser = new SAXParser();
-		parser.setFeature("http://xml.org/sax/features/namespaces", false); //$NON-NLS-1$
-		return parser;
-	}
-
-	private void parse(InputStream stream, SAXParser parser, AntEditorSaxDefaultHandler handler, File editedFile) {
-		InputSource inputSource= new InputSource(stream);
-		if (editedFile != null) {
-			//needed for resolving relative external entities
-			inputSource.setSystemId(editedFile.getAbsolutePath());
-		}
-
-		parser.setContentHandler(handler);
-		parser.setDTDHandler(handler);
-		parser.setEntityResolver(handler);
-		parser.setErrorHandler(handler);
-		try {
-			parser.parse(inputSource);
-		} catch (SAXException e) {
-		} catch (IOException e) {
-		}
-	}
-}
diff --git a/ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ui/externaltools/internal/ant/editor/test/EnclosingTargetSearchingHandlerTest.java b/ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ui/externaltools/internal/ant/editor/test/EnclosingTargetSearchingHandlerTest.java
deleted file mode 100644
index 2ccac6e..0000000
--- a/ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ui/externaltools/internal/ant/editor/test/EnclosingTargetSearchingHandlerTest.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2003 GEBIT Gesellschaft fuer EDV-Beratung
- * und Informatik-Technologien mbH, 
- * Berlin, Duesseldorf, Frankfurt (Germany) and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     GEBIT Gesellschaft fuer EDV-Beratung und Informatik-Technologien mbH - initial implementation
- * 	   IBM Corporation - additional tests
- *******************************************************************************/
-
-package org.eclipse.ui.externaltools.internal.ant.editor.test;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-
-import javax.xml.parsers.ParserConfigurationException;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.apache.xerces.parsers.SAXParser;
-import org.eclipse.ant.ui.internal.editor.EnclosingTargetSearchingHandler;
-import org.w3c.dom.Element;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-
-/**
- * Tests the parsing using the EnclosingTargetSearchingHandler.
- * 
- * @version 19.11.2002
- * @author Alf Schiefelbein
- */
-public class EnclosingTargetSearchingHandlerTest extends TestCase {
-
-    /**
-     * Constructor for EnclosingTargetSearchingHandlerTest.
-     * @param name
-     */
-    public EnclosingTargetSearchingHandlerTest(String name) {
-        super(name);
-    }
-
-
-	/**
-	 * The test suite.
-	 */
-    public static Test suite() {
-        TestSuite suite = new TestSuite("EnclosingTargetSearchingHandlerTest");
-        
-        suite.addTest(new EnclosingTargetSearchingHandlerTest("testParsingOfBuildFileWithTargetElement"));
-        suite.addTest(new EnclosingTargetSearchingHandlerTest("testParsingOfBuildFileWithoutTargetElement"));
-        suite.addTest(new EnclosingTargetSearchingHandlerTest("testParsingOfEmptyBuildFile"));
-        return suite;
-    }
-	
-    
-    /**
-     * Tests parsing an XML file with the use of our EnclosingTargetSearchingHandler.
-     */
-    public void testParsingOfBuildFileWithoutTargetElement() throws SAXException, IOException, ParserConfigurationException {
-        SAXParser parser = getSAXParser();
-		URL url= getClass().getResource("test1.xml");
-		File file= new File(url.getFile());
-        EnclosingTargetSearchingHandler handler = new EnclosingTargetSearchingHandler(file.getParentFile(), 4, 8);
-        InputStream stream = getClass().getResourceAsStream("test1.xml");
-		parse(stream, parser, handler, file);
-		
-        Element element = handler.getParentElement(false);
-        assertNull(element);
-        element = handler.getParentElement(true);
-        assertNull(element);
-
-		handler = new EnclosingTargetSearchingHandler(file.getParentFile(), 2, 0);
-        stream = getClass().getResourceAsStream("test1.xml");
-		parse(stream, parser, handler, file);
-        element = handler.getParentElement(false);
-        assertNull(element);
-        element = handler.getParentElement(true);
-        assertNull(element);
-
-        handler = new EnclosingTargetSearchingHandler(file.getParentFile(), 0, 0);
-        stream = getClass().getResourceAsStream("test1.xml");
-		parse(stream, parser, handler, file);
-		
-        element = handler.getParentElement(false);
-        assertNull(element);
-        element = handler.getParentElement(true);
-        assertNull(element);
-    }
-    
-    /**
-     * Tests parsing an XML file with the use of our EnclosingTargetSearchingHandler.
-     */
-    public void testParsingOfBuildFileWithTargetElement() throws SAXException, ParserConfigurationException, IOException {
-        SAXParser parser = getSAXParser();
-		URL url= getClass().getResource("russianbuild.xml");
-		File file= new File(url.getFile());
-        EnclosingTargetSearchingHandler handler = new EnclosingTargetSearchingHandler(file.getParentFile(), 5, 5);
-        InputStream stream = getClass().getResourceAsStream("russianbuild.xml");
-		parse(stream, parser, handler, file);
-        Element element = handler.getParentElement(false);
-        assertNotNull(element);
-		assertEquals("target", element.getTagName());
-        element = handler.getParentElement(true);
-        assertNotNull(element);
-		assertEquals("target", element.getTagName());
-		assertEquals("init", element.getAttribute("name"));
-
-        handler = new EnclosingTargetSearchingHandler(file.getParentFile(), 7, 0);
-        stream = getClass().getResourceAsStream("russianbuild.xml");
-		parse(stream, parser, handler, file);
-        element = handler.getParentElement(false);
-        assertNull(element);
-        element = handler.getParentElement(true);
-        assertNull(element);
-
-        handler = new EnclosingTargetSearchingHandler(file.getParentFile(), 0, 0);
-        stream = getClass().getResourceAsStream("russianbuild.xml");
-		parse(stream, parser, handler, file);
-        element = handler.getParentElement(false);
-        assertNull(element);
-        element = handler.getParentElement(true);
-        assertNull(element);
-    }
-    
-    /**
-     * Tests parsing an XML file with the use of our EnclosingTargetSearchingHandler.
-     */
-    public void testParsingOfEmptyBuildFile() throws SAXException, ParserConfigurationException, IOException {
-		URL url= getClass().getResource("projectOnly.xml");
-		File file= new File(url.getFile());
-        EnclosingTargetSearchingHandler handler = new EnclosingTargetSearchingHandler(file.getParentFile(), 0, 0);
-        InputStream stream = getClass().getResourceAsStream("projectOnly.xml");
-        parse(stream, getSAXParser(), handler, file);
-        Element element = handler.getParentElement(false);
-        assertNull(element);
-        element = handler.getParentElement(true);
-        assertNull(element);
-    }
-    
-	private SAXParser getSAXParser() throws SAXException {
-		SAXParser parser = parser = new SAXParser();
-		parser.setFeature("http://xml.org/sax/features/namespaces", false); //$NON-NLS-1$
-		return parser;
-	}
-	
-	private void parse(InputStream stream, SAXParser parser, EnclosingTargetSearchingHandler handler, File editedFile) {
-		InputSource inputSource= new InputSource(stream);
-		if (editedFile != null) {
-			//needed for resolving relative external entities
-			inputSource.setSystemId(editedFile.getAbsolutePath());
-		}
-	
-		parser.setContentHandler(handler);
-		parser.setDTDHandler(handler);
-		parser.setEntityResolver(handler);
-		parser.setErrorHandler(handler);
-		try {
-			parser.parse(inputSource);
-		} catch (SAXException e) {
-		} catch (IOException e) {
-		}
-	}
-}
\ No newline at end of file
diff --git a/ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ui/externaltools/internal/ant/editor/test/TaskDescriptionProviderTest.java b/ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ui/externaltools/internal/ant/editor/test/TaskDescriptionProviderTest.java
deleted file mode 100644
index 44b1902..0000000
--- a/ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ui/externaltools/internal/ant/editor/test/TaskDescriptionProviderTest.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2003 GEBIT Gesellschaft fuer EDV-Beratung
- * und Informatik-Technologien mbH, 
- * Berlin, Duesseldorf, Frankfurt (Germany).
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     GEBIT Gesellschaft fuer EDV-Beratung und Informatik-Technologien mbH - initial implementation
- *******************************************************************************/
-
-package org.eclipse.ui.externaltools.internal.ant.editor.test;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.ant.ui.internal.editor.TaskDescriptionProvider;
-
-/**
- * Tests the tasks description provider.
- * 
- */
-public class TaskDescriptionProviderTest extends TestCase {
-
-    /**
-     * Constructor for TaskDescriptionProviderTest.
-     * @param arg0
-     */
-    public TaskDescriptionProviderTest(String arg0) {
-        super(arg0);
-    }
-
-    /** 
-     * Tests getting the description of a task.
-     */
-    public void testGettingTaskDescription() {
-        TaskDescriptionProvider provider = new TaskDescriptionProvider();
-        String description = provider.getDescriptionForTask("apply");
-        assertNotNull(description);
-        assertTrue(description.length() > 0);
-    }
-
-    /**
-     * Tests getting the description of an attribute.
-     */
-    public void testGettingAttribute() {
-        TaskDescriptionProvider provider = new TaskDescriptionProvider();
-        String description = provider.getDescriptionForTaskAttribute("apply", "executable");
-        assertNotNull(description);
-        assertTrue(description.length() > 0);
-    }
-    
-    /**
-     * Tests getting the required value of an attribute.
-     */
-    public void testGettingRequired() {
-        TaskDescriptionProvider provider = new TaskDescriptionProvider();
-        String required = provider.getRequiredAttributeForTaskAttribute("apply", "executable");
-        assertNotNull(required);
-        assertEquals("yes", required);
-    }
-
-    public static Test suite() {
-        TestSuite suite = new TestSuite("TaskDescriptionProviderTest");
-
-        suite.addTest(new TaskDescriptionProviderTest("testGettingAttribute"));
-        suite.addTest(new TaskDescriptionProviderTest("testGettingRequired"));
-        suite.addTest(new TaskDescriptionProviderTest("testGettingTaskDescription"));
-        return suite;
-    }
-}
diff --git a/ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ui/externaltools/internal/ant/editor/test/build.Cp1251.xml b/ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ui/externaltools/internal/ant/editor/test/build.Cp1251.xml
deleted file mode 100644
index 2ddbf52..0000000
--- a/ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ui/externaltools/internal/ant/editor/test/build.Cp1251.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="windows-1251"?>

-<project name="test" basedir=".">

-

-     <target name="init">

-          <!-- displays Hello in Russian -->

-          <echo message="Çäðàâñòâóéòå"/>

-     </target>

-

-

-</project>

diff --git a/ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ui/externaltools/internal/ant/editor/test/build.UTF8.xml b/ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ui/externaltools/internal/ant/editor/test/build.UTF8.xml
deleted file mode 100644
index 4494321..0000000
--- a/ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ui/externaltools/internal/ant/editor/test/build.UTF8.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<project name="test" basedir=".">

-

-     <target name="init">

-          <!-- displays Hello in Russian -->

-          <echo message="Здравствуйте"/>

-     </target>

-

-</project>

diff --git a/ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ui/externaltools/internal/ant/editor/test/buildsWithSpecialEncoding.zip b/ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ui/externaltools/internal/ant/editor/test/buildsWithSpecialEncoding.zip
deleted file mode 100644
index 9d8197a..0000000
--- a/ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ui/externaltools/internal/ant/editor/test/buildsWithSpecialEncoding.zip
+++ /dev/null
Binary files differ
diff --git a/ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ui/externaltools/internal/ant/editor/test/buildtest1.properties b/ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ui/externaltools/internal/ant/editor/test/buildtest1.properties
deleted file mode 100644
index a528725..0000000
--- a/ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ui/externaltools/internal/ant/editor/test/buildtest1.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-prop1=val1

-prop2 = val2

diff --git a/ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ui/externaltools/internal/ant/editor/test/buildtest1.xml b/ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ui/externaltools/internal/ant/editor/test/buildtest1.xml
deleted file mode 100644
index a83a544..0000000
--- a/ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ui/externaltools/internal/ant/editor/test/buildtest1.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<project name="testproject" basedir="." default="main">

-	<property name="propD" value="valD" />

-    <property file="buildtest1.properties" />

-    <property name="propV" value="valV" />

-    <target name="main">

-        <property name="property_in_target" value="val"/>

-    </target>

-</project>

diff --git a/ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ui/externaltools/internal/ant/editor/test/buildtest2.xml b/ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ui/externaltools/internal/ant/editor/test/buildtest2.xml
deleted file mode 100644
index 19241a4..0000000
--- a/ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ui/externaltools/internal/ant/editor/test/buildtest2.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<project name="testproject" basedir="." default="main">

-	<property name="propD" value="valD" />

-	<property file="buildtest1.properties" />

-	<target name="main" depends="properties">

diff --git a/ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ui/externaltools/internal/ant/editor/test/dependencytest.xml b/ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ui/externaltools/internal/ant/editor/test/dependencytest.xml
deleted file mode 100644
index 0a6ecbd..0000000
--- a/ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ui/externaltools/internal/ant/editor/test/dependencytest.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<!-- Ein test case sollte die property proposals in main       -->

-<!-- Ueberpruefen, und ob die diversen properties entsprechend -->

-<!-- der dependencies gesetzt sind                             -->

-

-<project default="main">

-

-	<property name="do_init" value="val"></property>

-	

-	<target name="properties">

-		<property name="prop_prop" value="val"></property>

-		<property name="do_not_compile" value="val"></property>

-		<echo message="executing properties"></echo>

-	</target>

-

-	<!-- should never be executed since property is not set      --> 

-	<target name="additional_properties" if="do_addit_props">

-		<property name="adit_prop" value="val" />

-		<echo message="executing additional_properties"></echo>

-	</target>

-	

-	<target name="init" if="doinit" depends="properties,additional_properties">

-		<property name="init_prop" value="val"></property>

-		<echo message="executing init"></echo>

-	</target>

-	

-	<!-- should never be executed since property should be set   -->

-	<!-- by properties because of dependencies before            --> 

-	<target name="compile" unless="do_not_compile">

-		<property name="compile_prop" value="val"></property>

-		<echo message="executing compile"></echo>

-	</target>

-

-	<target name="main" depends="init, compile">

-		<property name="main_prop" value="val"></property>

-		<echo message="executing main ${well}"></echo>

-	</target>

-	

-</project>
\ No newline at end of file
diff --git a/ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ui/externaltools/internal/ant/editor/test/empty.xml b/ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ui/externaltools/internal/ant/editor/test/empty.xml
deleted file mode 100644
index e69de29..0000000
--- a/ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ui/externaltools/internal/ant/editor/test/empty.xml
+++ /dev/null
diff --git a/ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ui/externaltools/internal/ant/editor/test/outline_select_test_build.xml b/ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ui/externaltools/internal/ant/editor/test/outline_select_test_build.xml
deleted file mode 100644
index 7df0f5e..0000000
--- a/ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ui/externaltools/internal/ant/editor/test/outline_select_test_build.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="org.eclipse.ui.externaltools.internal.ant.editor" default="zip.plugin" basedir=".">
-	<target name="init" depends="properties">
-	    <property file="build.properties" />
-		<property name="version.suffix" value="_0.4.5" />
-		<property name="plugins_dir" value="${eclipse_dir}/plugins" />
-		<property name="plugin" value="org.eclipse.ui.externaltools.internal.ant.editor" />
-		<property name="full.name" value="${plugin}${version.suffix}" />
-		<property name="temp.folder" value="${basedir}/temp.folder" />
-		<property name="plugin.destination" value="${basedir}" />
-		<property name="build.result.folder" value="${basedir}" />
-		<property name="source.antEditor.jar" value="src/" />
-		<echo message="Value is ${plugins_dir}" />
-	</target>
-
-	<target name="properties" if="eclipse.running">
-		<property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter"/>
-	</target>
-
-</project>
diff --git a/ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ui/externaltools/internal/ant/editor/test/projectOnly.xml b/ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ui/externaltools/internal/ant/editor/test/projectOnly.xml
deleted file mode 100644
index 35ece5b..0000000
--- a/ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ui/externaltools/internal/ant/editor/test/projectOnly.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
-<project ></project>
\ No newline at end of file
diff --git a/ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ui/externaltools/internal/ant/editor/test/russianbuild.xml b/ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ui/externaltools/internal/ant/editor/test/russianbuild.xml
deleted file mode 100644
index 172e2aa..0000000
--- a/ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ui/externaltools/internal/ant/editor/test/russianbuild.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="windows-1251"?>

-<project name="test" basedir=".">

-

-	<target name="init">

-		<!-- displays Hello in Russian -->

-		<echo message="Çäðàâñòâóéòå"/>

-	</target>

-</project>
\ No newline at end of file
diff --git a/ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ui/externaltools/internal/ant/editor/test/test1.xml b/ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ui/externaltools/internal/ant/editor/test/test1.xml
deleted file mode 100644
index 84992dc..0000000
--- a/ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ui/externaltools/internal/ant/editor/test/test1.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-

-<bla>

-  <blub></blub>

-  <klick>

-    <gurgel></gurgel>

-    <hal

-    <klack/>

-    <humpf/>

-  </klick>

-</bla>
\ No newline at end of file
diff --git a/ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ui/externaltools/internal/ant/editor/test/test2.xml b/ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ui/externaltools/internal/ant/editor/test/test2.xml
deleted file mode 100644
index 607310b..0000000
--- a/ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ui/externaltools/internal/ant/editor/test/test2.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<bla>

-  <blub></blub>

-  <klick>

-    <gurgel></gurgel>

-    <hal></hal>

-    <klack/>

-    <humpf/>

-  </klick>

-</bla>
\ No newline at end of file
diff --git a/ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ui/externaltools/internal/ant/editor/test/test3.xml b/ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ui/externaltools/internal/ant/editor/test/test3.xml
deleted file mode 100644
index c28e4e9..0000000
--- a/ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ui/externaltools/internal/ant/editor/test/test3.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<bla>

-  <blub>

-  </blub>

-</

diff --git a/ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ui/externaltools/internal/ant/editor/test/test4.xml b/ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ui/externaltools/internal/ant/editor/test/test4.xml
deleted file mode 100644
index fd60f79..0000000
--- a/ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ui/externaltools/internal/ant/editor/test/test4.xml
+++ /dev/null
@@ -1 +0,0 @@
-<target name="main"><mk
\ No newline at end of file
diff --git a/ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ui/externaltools/internal/ant/editor/test/test5.xml b/ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ui/externaltools/internal/ant/editor/test/test5.xml
deleted file mode 100644
index 3a4d93a..0000000
--- a/ant/org.eclipse.ant.tests.ui/Ant Editor Tests/org/eclipse/ui/externaltools/internal/ant/editor/test/test5.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<project name="main">

-	<target name="bla" />

-	<property name="prop1" value="val1"/>

-	<property name="prop2" value="val2"/>

-	<property name="prop3" value="val3"/>

-<g
\ No newline at end of file
diff --git a/ant/org.eclipse.ant.tests.ui/Ant View Tests/AntView Ext Dir Test Example/.project b/ant/org.eclipse.ant.tests.ui/Ant View Tests/AntView Ext Dir Test Example/.project
deleted file mode 100644
index 7faea71..0000000
--- a/ant/org.eclipse.ant.tests.ui/Ant View Tests/AntView Ext Dir Test Example/.project
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>AntView ExtDir Test</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-	</buildSpec>
-	<natures>
-	</natures>
-</projectDescription>
diff --git a/ant/org.eclipse.ant.tests.ui/Ant View Tests/AntView Ext Dir Test Example/build.xml b/ant/org.eclipse.ant.tests.ui/Ant View Tests/AntView Ext Dir Test Example/build.xml
deleted file mode 100644
index a733ad3..0000000
--- a/ant/org.eclipse.ant.tests.ui/Ant View Tests/AntView Ext Dir Test Example/build.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="External Dir Test" basedir="." default="test-one">       
-    <target name="init">
-       <echo message="Init"/>
-    </target>
-    <target name="test-one" depends="init,test-two">
-       <echo message="One - multiple dependents"/>
-    </target>
-    <target name="test-two" depends="init,test-three">
-       <echo message="Two - similar dependencies"/>
-    </target>
-    <target name="test-three">
-       <echo message="Three - simple"/>
-    </target>
-</project>
\ No newline at end of file
diff --git a/ant/org.eclipse.ant.tests.ui/Ant View Tests/AntView Ext Dir Test Example/readme.txt b/ant/org.eclipse.ant.tests.ui/Ant View Tests/AntView Ext Dir Test Example/readme.txt
deleted file mode 100644
index d43b15a..0000000
--- a/ant/org.eclipse.ant.tests.ui/Ant View Tests/AntView Ext Dir Test Example/readme.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-
-Create a new simple project with project directory outside ECLIPSE_HOME
- 
-import this directory.
\ No newline at end of file
diff --git a/ant/org.eclipse.ant.tests.ui/Ant View Tests/AntView Java Test/.classpath b/ant/org.eclipse.ant.tests.ui/Ant View Tests/AntView Java Test/.classpath
deleted file mode 100644
index 24fb488..0000000
--- a/ant/org.eclipse.ant.tests.ui/Ant View Tests/AntView Java Test/.classpath
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-    <classpathentry kind="src" path=""/>
-    <classpathentry kind="var" path="JRE_LIB" rootpath="JRE_SRCROOT" sourcepath="JRE_SRC"/>
-    <classpathentry kind="output" path=""/>
-</classpath>
diff --git a/ant/org.eclipse.ant.tests.ui/Ant View Tests/AntView Java Test/.project b/ant/org.eclipse.ant.tests.ui/Ant View Tests/AntView Java Test/.project
deleted file mode 100644
index 4ad8ae9..0000000
--- a/ant/org.eclipse.ant.tests.ui/Ant View Tests/AntView Java Test/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>AntView Java Test</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/ant/org.eclipse.ant.tests.ui/Ant View Tests/AntView Java Test/bin.log b/ant/org.eclipse.ant.tests.ui/Ant View Tests/AntView Java Test/bin.log
deleted file mode 100644
index e3b4fe5..0000000
--- a/ant/org.eclipse.ant.tests.ui/Ant View Tests/AntView Java Test/bin.log
+++ /dev/null
@@ -1,2 +0,0 @@
-Compiled 13 lines in 991 ms (13.1 lines/s)

-1 .class file generated
\ No newline at end of file
diff --git a/ant/org.eclipse.ant.tests.ui/Ant View Tests/AntView Java Test/bin/main.class b/ant/org.eclipse.ant.tests.ui/Ant View Tests/AntView Java Test/bin/main.class
deleted file mode 100644
index 820d96c..0000000
--- a/ant/org.eclipse.ant.tests.ui/Ant View Tests/AntView Java Test/bin/main.class
+++ /dev/null
Binary files differ
diff --git a/ant/org.eclipse.ant.tests.ui/Ant View Tests/AntView Java Test/build.xml b/ant/org.eclipse.ant.tests.ui/Ant View Tests/AntView Java Test/build.xml
deleted file mode 100644
index 7aab352..0000000
--- a/ant/org.eclipse.ant.tests.ui/Ant View Tests/AntView Java Test/build.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="Java Compile Test" basedir="." default="compile">       
-	<target name="properties" if="eclipse.running">
-		<property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter"/>
-	</target>
-	<target name="compile" depends="properties,env">
-	   <javac destdir="bin" failonerror="false" verbose="true" debug="on" includeAntRuntime="no">
-			<src path="src/"/>
-	   </javac>
-	</target>
-
-    <target name="clean"> 
-       <delete file="bin/main.class"/>
-    </target>
-    
-    <target name="env">
-       <echo> 
-           System Properties
-           -----------------
-           java.version: ${java.version}
-           java.vendor: ${java.vendor}
-           java.home: ${java.home}
-           java.class.path: ${java.class.path}
-           java.ext.dirs: ${java.ext.dirs}
-           os.name: ${os.name}
-           os.arch: ${os.arch}
-           os.version: ${os.version}
-           user.name: ${user.name}                
-           
-           Ant Environment
-           ----------------
-           basedir: ${basedir}
-           ant.file: ${ant.file}
-           ant.version: ${ant.version}
-           ant.project.name: ${ant.project.name}
-           ant.java.version: ${ant.java.version}
-           build.compiler: ${build.compiler}
-      </echo>
-    </target>
-</project>
\ No newline at end of file
diff --git a/ant/org.eclipse.ant.tests.ui/Ant View Tests/AntView Java Test/src/main.class b/ant/org.eclipse.ant.tests.ui/Ant View Tests/AntView Java Test/src/main.class
deleted file mode 100644
index 7ccc9b4..0000000
--- a/ant/org.eclipse.ant.tests.ui/Ant View Tests/AntView Java Test/src/main.class
+++ /dev/null
Binary files differ
diff --git a/ant/org.eclipse.ant.tests.ui/Ant View Tests/AntView Java Test/src/main.java b/ant/org.eclipse.ant.tests.ui/Ant View Tests/AntView Java Test/src/main.java
deleted file mode 100644
index c5ab5b8..0000000
--- a/ant/org.eclipse.ant.tests.ui/Ant View Tests/AntView Java Test/src/main.java
+++ /dev/null
@@ -1,13 +0,0 @@
-/**
- * @author roscoe.m.rush
- *
- * To change this generated comment edit the template variable "typecomment":
- * Window>Preferences>Java>Templates.
- * To enable and disable the creation of type comments go to
- * Window>Preferences>Java>Code Generation.
- */
-public class main {
-	public  main() {
-        System.out.println("Hello World!\n");
-	}
-}
diff --git a/ant/org.eclipse.ant.tests.ui/Ant View Tests/AntView Test/.project b/ant/org.eclipse.ant.tests.ui/Ant View Tests/AntView Test/.project
deleted file mode 100644
index 04e9dfb..0000000
--- a/ant/org.eclipse.ant.tests.ui/Ant View Tests/AntView Test/.project
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>AntView Test</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-	</buildSpec>
-	<natures>
-	</natures>
-</projectDescription>
diff --git a/ant/org.eclipse.ant.tests.ui/Ant View Tests/AntView Test/Buildfile Error/build.xml b/ant/org.eclipse.ant.tests.ui/Ant View Tests/AntView Test/Buildfile Error/build.xml
deleted file mode 100644
index 89df62b..0000000
--- a/ant/org.eclipse.ant.tests.ui/Ant View Tests/AntView Test/Buildfile Error/build.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="AntView Test.01" basedir="." default="test-one">       
-    <target name="init">
-       <echo message="Init"/>
-    </target>
-    <target name="test-one" depends="init,test-two">
-       <echo message="One - multiple dependents"/>
-    </target>
-    <target name="test-two" depends="init,test-three" description="description of test-two">
-       <echo message="Two - similar dependencies"/>
-    </target>
-    <target name="test-three" description="description of test-three">
-       <echo message="Three - simple"/>
-    </target>
-    <target name="env"
-       <echo>
-           Shell Environment
-           -----------------
-           ANT_HOME: ${e.ANT_HOME}
-           JAVA_HOME: ${e.JAVA_HOME}
-           CLASSPATH: ${e.CLASSPATH}
-      
-           System Properties
-           -----------------
-           java.version: ${java.version}
-           java.vendor: ${java.vendor}
-           java.home: ${java.home}
-           java.class.path: ${java.class.path}
-           java.ext.dirs: ${java.ext.dirs}
-           os.name: ${os.name}
-           os.arch: ${os.arch}
-           os.version: ${os.version}
-           user.name: ${user.name}                
-           
-           Ant Environment
-           ----------------
-           basedir: ${basedir}
-           ant.file: ${ant.file}
-           ant.version: ${ant.version}
-           ant.project.name: ${ant.project.name}
-           ant.java.version: ${ant.java.version}
-      </echo>
-    </target>
-</project>
\ No newline at end of file
diff --git a/ant/org.eclipse.ant.tests.ui/Ant View Tests/AntView Test/Custom Build filename/customBuild.xml b/ant/org.eclipse.ant.tests.ui/Ant View Tests/AntView Test/Custom Build filename/customBuild.xml
deleted file mode 100644
index 040c975..0000000
--- a/ant/org.eclipse.ant.tests.ui/Ant View Tests/AntView Test/Custom Build filename/customBuild.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="Custom build filename" basedir="." default="test-one">       
-    <target name="init">
-       <echo message="Init"/>
-    </target>
-    <target name="test-one" depends="init,test-two">
-       <echo message="One - multiple dependents"/>
-    </target>
-    <target name="test-two" depends="init,test-three" description="description of test-two">
-       <echo message="Two - similar dependencies"/>
-    </target>
-    <target name="test-three" description="description of test-three">
-       <echo message="Three - simple"/>
-    </target>
-    <target name="env">
-       <echo>
-           System Properties
-           -----------------
-           java.version: ${java.version}
-           java.vendor: ${java.vendor}
-           java.home: ${java.home}
-           java.class.path: ${java.class.path}
-           java.ext.dirs: ${java.ext.dirs}
-           os.name: ${os.name}
-           os.arch: ${os.arch}
-           os.version: ${os.version}
-           user.name: ${user.name}                
-           
-           Ant Environment
-           ----------------
-           basedir: ${basedir}
-           ant.file: ${ant.file}
-           ant.version: ${ant.version}
-           ant.project.name: ${ant.project.name}
-           ant.java.version: ${ant.java.version}
-           build.compiler: ${build.compiler}
-      </echo>
-    </target>
-</project>
\ No newline at end of file
diff --git a/ant/org.eclipse.ant.tests.ui/Ant View Tests/AntView Test/Missing default target/build.xml b/ant/org.eclipse.ant.tests.ui/Ant View Tests/AntView Test/Missing default target/build.xml
deleted file mode 100644
index af8e4c3..0000000
--- a/ant/org.eclipse.ant.tests.ui/Ant View Tests/AntView Test/Missing default target/build.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="Missing Project default test" basedir=".">       
-    <target name="env">
-       <echo>    
-           System Properties
-           -----------------
-           java.version: ${java.version}
-           java.vendor: ${java.vendor}
-           java.home: ${java.home}
-           java.class.path: ${java.class.path}
-           java.ext.dirs: ${java.ext.dirs}
-           os.name: ${os.name}
-           os.arch: ${os.arch}
-           os.version: ${os.version}
-           user.name: ${user.name}                
-           
-           Ant Environment
-           ----------------
-           basedir: ${basedir}
-           ant.file: ${ant.file}
-           ant.version: ${ant.version}
-           ant.project.name: ${ant.project.name}
-           ant.java.version: ${ant.java.version}
-           build.compiler: ${build.compiler}
-      </echo>
-    </target>
-</project>
\ No newline at end of file
diff --git a/ant/org.eclipse.ant.tests.ui/Ant View Tests/AntView Test/Missing project element/build.xml b/ant/org.eclipse.ant.tests.ui/Ant View Tests/AntView Test/Missing project element/build.xml
deleted file mode 100644
index cdfbda2..0000000
--- a/ant/org.eclipse.ant.tests.ui/Ant View Tests/AntView Test/Missing project element/build.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<missingproject name="Missing project element" basedir="." default="env">       
-    <target name="env">
-       <echo>    
-           System Properties
-           -----------------
-           java.version: ${java.version}
-           java.vendor: ${java.vendor}
-           java.home: ${java.home}
-           java.class.path: ${java.class.path}
-           java.ext.dirs: ${java.ext.dirs}
-           os.name: ${os.name}
-           os.arch: ${os.arch}
-           os.version: ${os.version}
-           user.name: ${user.name}                
-           
-           Ant Environment
-           ----------------
-           basedir: ${basedir}
-           ant.file: ${ant.file}
-           ant.version: ${ant.version}
-           ant.project.name: ${ant.project.name}
-           ant.java.version: ${ant.java.version}
-           build.compiler: ${build.compiler}
-      </echo>
-    </target>
-</missingproject>
\ No newline at end of file
diff --git a/ant/org.eclipse.ant.tests.ui/Ant View Tests/AntView Test/Missing project name/build.xml b/ant/org.eclipse.ant.tests.ui/Ant View Tests/AntView Test/Missing project name/build.xml
deleted file mode 100644
index 530fe65..0000000
--- a/ant/org.eclipse.ant.tests.ui/Ant View Tests/AntView Test/Missing project name/build.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project basedir="." default="env">       
-    <target name="env">
-       <echo>    
-           System Properties
-           -----------------
-           java.version: ${java.version}
-           java.vendor: ${java.vendor}
-           java.home: ${java.home}
-           java.class.path: ${java.class.path}
-           java.ext.dirs: ${java.ext.dirs}
-           os.name: ${os.name}
-           os.arch: ${os.arch}
-           os.version: ${os.version}
-           user.name: ${user.name}                
-           
-           Ant Environment
-           ----------------
-           basedir: ${basedir}
-           ant.file: ${ant.file}
-           ant.version: ${ant.version}
-           ant.project.name: ${ant.project.name}
-           ant.java.version: ${ant.java.version}
-           build.compiler: ${build.compiler}
-      </echo>
-    </target>
-</project>
\ No newline at end of file
diff --git a/ant/org.eclipse.ant.tests.ui/Ant View Tests/AntView Test/Similar Dependencies/build.xml b/ant/org.eclipse.ant.tests.ui/Ant View Tests/AntView Test/Similar Dependencies/build.xml
deleted file mode 100644
index 8c5c650..0000000
--- a/ant/org.eclipse.ant.tests.ui/Ant View Tests/AntView Test/Similar Dependencies/build.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="Similiar dependencies" basedir="." default="test-one">       
-    <target name="init">
-       <echo message="Init"/>
-    </target>
-    <target name="test-one" depends="init,test-two">
-       <echo message="One - multiple dependents"/>
-    </target>
-    <target name="test-two" depends="init,test-three" description="description of test-two">
-       <echo message="Two - similar dependencies"/>
-    </target>
-    <target name="test-three" description="description of test-three">
-       <echo message="Three - simple"/>
-    </target>
-</project>
\ No newline at end of file
diff --git a/ant/org.eclipse.ant.tests.ui/Ant View Tests/AntView Test/Simple Dependency/build.xml b/ant/org.eclipse.ant.tests.ui/Ant View Tests/AntView Test/Simple Dependency/build.xml
deleted file mode 100644
index b21e8dd..0000000
--- a/ant/org.eclipse.ant.tests.ui/Ant View Tests/AntView Test/Simple Dependency/build.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="Simple" basedir="." default="test-a">        
-    <target name="test-a">
-       <echo message="A - no dependents"/>
-    </target>
-    <target name="test-b" depends="test-a">
-       <echo message="B - simple dependency"/>
-    </target>
-</project>
\ No newline at end of file
diff --git a/ant/org.eclipse.ant.tests.ui/about.html b/ant/org.eclipse.ant.tests.ui/about.html
deleted file mode 100644
index cde506f..0000000
--- a/ant/org.eclipse.ant.tests.ui/about.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>30th January, 2003</p>	
-<h3>License</h3>
-<p>Eclipse.org makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Common Public License Version 1.0 (&quot;CPL&quot;).  A copy of the CPL is available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>.
-For purposes of the CPL, &quot;Program&quot; will mean the Content.</p>
-
-<h3>Contributions</h3>
-
-<p>If this Content is licensed to you under the terms and conditions of the CPL, any Contributions, as defined in the CPL, uploaded, submitted, or otherwise
-made available to Eclipse.org, members of Eclipse.org and/or the host of Eclipse.org web site, by you that relate to such
-Content are provided under the terms and conditions of the CPL and can be made available to others under the terms of the CPL.</p>
-
-<p>If this Content is licensed to you under license terms and conditions other than the CPL (&quot;Other License&quot;), any modifications, enhancements and/or
-other code and/or documentation (&quot;Modifications&quot;) uploaded, submitted, or otherwise made available to Eclipse.org, members of Eclipse.org and/or the
-host of Eclipse.org, by you that relate to such Content are provided under terms and conditions of the Other License and can be made available
-to others under the terms of the Other License.  In addition, with regard to Modifications for which you are the copyright holder, you are also
-providing the Modifications under the terms and conditions of the CPL and such Modifications can be made available to others under the terms of
-the CPL.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/ant/org.eclipse.ant.tests.ui/build.properties b/ant/org.eclipse.ant.tests.ui/build.properties
deleted file mode 100644
index 7d8d0b4..0000000
--- a/ant/org.eclipse.ant.tests.ui/build.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-###############################################################################
-# Copyright (c) 2003 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Common Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/cpl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-bin.includes = plugin.xml,\
-			   plugin.properties,\
-               about.html,\
-               *.jar
-               
-source.anttestsui.jar = Ant Editor Tests/,\
-                         Ant View Tests/
diff --git a/ant/org.eclipse.ant.tests.ui/plugin.properties b/ant/org.eclipse.ant.tests.ui/plugin.properties
deleted file mode 100644
index 07228b2..0000000
--- a/ant/org.eclipse.ant.tests.ui/plugin.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-# Copyright (c) 2003 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Common Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/cpl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-pluginName=Ant UI Test Plugin
-providerName=Eclipse.org
\ No newline at end of file
diff --git a/ant/org.eclipse.ant.tests.ui/plugin.xml b/ant/org.eclipse.ant.tests.ui/plugin.xml
deleted file mode 100644
index bdbf5cb..0000000
--- a/ant/org.eclipse.ant.tests.ui/plugin.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<plugin
-   id="org.eclipse.ant.tests.ui"
-   name="%pluginName"
-   version="2.1.0"
-   provider-name="%providerName">
-   
-   <requires>
-      <import plugin="org.apache.ant"/>
-	  <import plugin="org.junit"/>   
-      <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.apache.xerces"/>
-      <import plugin="org.eclipse.jdt.core"/>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.ant.core"/>
-      <import plugin="org.eclipse.update.core"/>
-      <import plugin="org.eclipse.ui.externaltools"/>
-      <import plugin="org.eclipse.ant.ui"/>
-   </requires>
-
-<runtime>
-  <library name="anttestsui.jar" >
-     <export name = "*"/>
-  </library> 
-</runtime>
-
-</plugin>
diff --git a/ant/org.eclipse.ant.ui/.classpath b/ant/org.eclipse.ant.ui/.classpath
deleted file mode 100644
index 0e05e56..0000000
--- a/ant/org.eclipse.ant.ui/.classpath
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-    <classpathentry kind="src" path="Ant Tools Support"/>
-    <classpathentry kind="var" path="JRE_LIB" sourcepath="JRE_SRC"/>
-    <classpathentry kind="src" path="/org.eclipse.ant.core"/>
-    <classpathentry kind="src" path="/org.eclipse.jdt.launching"/>
-    <classpathentry kind="src" path="/org.eclipse.ui.externaltools"/>
-    <classpathentry kind="src" path="/org.eclipse.swt"/>
-    <classpathentry kind="src" path="/org.eclipse.debug.core"/>
-    <classpathentry kind="src" path="/org.eclipse.core.resources"/>
-    <classpathentry kind="src" path="/org.eclipse.core.runtime"/>
-    <classpathentry kind="src" path="/org.eclipse.ui"/>
-    <classpathentry kind="src" path="/org.eclipse.debug.ui"/>
-    <classpathentry kind="src" path="/org.eclipse.jdt.debug.ui"/>
-    <classpathentry kind="src" path="/org.eclipse.jdt.core"/>
-    <classpathentry kind="src" path="/org.eclipse.core.boot"/>
-    <classpathentry kind="src" path="Ant Runner Support"/>
-    <classpathentry kind="src" path="Ant Editor"/>
-    <classpathentry kind="src" path="/org.apache.ant"/>
-    <classpathentry kind="src" path="/org.apache.xerces"/>
-    <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/ant/org.eclipse.ant.ui/.cvsignore b/ant/org.eclipse.ant.ui/.cvsignore
deleted file mode 100644
index 7fd6fa8..0000000
--- a/ant/org.eclipse.ant.ui/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-bin
-lib
-temp.folder
-antui.jar
diff --git a/ant/org.eclipse.ant.ui/.externalToolBuilders/Build Ant Runner Support JAR.launch b/ant/org.eclipse.ant.ui/.externalToolBuilders/Build Ant Runner Support JAR.launch
deleted file mode 100644
index 42e548b..0000000
--- a/ant/org.eclipse.ant.ui/.externalToolBuilders/Build Ant Runner Support JAR.launch
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType">
-    <stringAttribute key="org.eclipse.ui.externaltools.ATTR_BUILD_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;
-&lt;launchConfigurationWorkingSet factoryID=&quot;org.eclipse.ui.internal.WorkingSetFactory&quot; name=&quot;workingSet&quot;&gt;&lt;item factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; path=&quot;/org.eclipse.ant.ui/Ant Runner Support&quot; type=&quot;2&quot;/&gt;&lt;item factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; path=&quot;/org.eclipse.ant.ui/buildfiles/buildExtraJAR.xml&quot; type=&quot;1&quot;/&gt;&lt;/launchConfigurationWorkingSet&gt;}"/>
-    <stringAttribute
-        key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="full,incremental,auto,"/>
-    <stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/org.eclipse.ant.ui/buildfiles/buildExtraJAR.xml}"/>
-    <stringAttribute key="org.eclipse.debug.ui.target_run_perspective" value="perspective_none"/>
-</launchConfiguration>
diff --git a/ant/org.eclipse.ant.ui/.options b/ant/org.eclipse.ant.ui/.options
deleted file mode 100644
index 3f260dc..0000000
--- a/ant/org.eclipse.ant.ui/.options
+++ /dev/null
@@ -1 +0,0 @@
-# Debugging options for the org.eclipse.ant.ui plugin.
diff --git a/ant/org.eclipse.ant.ui/.project b/ant/org.eclipse.ant.ui/.project
deleted file mode 100644
index 3c48882..0000000
--- a/ant/org.eclipse.ant.ui/.project
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ant.ui</name>
-	<comment></comment>
-	<projects>
-		<project>org.apache.ant</project>
-		<project>org.apache.xerces</project>
-		<project>org.eclipse.ant.core</project>
-		<project>org.eclipse.core.boot</project>
-		<project>org.eclipse.core.resources</project>
-		<project>org.eclipse.core.runtime</project>
-		<project>org.eclipse.debug.core</project>
-		<project>org.eclipse.debug.ui</project>
-		<project>org.eclipse.jdt.core</project>
-		<project>org.eclipse.jdt.debug.ui</project>
-		<project>org.eclipse.jdt.launching</project>
-		<project>org.eclipse.swt</project>
-		<project>org.eclipse.ui</project>
-		<project>org.eclipse.ui.externaltools</project>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
-			<arguments>
-				<dictionary>
-					<key>LaunchConfigHandle</key>
-					<value>&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;
-&lt;launchConfiguration local=&quot;false&quot; path=&quot;/org.eclipse.ant.ui/.externalToolBuilders/Build Ant Runner Support JAR.launch&quot;/&gt;
-</value>
-				</dictionary>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.team.cvs.core.cvsnature</nature>
-		<nature>org.eclipse.pde.PluginNature</nature>
-	</natures>
-</projectDescription>
diff --git a/ant/org.eclipse.ant.ui/Ant Editor Content Assist Dev/XDOCtasks.xml b/ant/org.eclipse.ant.ui/Ant Editor Content Assist Dev/XDOCtasks.xml
deleted file mode 100644
index b82075e..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor Content Assist Dev/XDOCtasks.xml
+++ /dev/null
@@ -1,18688 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<tasks>
-<task name="ant" category="control"
-      classname="org.apache.tools.ant.taskdefs.Ant"
-      >
-
-  <short-description><![CDATA[Build a sub-project.]]></short-description>
-  <description>
-    <![CDATA[Build a sub-project.
-
-  <pre>
-  &lt;target name=&quot;foo&quot; depends=&quot;init&quot;&gt;
-    &lt;ant antfile=&quot;build.xml&quot; target=&quot;bar&quot; &gt;
-      &lt;property name=&quot;property1&quot; value=&quot;aaaaa&quot; /&gt;
-      &lt;property name=&quot;foo&quot; value=&quot;baz&quot; /&gt;
-    &lt;/ant&gt;</SPAN>
-  &lt;/target&gt;</SPAN>
-
-  &lt;target name=&quot;bar&quot; depends=&quot;init&quot;&gt;
-    &lt;echo message=&quot;prop is ${property1} ${foo}&quot; /&gt;
-  &lt;/target&gt;
- </pre>]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="antfile" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[The buildfile to use.]]></short-description>
-        <description><![CDATA[
-          The buildfile to use.
- Defaults to "build.xml". This file is expected to be a filename relative
- to the dir attribute given.
-        ]]></description>
-      </attribute>
-      <attribute name="dir" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[The directory to use as a base directory for the new Ant project.]]></short-description>
-        <description><![CDATA[
-          The directory to use as a base directory for the new Ant project.
- Defaults to the current project's basedir, unless inheritall
- has been set to false, in which case it doesn't have a default
- value. This will override the basedir setting of the called project.
-        ]]></description>
-      </attribute>
-      <attribute name="inheritall" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[If true, pass all properties to the new Ant project.]]></short-description>
-        <description><![CDATA[
-          If true, pass all properties to the new Ant project.
- Defaults to true.
-        ]]></description>
-      </attribute>
-      <attribute name="inheritrefs" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[If true, pass all references to the new Ant project.]]></short-description>
-        <description><![CDATA[
-          If true, pass all references to the new Ant project.
- Defaults to false.
-        ]]></description>
-      </attribute>
-      <attribute name="output" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Filename to write the output to.]]></short-description>
-        <description><![CDATA[
-          Filename to write the output to.
- This is relative to the value of the dir attribute
- if it has been set or to the base directory of the
- current project otherwise.
-        ]]></description>
-      </attribute>
-      <attribute name="target" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[The target of the new Ant project to execute.]]></short-description>
-        <description><![CDATA[
-          The target of the new Ant project to execute.
- Defaults to the new project's default target.
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-      <element name="reference" type="org.apache.tools.ant.taskdefs.Ant.Reference"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[Reference element identifying a data type to carry
- over to the new project.]]></short-description>
-        <description>
-          <![CDATA[Reference element identifying a data type to carry
- over to the new project.]]>
-        </description>
-      </element>
-
-      <element name="property" type="org.apache.tools.ant.taskdefs.Property"
-               briefType="see &lt;property&gt;"
-               required="NOTDEFINED">
-        <short-description><![CDATA[Property to pass to the new project.]]></short-description>
-        <description>
-          <![CDATA[Property to pass to the new project.
- The property is passed as a 'user property']]>
-        </description>
-      </element>
-
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="antcall" category="control"
-      classname="org.apache.tools.ant.taskdefs.CallTarget"
-      >
-
-  <short-description><![CDATA[Call another target in the same project.]]></short-description>
-  <description>
-    <![CDATA[Call another target in the same project.
-
-  <pre>
-    &lt;target name="foo"&gt;
-      &lt;antcall target="bar"&gt;
-        &lt;param name="property1" value="aaaaa" /&gt;
-        &lt;param name="foo" value="baz" /&gt;
-       &lt;/antcall&gt;
-    &lt;/target&gt;
-
-    &lt;target name="bar" depends="init"&gt;
-      &lt;echo message="prop is ${property1} ${foo}" /&gt;
-    &lt;/target&gt;
- </pre>
-
- <p>This only works as expected if neither property1 nor foo are
- defined in the project itself.]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="inheritall" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[If true, pass all properties to the new Ant project.]]></short-description>
-        <description><![CDATA[
-          If true, pass all properties to the new Ant project.
- Defaults to true.
-        ]]></description>
-      </attribute>
-      <attribute name="inheritrefs" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[If true, pass all references to the new Ant project.]]></short-description>
-        <description><![CDATA[
-          If true, pass all references to the new Ant project.
- Defaults to false
-        ]]></description>
-      </attribute>
-      <attribute name="target" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Target to execute, required.]]></short-description>
-        <description><![CDATA[
-          Target to execute, required.
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-      <element name="reference" type="org.apache.tools.ant.taskdefs.Ant.Reference"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[Reference element identifying a data type to carry
- over to the invoked target.]]></short-description>
-        <description>
-          <![CDATA[Reference element identifying a data type to carry
- over to the invoked target.]]>
-        </description>
-      </element>
-
-      <element name="param" type="org.apache.tools.ant.taskdefs.Property"
-               briefType="see &lt;property&gt;"
-               required="NOTDEFINED">
-        <short-description><![CDATA[Property to pass to the invoked target.]]></short-description>
-        <description>
-          <![CDATA[Property to pass to the invoked target.]]>
-        </description>
-      </element>
-
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="antlr" category="other"
-      classname="org.apache.tools.ant.taskdefs.optional.ANTLR"
-      >
-
-  <short-description><![CDATA[Invokes the ANTLR Translator generator on a grammar file.]]></short-description>
-  <description>
-    <![CDATA[Invokes the ANTLR Translator generator on a grammar file.]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="debug" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Flag to enable ParseView debugging.]]></short-description>
-        <description><![CDATA[
-          Sets a flag to enable ParseView debugging
-        ]]></description>
-      </attribute>
-      <attribute name="diagnostic" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Flag to emit diagnostic text.]]></short-description>
-        <description><![CDATA[
-          Sets a flag to emit diagnostic text
-        ]]></description>
-      </attribute>
-      <attribute name="dir" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[The working directory of the process.]]></short-description>
-        <description><![CDATA[
-          The working directory of the process
-        ]]></description>
-      </attribute>
-      <attribute name="glib" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Sets an optional super grammar file.]]></short-description>
-        <description><![CDATA[
-          Sets an optional super grammar file.
-        ]]></description>
-      </attribute>
-      <attribute name="html" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[If true, emit html.]]></short-description>
-        <description><![CDATA[
-          If true, emit html
-        ]]></description>
-      </attribute>
-      <attribute name="outputdirectory" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[The directory to write the generated files to.]]></short-description>
-        <description><![CDATA[
-          The directory to write the generated files to.
-        ]]></description>
-      </attribute>
-      <attribute name="target" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[The grammar file to process.]]></short-description>
-        <description><![CDATA[
-          The grammar file to process.
-        ]]></description>
-      </attribute>
-      <attribute name="trace" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[If true, enables all tracing.]]></short-description>
-        <description><![CDATA[
-          If true, enables all tracing.
-        ]]></description>
-      </attribute>
-      <attribute name="tracelexer" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[If true, enables lexer tracing.]]></short-description>
-        <description><![CDATA[
-          If true, enables lexer tracing.
-        ]]></description>
-      </attribute>
-      <attribute name="traceparser" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[If true, enables parser tracing.]]></short-description>
-        <description><![CDATA[
-          If true, enables parser tracing.
-        ]]></description>
-      </attribute>
-      <attribute name="tracetreewalker" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Flag to allow the user to enable tree walker tracing.]]></short-description>
-        <description><![CDATA[
-          Sets a flag to allow the user to enable tree walker tracing
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-      <element name="classpath" type="org.apache.tools.ant.types.Path"
-               briefType="Path"
-               required="NOTDEFINED">
-        <short-description><![CDATA[Adds a classpath to be set
- because a directory might be given for Antlr debug.]]></short-description>
-        <description>
-          <![CDATA[Adds a classpath to be set
- because a directory might be given for Antlr debug.]]>
-        </description>
-      </element>
-
-      <element name="jvmarg" type="org.apache.tools.ant.types.Commandline.Argument"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[Adds a new JVM argument.]]></short-description>
-        <description>
-          <![CDATA[Adds a new JVM argument.]]>
-        </description>
-      </element>
-
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="antstructure" category="xml"
-      classname="org.apache.tools.ant.taskdefs.AntStructure"
-      >
-
-  <short-description><![CDATA[Creates a partial DTD for Ant from the currently known tasks.]]></short-description>
-  <description>
-    <![CDATA[Creates a partial DTD for Ant from the currently known tasks.]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="output" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[The output file.]]></short-description>
-        <description><![CDATA[
-          The output file.
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="apply" category="control"
-      classname="org.apache.tools.ant.taskdefs.ExecuteOn"
-      >
-
-  <short-description><![CDATA[Executes a given command, supplying a set of files as arguments.]]></short-description>
-  <description>
-    <![CDATA[Executes a given command, supplying a set of files as arguments.]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="append" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Whether output should be appended to or overwrite an existing file.]]></short-description>
-        <description><![CDATA[
-          Whether output should be appended to or overwrite an existing file.
- Defaults to false.
-        ]]></description>
-      </attribute>
-      <attribute name="dest" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[The directory where target files are to be placed.]]></short-description>
-        <description><![CDATA[
-          The directory where target files are to be placed.
-        ]]></description>
-      </attribute>
-      <attribute name="dir" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[The working directory of the process.]]></short-description>
-        <description><![CDATA[
-          The working directory of the process.
-        ]]></description>
-      </attribute>
-      <attribute name="executable" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[The command to execute.]]></short-description>
-        <description><![CDATA[
-          The command to execute.
-        ]]></description>
-      </attribute>
-      <attribute name="failifexecutionfails" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Stop the build if program cannot be started.]]></short-description>
-        <description><![CDATA[
-          Stop the build if program cannot be started. Defaults to true.
-        ]]></description>
-      </attribute>
-      <attribute name="failonerror" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Fail if the command exits with a non-zero return code.]]></short-description>
-        <description><![CDATA[
-          Fail if the command exits with a non-zero return code.
-        ]]></description>
-      </attribute>
-      <attribute name="newenvironment" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Do not propagate old environment when new environment variables are specified.]]></short-description>
-        <description><![CDATA[
-          Do not propagate old environment when new environment variables are specified.
-        ]]></description>
-      </attribute>
-      <attribute name="os" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[List of operating systems on which the command may be executed.]]></short-description>
-        <description><![CDATA[
-          List of operating systems on which the command may be executed.
-        ]]></description>
-      </attribute>
-      <attribute name="output" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[File the output of the process is redirected to.]]></short-description>
-        <description><![CDATA[
-          File the output of the process is redirected to.
-        ]]></description>
-      </attribute>
-      <attribute name="outputproperty" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Property name whose value should be set to the output of
- the process.]]></short-description>
-        <description><![CDATA[
-          Property name whose value should be set to the output of
- the process.
-        ]]></description>
-      </attribute>
-      <attribute name="parallel" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[If true, run the command only once, appending all files as arguments.]]></short-description>
-        <description><![CDATA[
-          If true, run the command only once, appending all files as arguments.
- If false, command will be executed once for every file. Defaults to false.
-        ]]></description>
-      </attribute>
-      <attribute name="relative" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Whether the filenames should be passed on the command line as
- absolute or relative pathnames.]]></short-description>
-        <description><![CDATA[
-          Whether the filenames should be passed on the command line as
- absolute or relative pathnames. Paths are relative to the base
- directory of the corresponding fileset for source files or the
- dest attribute for target files.
-        ]]></description>
-      </attribute>
-      <attribute name="resultproperty" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[The name of a property in which the return code of the
- command should be stored.]]></short-description>
-        <description><![CDATA[
-          The name of a property in which the return code of the
- command should be stored. Only of interest if failonerror=false.
-        ]]></description>
-      </attribute>
-      <attribute name="skipemptyfilesets" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[If no source files have been found or are newer than their
- corresponding target files, do not run the command.]]></short-description>
-        <description><![CDATA[
-          If no source files have been found or are newer than their
- corresponding target files, do not run the command.
-        ]]></description>
-      </attribute>
-      <attribute name="type" type="org.apache.tools.ant.taskdefs.ExecuteOn.FileDirBoth"
-                 briefType="&quot;file&quot;, &quot;dir&quot;, &quot;both&quot;" required="NOTDEFINED">
-        <short-description><![CDATA[Whether the command works only on files, directories or both?.]]></short-description>
-        <description><![CDATA[
-          Whether the command works only on files, directories or both?
-        ]]></description>
-      </attribute>
-      <attribute name="vmlauncher" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[If true, launch new process with VM, otherwise use the OS's shell.]]></short-description>
-        <description><![CDATA[
-          If true, launch new process with VM, otherwise use the OS's shell.
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-      <element name="env" type="org.apache.tools.ant.types.Environment.Variable"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[Add an environment variable to the launched process.]]></short-description>
-        <description>
-          <![CDATA[Add an environment variable to the launched process.]]>
-        </description>
-      </element>
-
-      <element name="fileset" type="org.apache.tools.ant.types.FileSet"
-               briefType="Fileset"
-               required="NOTDEFINED">
-        <short-description><![CDATA[Source files to operate upon.]]></short-description>
-        <description>
-          <![CDATA[Source files to operate upon.]]>
-        </description>
-      </element>
-
-      <element name="arg" type="org.apache.tools.ant.types.Commandline.Argument"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[Adds a command-line argument.]]></short-description>
-        <description>
-          <![CDATA[Adds a command-line argument.]]>
-        </description>
-      </element>
-
-      <element name="mapper" type="org.apache.tools.ant.types.Mapper"
-               briefType="Mapper"
-               required="NOTDEFINED">
-        <short-description><![CDATA[Mapper to use for mapping source files to target files.]]></short-description>
-        <description>
-          <![CDATA[Mapper to use for mapping source files to target files.]]>
-        </description>
-      </element>
-
-      <element name="srcfile" type="org.apache.tools.ant.types.Commandline.Marker"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[Marker that indicates where the name of the source file should
- be put on the command line.]]></short-description>
-        <description>
-          <![CDATA[Marker that indicates where the name of the source file should
- be put on the command line.]]>
-        </description>
-      </element>
-
-      <element name="targetfile" type="org.apache.tools.ant.types.Commandline.Marker"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[Marker that indicates where the name of the target file should
- be put on the command line.]]></short-description>
-        <description>
-          <![CDATA[Marker that indicates where the name of the target file should
- be put on the command line.]]>
-        </description>
-      </element>
-
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="available" category="control"
-      classname="org.apache.tools.ant.taskdefs.Available"
-      >
-
-  <short-description><![CDATA[Will set the given property if the requested resource is available at runtime.]]></short-description>
-  <description>
-    <![CDATA[Will set the given property if the requested resource is available at 
- runtime. This task may also be used as a condition by the condition task.]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="classname" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Classname of a class which must be available to set the given 
- property.]]></short-description>
-        <description><![CDATA[
-          Set a classname of a class which must be available to set the given 
- property.
-        ]]></description>
-      </attribute>
-      <attribute name="classpath" type="org.apache.tools.ant.types.Path"
-                 briefType="Path" required="NOTDEFINED">
-        <short-description><![CDATA[Classpath to be used when searching for classes and resources.]]></short-description>
-        <description><![CDATA[
-          Set the classpath to be used when searching for classes and resources.
-        ]]></description>
-      </attribute>
-      <attribute name="classpathref" type="org.apache.tools.ant.types.Reference"
-                 briefType="Reference" required="NOTDEFINED">
-        <short-description><![CDATA[Classpath by reference.]]></short-description>
-        <description><![CDATA[
-          Set the classpath by reference.
-        ]]></description>
-      </attribute>
-      <attribute name="file" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[File which must be present in the file system to set the given
- property.]]></short-description>
-        <description><![CDATA[
-          Set the file which must be present in the file system to set the given
- property.
-        ]]></description>
-      </attribute>
-      <attribute name="filepath" type="org.apache.tools.ant.types.Path"
-                 briefType="Path" required="NOTDEFINED">
-        <short-description><![CDATA[Path to use when looking for a file.]]></short-description>
-        <description><![CDATA[
-          Set the path to use when looking for a file.
-        ]]></description>
-      </attribute>
-      <attribute name="ignoresystemclasses" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Set whether the search for classes should ignore the runtime classes and
- just use the given classpath.]]></short-description>
-        <description><![CDATA[
-          Set whether the search for classes should ignore the runtime classes and
- just use the given classpath.
-        ]]></description>
-      </attribute>
-      <attribute name="property" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Name of the property which will be set if the particular resource
- is available.]]></short-description>
-        <description><![CDATA[
-          Set the name of the property which will be set if the particular resource
- is available.
-        ]]></description>
-      </attribute>
-      <attribute name="resource" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Name of a Java resource which is required to set the property.]]></short-description>
-        <description><![CDATA[
-          Set the name of a Java resource which is required to set the property.
-        ]]></description>
-      </attribute>
-      <attribute name="type" type="org.apache.tools.ant.taskdefs.Available.FileDir"
-                 briefType="&quot;file&quot;, &quot;dir&quot;" required="NOTDEFINED">
-        <short-description><![CDATA[Set what type of file is required - either directory or file.]]></short-description>
-        <description><![CDATA[
-          Set what type of file is required - either directory or file.
-        ]]></description>
-      </attribute>
-      <attribute name="value" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Value to be given to the property if the desired resource is
- available.]]></short-description>
-        <description><![CDATA[
-          Set the value to be given to the property if the desired resource is
- available.
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-      <element name="classpath" type="org.apache.tools.ant.types.Path"
-               briefType="Path"
-               required="NOTDEFINED">
-        <short-description><![CDATA[Classpath to be used when searching for classes and resources.]]></short-description>
-        <description>
-          <![CDATA[Classpath to be used when searching for classes and resources.]]>
-        </description>
-      </element>
-
-      <element name="filepath" type="org.apache.tools.ant.types.Path"
-               briefType="Path"
-               required="NOTDEFINED">
-        <short-description><![CDATA[Path to search for file resources.]]></short-description>
-        <description>
-          <![CDATA[Path to search for file resources.]]>
-        </description>
-      </element>
-
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="basename" category="property"
-      classname="org.apache.tools.ant.taskdefs.Basename"
-      >
-
-  <short-description><![CDATA[Sets a property to the base name of a specified file, optionally minus a suffix.]]></short-description>
-  <description>
-    <![CDATA[Sets a property to the base name of a specified file, optionally minus a
- suffix.
-
- This task can accept the following attributes:
- <ul>
- <li>file
- <li>property
- <li>suffix
- </ul>
- The <b>file</b> and <b>property</b> attributes are required. The
- <b>suffix</b> attribute can be specified either with or without
- the &quot;.&quot;, and the result will be the same (ie., the
- returned file name will be minus the .suffix).
- <p>
- When this task executes, it will set the specified property to the
- value of the last element in the specified file. If file is a
- directory, the basename will be the last directory element. If file
- is a full-path filename, the basename will be the simple file name.
- If a suffix is specified, and the specified file ends in that suffix,
- the basename will be the simple file name without the suffix.]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="file" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[File or directory to get base name from.]]></short-description>
-        <description><![CDATA[
-          File or directory to get base name from.
-        ]]></description>
-      </attribute>
-      <attribute name="property" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Property to set base name to.]]></short-description>
-        <description><![CDATA[
-          Property to set base name to.
-        ]]></description>
-      </attribute>
-      <attribute name="suffix" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Optional suffix to remove from base name.]]></short-description>
-        <description><![CDATA[
-          Optional suffix to remove from base name.
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="blgenclient" category="ejb"
-      classname="org.apache.tools.ant.taskdefs.optional.ejb.BorlandGenerateClient"
-      >
-
-  <short-description><![CDATA[Generates a Borland Application Server 4.5 client JAR using as input the EJB JAR file.]]></short-description>
-  <description>
-    <![CDATA[Generates a Borland Application Server 4.5 client JAR using as
- input the EJB JAR file.
-
- Two mode are available: java mode (default) and fork mode. With the fork mode,
- it is impossible to add classpath to the commmand line.]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="classpath" type="org.apache.tools.ant.types.Path"
-                 briefType="Path" required="NOTDEFINED">
-        <short-description><![CDATA[Path to use for classpath.]]></short-description>
-        <description><![CDATA[
-          Path to use for classpath.
-        ]]></description>
-      </attribute>
-      <attribute name="classpathref" type="org.apache.tools.ant.types.Reference"
-                 briefType="Reference" required="NOTDEFINED">
-        <short-description><![CDATA[Reference to existing path, to use as a classpath.]]></short-description>
-        <description><![CDATA[
-          Reference to existing path, to use as a classpath.
-        ]]></description>
-      </attribute>
-      <attribute name="clientjar" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[Client JAR file name.]]></short-description>
-        <description><![CDATA[
-          Client JAR file name.
-        ]]></description>
-      </attribute>
-      <attribute name="debug" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[If true, turn on the debug mode for each of the Borland tools launched.]]></short-description>
-        <description><![CDATA[
-          If true, turn on the debug mode for each of the Borland tools launched.
-        ]]></description>
-      </attribute>
-      <attribute name="ejbjar" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[EJB JAR file.]]></short-description>
-        <description><![CDATA[
-          EJB JAR file.
-        ]]></description>
-      </attribute>
-      <attribute name="mode" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Command launching mode: java or fork.]]></short-description>
-        <description><![CDATA[
-          Command launching mode: java or fork.
-        ]]></description>
-      </attribute>
-      <attribute name="version" type="int"
-                 briefType="int" required="NOTDEFINED">
-        <short-description><![CDATA[No description.]]></short-description>
-        <description><![CDATA[
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-      <element name="classpath" type="org.apache.tools.ant.types.Path"
-               briefType="Path"
-               required="NOTDEFINED">
-        <short-description><![CDATA[Adds path to the classpath.]]></short-description>
-        <description>
-          <![CDATA[Adds path to the classpath.]]>
-        </description>
-      </element>
-
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="buildnumber" category="other"
-      classname="org.apache.tools.ant.taskdefs.BuildNumber"
-      >
-
-  <short-description><![CDATA[Read, increment, and write a build number in a file It will first attempt to read a build number from a file, then set the property "build.number" to the value that was read in (or 0 if no such value).]]></short-description>
-  <description>
-    <![CDATA[Read, increment, and write a build number in a file
- It will first
- attempt to read a build number from a file, then set the property
- "build.number" to the value that was read in (or 0 if no such value). Then
- it will increment the build number by one and write it back out into the
- file.]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="file" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[The file in which the build number is stored.]]></short-description>
-        <description><![CDATA[
-          The file in which the build number is stored. Defaults to
- "build.number" if not specified.
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="bunzip2" category="packaging"
-      classname="org.apache.tools.ant.taskdefs.BUnzip2"
-      >
-
-  <short-description><![CDATA[Expands a file that has been compressed with the BZIP2 algorithm.]]></short-description>
-  <description>
-    <![CDATA[Expands a file that has been compressed with the BZIP2
- algorithm. Normally used to compress non-compressed archives such
- as TAR files.]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="dest" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[The destination file or directory; optional.]]></short-description>
-        <description><![CDATA[
-          The destination file or directory; optional.
-        ]]></description>
-      </attribute>
-      <attribute name="src" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[The file to expand; required.]]></short-description>
-        <description><![CDATA[
-          The file to expand; required.
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="bzip2" category="packaging"
-      classname="org.apache.tools.ant.taskdefs.BZip2"
-      >
-
-  <short-description><![CDATA[Compresses a file with the BZIP2 algorithm.]]></short-description>
-  <description>
-    <![CDATA[Compresses a file with the BZIP2 algorithm. Normally used to compress
- non-compressed archives such as TAR files.]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="src" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[The file to compress; required.]]></short-description>
-        <description><![CDATA[
-          the file to compress; required.
-        ]]></description>
-      </attribute>
-      <attribute name="zipfile" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[The required destination file.]]></short-description>
-        <description><![CDATA[
-          the required destination file.
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="cab" category="other"
-      classname="org.apache.tools.ant.taskdefs.optional.Cab"
-      matchingTask="true">
-
-  <short-description><![CDATA[Create a CAB archive.]]></short-description>
-  <description>
-    <![CDATA[Create a CAB archive.]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="basedir" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[Base directory to look in for files to CAB.]]></short-description>
-        <description><![CDATA[
-          Base directory to look in for files to CAB.
-        ]]></description>
-      </attribute>
-      <attribute name="cabfile" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[The name/location of where to create the .cab file.]]></short-description>
-        <description><![CDATA[
-          The name/location of where to create the .cab file.
-        ]]></description>
-      </attribute>
-      <attribute name="compress" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[If true, compress the files otherwise only store them.]]></short-description>
-        <description><![CDATA[
-          If true, compress the files otherwise only store them.
-        ]]></description>
-      </attribute>
-      <attribute name="options" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Sets additional cabarc options that are not supported directly.]]></short-description>
-        <description><![CDATA[
-          Sets additional cabarc options that are not supported directly.
-        ]]></description>
-      </attribute>
-      <attribute name="verbose" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[If true, display cabarc output.]]></short-description>
-        <description><![CDATA[
-          If true, display cabarc output.
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-      <element name="fileset" type="org.apache.tools.ant.types.FileSet"
-               briefType="Fileset"
-               required="NOTDEFINED">
-        <short-description><![CDATA[Adds a set of files to archive.]]></short-description>
-        <description>
-          <![CDATA[Adds a set of files to archive.]]>
-        </description>
-      </element>
-
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="cccheckin" category="other"
-      classname="org.apache.tools.ant.taskdefs.optional.clearcase.CCCheckin"
-      >
-
-  <short-description><![CDATA[Performs ClearCase checkin.]]></short-description>
-  <description>
-    <![CDATA[Performs ClearCase checkin.
-
- <p>
- The following attributes are interpreted:
- <table border="1">
-   <tr>
-     <th>Attribute</th>
-     <th>Values</th>
-     <th>Required</th>
-   </tr>
-   <tr>
-      <td>viewpath</td>
-      <td>Path to the ClearCase view file or directory that the command will operate on</td>
-      <td>No</td>
-   <tr>
-   <tr>
-      <td>comment</td>
-      <td>Specify a comment. Only one of comment or cfile may be used.</td>
-      <td>No</td>
-   <tr>
-   <tr>
-      <td>commentfile</td>
-      <td>Specify a file containing a comment. Only one of comment or cfile may be used.</td>
-      <td>No</td>
-   <tr>
-   <tr>
-      <td>nowarn</td>
-      <td>Suppress warning messages</td>
-      <td>No</td>
-   <tr>
-   <tr>
-      <td>preservetime</td>
-      <td>Preserve the modification time</td>
-      <td>No</td>
-   <tr>
-   <tr>
-      <td>keepcopy</td>
-      <td>Keeps a copy of the file with a .keep extension</td>
-      <td>No</td>
-   <tr>
-   <tr>
-      <td>identical</td>
-      <td>Allows the file to be checked in even if it is identical to the original</td>
-      <td>No</td>
-   <tr>
- </table>]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="cleartooldir" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Directory where the cleartool executable is located.]]></short-description>
-        <description><![CDATA[
-          Set the directory where the cleartool executable is located.
-        ]]></description>
-      </attribute>
-      <attribute name="comment" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Comment string.]]></short-description>
-        <description><![CDATA[
-          Sets the comment string.
-        ]]></description>
-      </attribute>
-      <attribute name="commentfile" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Specifies a file containing a comment.]]></short-description>
-        <description><![CDATA[
-          Specifies a file containing a comment.
-        ]]></description>
-      </attribute>
-      <attribute name="identical" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[If true, allows the file to be checked in even
- if it is identical to the original.]]></short-description>
-        <description><![CDATA[
-          If true, allows the file to be checked in even
- if it is identical to the original.
-        ]]></description>
-      </attribute>
-      <attribute name="keepcopy" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[If true, keeps a copy of the file with a .keep extension.]]></short-description>
-        <description><![CDATA[
-          If true, keeps a copy of the file with a .keep extension.
-        ]]></description>
-      </attribute>
-      <attribute name="nowarn" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[If true, suppress warning messages.]]></short-description>
-        <description><![CDATA[
-          If true, suppress warning messages.
-        ]]></description>
-      </attribute>
-      <attribute name="preservetime" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[If true, preserve the modification time.]]></short-description>
-        <description><![CDATA[
-          If true, preserve the modification time.
-        ]]></description>
-      </attribute>
-      <attribute name="viewpath" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Path to the item in a ClearCase view to operate on.]]></short-description>
-        <description><![CDATA[
-          Set the path to the item in a ClearCase view to operate on.
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="cccheckout" category="other"
-      classname="org.apache.tools.ant.taskdefs.optional.clearcase.CCCheckout"
-      >
-
-  <short-description><![CDATA[Performs ClearCase checkout.]]></short-description>
-  <description>
-    <![CDATA[Performs ClearCase checkout.
-
- <p>
- The following attributes are interpretted:
- <table border="1">
-   <tr>
-     <th>Attribute</th>
-     <th>Values</th>
-     <th>Required</th>
-   </tr>
-   <tr>
-      <td>viewpath</td>
-      <td>Path to the ClearCase view file or directory that the command will operate on</td>
-      <td>No</td>
-   <tr>
-   <tr>
-      <td>reserved</td>
-      <td>Specifies whether to check out the file as reserved or not</td>
-      <td>Yes</td>
-   <tr>
-   <tr>
-      <td>out</td>
-      <td>Creates a writable file under a different filename</td>
-      <td>No</td>
-   <tr>
-   <tr>
-      <td>nodata</td>
-      <td>Checks out the file but does not create an editable file containing its data</td>
-      <td>No</td>
-   <tr>
-   <tr>
-      <td>branch</td>
-      <td>Specify a branch to check out the file to</td>
-      <td>No</td>
-   <tr>
-   <tr>
-      <td>version</td>
-      <td>Allows checkout of a version other than main latest</td>
-      <td>No</td>
-   <tr>
-   <tr>
-      <td>nowarn</td>
-      <td>Suppress warning messages</td>
-      <td>No</td>
-   <tr>
-   <tr>
-      <td>comment</td>
-      <td>Specify a comment. Only one of comment or cfile may be used.</td>
-      <td>No</td>
-   <tr>
-   <tr>
-      <td>commentfile</td>
-      <td>Specify a file containing a comment. Only one of comment or cfile may be used.</td>
-      <td>No</td>
-   <tr>
- </table>]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="branch" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Specify a branch to check out the file to.]]></short-description>
-        <description><![CDATA[
-          Specify a branch to check out the file to.
-        ]]></description>
-      </attribute>
-      <attribute name="cleartooldir" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Directory where the cleartool executable is located.]]></short-description>
-        <description><![CDATA[
-          Set the directory where the cleartool executable is located.
-        ]]></description>
-      </attribute>
-      <attribute name="comment" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Comment string.]]></short-description>
-        <description><![CDATA[
-          Sets the comment string.
-        ]]></description>
-      </attribute>
-      <attribute name="commentfile" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Specifies a file containing a comment.]]></short-description>
-        <description><![CDATA[
-          Specifies a file containing a comment.
-        ]]></description>
-      </attribute>
-      <attribute name="nodata" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[If true, checks out the file but does not create an
- editable file containing its data.]]></short-description>
-        <description><![CDATA[
-          If true, checks out the file but does not create an
- editable file containing its data.
-        ]]></description>
-      </attribute>
-      <attribute name="nowarn" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[If true, warning messages are suppressed.]]></short-description>
-        <description><![CDATA[
-          If true, warning messages are suppressed.
-        ]]></description>
-      </attribute>
-      <attribute name="out" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Creates a writable file under a different filename.]]></short-description>
-        <description><![CDATA[
-          Creates a writable file under a different filename.
-        ]]></description>
-      </attribute>
-      <attribute name="reserved" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[If true, checks out the file as reserved.]]></short-description>
-        <description><![CDATA[
-          If true, checks out the file as reserved.
-        ]]></description>
-      </attribute>
-      <attribute name="version" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[If true, allows checkout of a version other than main latest.]]></short-description>
-        <description><![CDATA[
-          If true, allows checkout of a version other than main latest.
-        ]]></description>
-      </attribute>
-      <attribute name="viewpath" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Path to the item in a ClearCase view to operate on.]]></short-description>
-        <description><![CDATA[
-          Set the path to the item in a ClearCase view to operate on.
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="ccmcheckin" category="other"
-      classname="org.apache.tools.ant.taskdefs.optional.ccm.CCMCheckin"
-      >
-
-  <short-description><![CDATA[Performs Continuus checkin command.]]></short-description>
-  <description>
-    <![CDATA[Performs Continuus checkin command.]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="ccmdir" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Directory where the ccm executable is located.]]></short-description>
-        <description><![CDATA[
-          Set the directory where the ccm executable is located.
-        ]]></description>
-      </attribute>
-      <attribute name="comment" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Specifies a comment.]]></short-description>
-        <description><![CDATA[
-          Specifies a comment.
-        ]]></description>
-      </attribute>
-      <attribute name="file" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[Path to the file that the command will operate on.]]></short-description>
-        <description><![CDATA[
-          Sets the path to the file that the command will operate on.
-        ]]></description>
-      </attribute>
-      <attribute name="task" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Specifies the task number used to check
- in the file (may use 'default').]]></short-description>
-        <description><![CDATA[
-          Specifies the task number used to check
- in the file (may use 'default').
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="ccmcheckintask" category="scm"
-      classname="org.apache.tools.ant.taskdefs.optional.ccm.CCMCheckinDefault"
-      >
-
-  <short-description><![CDATA[Performs Continuus Checkin Default task command.]]></short-description>
-  <description>
-    <![CDATA[Performs Continuus Checkin Default task command.]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="ccmdir" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Directory where the ccm executable is located.]]></short-description>
-        <description><![CDATA[
-          Set the directory where the ccm executable is located.
-        ]]></description>
-      </attribute>
-      <attribute name="comment" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Specifies a comment.]]></short-description>
-        <description><![CDATA[
-          Specifies a comment.
-        ]]></description>
-      </attribute>
-      <attribute name="file" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[Path to the file that the command will operate on.]]></short-description>
-        <description><![CDATA[
-          Sets the path to the file that the command will operate on.
-        ]]></description>
-      </attribute>
-      <attribute name="task" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Specifies the task number used to check
- in the file (may use 'default').]]></short-description>
-        <description><![CDATA[
-          Specifies the task number used to check
- in the file (may use 'default').
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="ccmcheckout" category="other"
-      classname="org.apache.tools.ant.taskdefs.optional.ccm.CCMCheckout"
-      >
-
-  <short-description><![CDATA[Performs Continuus checkout command.]]></short-description>
-  <description>
-    <![CDATA[Performs Continuus checkout command.]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="ccmdir" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Directory where the ccm executable is located.]]></short-description>
-        <description><![CDATA[
-          Set the directory where the ccm executable is located.
-        ]]></description>
-      </attribute>
-      <attribute name="comment" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Specifies a comment.]]></short-description>
-        <description><![CDATA[
-          Specifies a comment.
-        ]]></description>
-      </attribute>
-      <attribute name="file" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[Path to the file that the command will operate on.]]></short-description>
-        <description><![CDATA[
-          Sets the path to the file that the command will operate on.
-        ]]></description>
-      </attribute>
-      <attribute name="task" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Specifies the task number used to check
- in the file (may use 'default').]]></short-description>
-        <description><![CDATA[
-          Specifies the task number used to check
- in the file (may use 'default').
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="ccmcreatetask" category="scm"
-      classname="org.apache.tools.ant.taskdefs.optional.ccm.CCMCreateTask"
-      >
-
-  <short-description><![CDATA[Creates new Continuus ccm task and sets it as the default.]]></short-description>
-  <description>
-    <![CDATA[Creates new Continuus ccm task and sets it as the default.]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="ccmdir" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Directory where the ccm executable is located.]]></short-description>
-        <description><![CDATA[
-          Set the directory where the ccm executable is located.
-        ]]></description>
-      </attribute>
-      <attribute name="comment" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Specifies a comment.]]></short-description>
-        <description><![CDATA[
-          Specifies a comment.
-        ]]></description>
-      </attribute>
-      <attribute name="platform" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Specifies the target platform.]]></short-description>
-        <description><![CDATA[
-          Specifies the target platform.
-        ]]></description>
-      </attribute>
-      <attribute name="release" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Specify the CCM release.]]></short-description>
-        <description><![CDATA[
-          Specify the CCM release.
-        ]]></description>
-      </attribute>
-      <attribute name="resolver" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Specifies the resolver.]]></short-description>
-        <description><![CDATA[
-          Specifies the resolver.
-        ]]></description>
-      </attribute>
-      <attribute name="subsystem" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Specifies the subsystem.]]></short-description>
-        <description><![CDATA[
-          Specifies the subsystem.
-        ]]></description>
-      </attribute>
-      <attribute name="task" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Specifies the task number used to checkin
- the file (may use 'default').]]></short-description>
-        <description><![CDATA[
-          Specifies the task number used to checkin
- the file (may use 'default').
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="ccmreconfigure" category="other"
-      classname="org.apache.tools.ant.taskdefs.optional.ccm.CCMReconfigure"
-      >
-
-  <short-description><![CDATA[Task allows to reconfigure a project, recurcively or not]]></short-description>
-  <description>
-    <![CDATA[Task allows to reconfigure a project, recurcively or not]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="ccmdir" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Directory where the ccm executable is located.]]></short-description>
-        <description><![CDATA[
-          Set the directory where the ccm executable is located.
-        ]]></description>
-      </attribute>
-      <attribute name="ccmproject" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Ccm project on which the operation is applied.]]></short-description>
-        <description><![CDATA[
-          Sets the ccm project on which the operation is applied.
-        ]]></description>
-      </attribute>
-      <attribute name="recurse" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[If true, recurse on subproject (default false).]]></short-description>
-        <description><![CDATA[
-          If true, recurse on subproject (default false).
-        ]]></description>
-      </attribute>
-      <attribute name="verbose" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[If true, do a verbose reconfigure operation (default false).]]></short-description>
-        <description><![CDATA[
-          If true, do a verbose reconfigure operation (default false).
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="ccuncheckout" category="other"
-      classname="org.apache.tools.ant.taskdefs.optional.clearcase.CCUnCheckout"
-      >
-
-  <short-description><![CDATA[Performs ClearCase UnCheckout command.]]></short-description>
-  <description>
-    <![CDATA[Performs ClearCase UnCheckout command.
-
- <p>
- The following attributes are interpretted:
- <table border="1">
-   <tr>
-     <th>Attribute</th>
-     <th>Values</th>
-     <th>Required</th>
-   </tr>
-   <tr>
-      <td>viewpath</td>
-      <td>Path to the ClearCase view file or directory that the command will operate on</td>
-      <td>No</td>
-   <tr>
-   <tr>
-      <td>keepcopy</td>
-      <td>Specifies whether to keep a copy of the file with a .keep extension or not</td>
-      <td>No</td>
-   <tr>
- </table>]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="cleartooldir" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Directory where the cleartool executable is located.]]></short-description>
-        <description><![CDATA[
-          Set the directory where the cleartool executable is located.
-        ]]></description>
-      </attribute>
-      <attribute name="keepcopy" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[If true, keep a copy of the file with a .keep extension.]]></short-description>
-        <description><![CDATA[
-          If true, keep a copy of the file with a .keep extension.
-        ]]></description>
-      </attribute>
-      <attribute name="viewpath" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Path to the item in a ClearCase view to operate on.]]></short-description>
-        <description><![CDATA[
-          Set the path to the item in a ClearCase view to operate on.
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="ccupdate" category="other"
-      classname="org.apache.tools.ant.taskdefs.optional.clearcase.CCUpdate"
-      >
-
-  <short-description><![CDATA[Performs a ClearCase Update command.]]></short-description>
-  <description>
-    <![CDATA[Performs a ClearCase Update command.
-
- <p>
- The following attributes are interpretted:
- <table border="1">
-   <tr>
-     <th>Attribute</th>
-     <th>Values</th>
-     <th>Required</th>
-   </tr>
-   <tr>
-      <td>viewpath</td>
-      <td>Path to the ClearCase view file or directory that the command will operate on</td>
-      <td>No</td>
-   <tr>
-   <tr>
-      <td>graphical</td>
-      <td>Displays a graphical dialog during the update</td>
-      <td>No</td>
-   <tr>
-   <tr>
-      <td>log</td>
-      <td>Specifies a log file for ClearCase to write to</td>
-      <td>No</td>
-   <tr>
-   <tr>
-      <td>overwrite</td>
-      <td>Specifies whether to overwrite hijacked files or not</td>
-      <td>No</td>
-   <tr>
-   <tr>
-      <td>rename</td>
-      <td>Specifies that hijacked files should be renamed with a .keep extension</td>
-      <td>No</td>
-   <tr>
-   <tr>
-      <td>currenttime</td>
-      <td>Specifies that modification time should be written as the current time. Either currenttime or preservetime can be specified.</td>
-      <td>No</td>
-   <tr>
-   <tr>
-      <td>preservetime</td>
-      <td>Specifies that modification time should preserved from the VOB time. Either currenttime or preservetime can be specified.</td>
-      <td>No</td>
-   <tr>
- </table>]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="cleartooldir" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Directory where the cleartool executable is located.]]></short-description>
-        <description><![CDATA[
-          Set the directory where the cleartool executable is located.
-        ]]></description>
-      </attribute>
-      <attribute name="currenttime" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[If true, modification time should be written as the current time.]]></short-description>
-        <description><![CDATA[
-          If true, modification time should be written as the current time.
- Either currenttime or preservetime can be specified.
-        ]]></description>
-      </attribute>
-      <attribute name="graphical" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[If true, displays a graphical dialog during the update.]]></short-description>
-        <description><![CDATA[
-          If true, displays a graphical dialog during the update.
-        ]]></description>
-      </attribute>
-      <attribute name="log" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Log file where cleartool records
- the status of the command.]]></short-description>
-        <description><![CDATA[
-          Sets the log file where cleartool records
- the status of the command.
-        ]]></description>
-      </attribute>
-      <attribute name="overwrite" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[If true, overwrite hijacked files.]]></short-description>
-        <description><![CDATA[
-          If true, overwrite hijacked files.
-        ]]></description>
-      </attribute>
-      <attribute name="preservetime" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[If true, modification time should be preserved from the VOB time.]]></short-description>
-        <description><![CDATA[
-          If true, modification time should be preserved from the VOB time.
- Either currenttime or preservetime can be specified.
-        ]]></description>
-      </attribute>
-      <attribute name="rename" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[If true, hijacked files are renamed with a .keep extension.]]></short-description>
-        <description><![CDATA[
-          If true, hijacked files are renamed with a .keep extension.
-        ]]></description>
-      </attribute>
-      <attribute name="viewpath" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Path to the item in a ClearCase view to operate on.]]></short-description>
-        <description><![CDATA[
-          Set the path to the item in a ClearCase view to operate on.
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="checksum" category="control"
-      classname="org.apache.tools.ant.taskdefs.Checksum"
-      matchingTask="true">
-
-  <short-description><![CDATA[Used to create or verify file checksums.]]></short-description>
-  <description>
-    <![CDATA[Used to create or verify file checksums.]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="algorithm" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Specifies the algorithm to be used to compute the checksum.]]></short-description>
-        <description><![CDATA[
-          Specifies the algorithm to be used to compute the checksum.
- Defaults to "MD5". Other popular algorithms like "SHA" may be used as well.
-        ]]></description>
-      </attribute>
-      <attribute name="file" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[File for which the checksum is to be calculated.]]></short-description>
-        <description><![CDATA[
-          Sets the file for which the checksum is to be calculated.
-        ]]></description>
-      </attribute>
-      <attribute name="fileext" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[File extension that is be to used to
- create or identify destination file.]]></short-description>
-        <description><![CDATA[
-          Sets the file extension that is be to used to
- create or identify destination file.
-        ]]></description>
-      </attribute>
-      <attribute name="forceoverwrite" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Whether or not to overwrite existing file irrespective of 
- whether it is newer than
- the source file.]]></short-description>
-        <description><![CDATA[
-          Whether or not to overwrite existing file irrespective of 
- whether it is newer than
- the source file.  Defaults to false.
-        ]]></description>
-      </attribute>
-      <attribute name="property" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Property to hold the generated checksum.]]></short-description>
-        <description><![CDATA[
-          Sets the property to hold the generated checksum.
-        ]]></description>
-      </attribute>
-      <attribute name="provider" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[MessageDigest algorithm provider to be used
- to calculate the checksum.]]></short-description>
-        <description><![CDATA[
-          Sets the MessageDigest algorithm provider to be used
- to calculate the checksum.
-        ]]></description>
-      </attribute>
-      <attribute name="readbuffersize" type="int"
-                 briefType="int" required="NOTDEFINED">
-        <short-description><![CDATA[The size of the read buffer to use.]]></short-description>
-        <description><![CDATA[
-          The size of the read buffer to use.
-        ]]></description>
-      </attribute>
-      <attribute name="verifyproperty" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Verify property.]]></short-description>
-        <description><![CDATA[
-          Sets the verify property.  This project property holds
- the result of a checksum verification - "true" or "false"
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-      <element name="fileset" type="org.apache.tools.ant.types.FileSet"
-               briefType="Fileset"
-               required="NOTDEFINED">
-        <short-description><![CDATA[Files to generate checksums for.]]></short-description>
-        <description>
-          <![CDATA[Files to generate checksums for.]]>
-        </description>
-      </element>
-
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="chmod" category="filesystem"
-      classname="org.apache.tools.ant.taskdefs.Chmod"
-      >
-
-  <short-description><![CDATA[Chmod equivalent for unix-like environments.]]></short-description>
-  <description>
-    <![CDATA[Chmod equivalent for unix-like environments.]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="append" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Whether output should be appended to or overwrite an existing file.]]></short-description>
-        <description><![CDATA[
-          Whether output should be appended to or overwrite an existing file.
- Defaults to false.
-        ]]></description>
-      </attribute>
-      <attribute name="defaultexcludes" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Sets whether default exclusions should be used or not.]]></short-description>
-        <description><![CDATA[
-          Sets whether default exclusions should be used or not.
-        ]]></description>
-      </attribute>
-      <attribute name="dest" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[The directory where target files are to be placed.]]></short-description>
-        <description><![CDATA[
-          The directory where target files are to be placed.
-        ]]></description>
-      </attribute>
-      <attribute name="dir" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[The directory which holds the files whose permissions must be changed.]]></short-description>
-        <description><![CDATA[
-          The directory which holds the files whose permissions must be changed.
-        ]]></description>
-      </attribute>
-      <attribute name="excludes" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Set of exclude patterns.]]></short-description>
-        <description><![CDATA[
-          Sets the set of exclude patterns. Patterns may be separated by a comma
- or a space.
-        ]]></description>
-      </attribute>
-      <attribute name="executable" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[The command to execute.]]></short-description>
-        <description><![CDATA[
-          The command to execute.
-        ]]></description>
-      </attribute>
-      <attribute name="failifexecutionfails" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Stop the build if program cannot be started.]]></short-description>
-        <description><![CDATA[
-          Stop the build if program cannot be started. Defaults to true.
-        ]]></description>
-      </attribute>
-      <attribute name="failonerror" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Fail if the command exits with a non-zero return code.]]></short-description>
-        <description><![CDATA[
-          Fail if the command exits with a non-zero return code.
-        ]]></description>
-      </attribute>
-      <attribute name="file" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[The file or single directory of which the permissions must be changed.]]></short-description>
-        <description><![CDATA[
-          The file or single directory of which the permissions must be changed.
-        ]]></description>
-      </attribute>
-      <attribute name="includes" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Set of include patterns.]]></short-description>
-        <description><![CDATA[
-          Sets the set of include patterns. Patterns may be separated by a comma
- or a space.
-        ]]></description>
-      </attribute>
-      <attribute name="newenvironment" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Do not propagate old environment when new environment variables are specified.]]></short-description>
-        <description><![CDATA[
-          Do not propagate old environment when new environment variables are specified.
-        ]]></description>
-      </attribute>
-      <attribute name="os" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[List of operating systems on which the command may be executed.]]></short-description>
-        <description><![CDATA[
-          List of operating systems on which the command may be executed.
-        ]]></description>
-      </attribute>
-      <attribute name="output" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[File the output of the process is redirected to.]]></short-description>
-        <description><![CDATA[
-          File the output of the process is redirected to.
-        ]]></description>
-      </attribute>
-      <attribute name="outputproperty" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Property name whose value should be set to the output of
- the process.]]></short-description>
-        <description><![CDATA[
-          Property name whose value should be set to the output of
- the process.
-        ]]></description>
-      </attribute>
-      <attribute name="parallel" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[If true, run the command only once, appending all files as arguments.]]></short-description>
-        <description><![CDATA[
-          If true, run the command only once, appending all files as arguments.
- If false, command will be executed once for every file. Defaults to false.
-        ]]></description>
-      </attribute>
-      <attribute name="perm" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[The new permissions.]]></short-description>
-        <description><![CDATA[
-          The new permissions.
-        ]]></description>
-      </attribute>
-      <attribute name="relative" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Whether the filenames should be passed on the command line as
- absolute or relative pathnames.]]></short-description>
-        <description><![CDATA[
-          Whether the filenames should be passed on the command line as
- absolute or relative pathnames. Paths are relative to the base
- directory of the corresponding fileset for source files or the
- dest attribute for target files.
-        ]]></description>
-      </attribute>
-      <attribute name="resultproperty" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[The name of a property in which the return code of the
- command should be stored.]]></short-description>
-        <description><![CDATA[
-          The name of a property in which the return code of the
- command should be stored. Only of interest if failonerror=false.
-        ]]></description>
-      </attribute>
-      <attribute name="skipemptyfilesets" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[If no source files have been found or are newer than their
- corresponding target files, do not run the command.]]></short-description>
-        <description><![CDATA[
-          If no source files have been found or are newer than their
- corresponding target files, do not run the command.
-        ]]></description>
-      </attribute>
-      <attribute name="type" type="org.apache.tools.ant.taskdefs.ExecuteOn.FileDirBoth"
-                 briefType="&quot;file&quot;, &quot;dir&quot;, &quot;both&quot;" required="NOTDEFINED">
-        <short-description><![CDATA[Whether the command works only on files, directories or both?.]]></short-description>
-        <description><![CDATA[
-          Whether the command works only on files, directories or both?
-        ]]></description>
-      </attribute>
-      <attribute name="vmlauncher" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[If true, launch new process with VM, otherwise use the OS's shell.]]></short-description>
-        <description><![CDATA[
-          If true, launch new process with VM, otherwise use the OS's shell.
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-      <element name="env" type="org.apache.tools.ant.types.Environment.Variable"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[Add an environment variable to the launched process.]]></short-description>
-        <description>
-          <![CDATA[Add an environment variable to the launched process.]]>
-        </description>
-      </element>
-
-      <element name="fileset" type="org.apache.tools.ant.types.FileSet"
-               briefType="Fileset"
-               required="NOTDEFINED">
-        <short-description><![CDATA[Source files to operate upon.]]></short-description>
-        <description>
-          <![CDATA[Source files to operate upon.]]>
-        </description>
-      </element>
-
-      <element name="arg" type="org.apache.tools.ant.types.Commandline.Argument"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[Adds a command-line argument.]]></short-description>
-        <description>
-          <![CDATA[Adds a command-line argument.]]>
-        </description>
-      </element>
-
-      <element name="exclude" type="org.apache.tools.ant.types.PatternSet.NameEntry"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[Add a name entry on the exclude list.]]></short-description>
-        <description>
-          <![CDATA[Add a name entry on the exclude list.]]>
-        </description>
-      </element>
-
-      <element name="include" type="org.apache.tools.ant.types.PatternSet.NameEntry"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[Add a name entry on the include list.]]></short-description>
-        <description>
-          <![CDATA[Add a name entry on the include list.]]>
-        </description>
-      </element>
-
-      <element name="mapper" type="org.apache.tools.ant.types.Mapper"
-               briefType="Mapper"
-               required="NOTDEFINED">
-        <short-description><![CDATA[Mapper to use for mapping source files to target files.]]></short-description>
-        <description>
-          <![CDATA[Mapper to use for mapping source files to target files.]]>
-        </description>
-      </element>
-
-      <element name="patternset" type="org.apache.tools.ant.types.PatternSet"
-               briefType="Patternset"
-               required="NOTDEFINED">
-        <short-description><![CDATA[Add a set of patterns.]]></short-description>
-        <description>
-          <![CDATA[Add a set of patterns.]]>
-        </description>
-      </element>
-
-      <element name="srcfile" type="org.apache.tools.ant.types.Commandline.Marker"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[Marker that indicates where the name of the source file should
- be put on the command line.]]></short-description>
-        <description>
-          <![CDATA[Marker that indicates where the name of the source file should
- be put on the command line.]]>
-        </description>
-      </element>
-
-      <element name="targetfile" type="org.apache.tools.ant.types.Commandline.Marker"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[Marker that indicates where the name of the target file should
- be put on the command line.]]></short-description>
-        <description>
-          <![CDATA[Marker that indicates where the name of the target file should
- be put on the command line.]]>
-        </description>
-      </element>
-
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="concat" category="other"
-      classname="org.apache.tools.ant.taskdefs.Concat"
-      >
-
-  <short-description><![CDATA[This class contains the 'concat' task, used to concatenate a series of files into a single stream.]]></short-description>
-  <description>
-    <![CDATA[This class contains the 'concat' task, used to concatenate a series
- of files into a single stream. The destination of this stream may
- be the system console, or a file. The following is a sample
- invocation:
-
- <pre>
- &lt;concat destfile=&quot;${build.dir}/index.xml&quot;
-   append=&quot;false&quot;&gt;
-
-   &lt;fileset dir=&quot;${xml.root.dir}&quot;
-     includes=&quot;*.xml&quot; /&gt;
-
- &lt;/concat&gt;
- </pre>]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="append" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Behavior when the destination file exists.]]></short-description>
-        <description><![CDATA[
-          Sets the behavior when the destination file exists. If set to
- <code>true</code> the stream data will be appended to the
- existing file, otherwise the existing file will be
- overwritten. Defaults to <code>false</code>.
-        ]]></description>
-      </attribute>
-      <attribute name="destfile" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[Destination file, or uses the console if not specified.]]></short-description>
-        <description><![CDATA[
-          Sets the destination file, or uses the console if not specified.
-        ]]></description>
-      </attribute>
-      <attribute name="encoding" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Encoding for the input files, used when displaying the
- data via the console.]]></short-description>
-        <description><![CDATA[
-          Sets the encoding for the input files, used when displaying the
- data via the console.
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-      <element name="filelist" type="org.apache.tools.ant.types.FileList"
-               briefType="Filelist"
-               required="NOTDEFINED">
-        <short-description><![CDATA[List of files to concatenate.]]></short-description>
-        <description>
-          <![CDATA[List of files to concatenate.]]>
-        </description>
-      </element>
-
-      <element name="fileset" type="org.apache.tools.ant.types.FileSet"
-               briefType="Fileset"
-               required="NOTDEFINED">
-        <short-description><![CDATA[Set of files to concatenate.]]></short-description>
-        <description>
-          <![CDATA[Set of files to concatenate.]]>
-        </description>
-      </element>
-
-    </elements>
-
-      <body >
-        <description><![CDATA[
-          This method adds text which appears in the 'concat' element.
-        ]]></description>
-      </body>
-
-  </structure>
-
-</task>
-
-
-<task name="condition" category="control"
-      classname="org.apache.tools.ant.taskdefs.ConditionTask"
-      >
-
-  <short-description><![CDATA[Task to set a property conditionally using &lt;uptodate&gt;, &lt;available&gt;, and many other supported conditions.]]></short-description>
-  <description>
-    <![CDATA[Task to set a property conditionally using &lt;uptodate&gt;, &lt;available&gt;,
- and many other supported conditions.
-
- <p>This task supports boolean logic as well as pluggable conditions
- to decide, whether a property should be set.</p>
-
- <p>This task does not extend Task to take advantage of
- ConditionBase.</p>]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="property" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[The name of the property to set.]]></short-description>
-        <description><![CDATA[
-          The name of the property to set. Required.
-        ]]></description>
-      </attribute>
-      <attribute name="value" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[The value for the property to set, if condition evaluates to true.]]></short-description>
-        <description><![CDATA[
-          The value for the property to set, if condition evaluates to true.
- Defaults to "true".
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-      <element name="and" type="org.apache.tools.ant.taskdefs.condition.And"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[Add an &lt;and&gt; condition "container".]]></short-description>
-        <description>
-          <![CDATA[Add an &lt;and&gt; condition "container".]]>
-        </description>
-      </element>
-
-      <element name="available" type="org.apache.tools.ant.taskdefs.Available"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[Add an &lt;available&gt; condition.]]></short-description>
-        <description>
-          <![CDATA[Add an &lt;available&gt; condition.]]>
-        </description>
-      </element>
-
-      <element name="checksum" type="org.apache.tools.ant.taskdefs.Checksum"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[Add an &lt;checksum&gt; condition.]]></short-description>
-        <description>
-          <![CDATA[Add an &lt;checksum&gt; condition.]]>
-        </description>
-      </element>
-
-      <element name="contains" type="org.apache.tools.ant.taskdefs.condition.Contains"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[Add a &lt;contains&gt; condition.]]></short-description>
-        <description>
-          <![CDATA[Add a &lt;contains&gt; condition.]]>
-        </description>
-      </element>
-
-      <element name="equals" type="org.apache.tools.ant.taskdefs.condition.Equals"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[Add an &lt;equals&gt; condition.]]></short-description>
-        <description>
-          <![CDATA[Add an &lt;equals&gt; condition.]]>
-        </description>
-      </element>
-
-      <element name="filesmatch" type="org.apache.tools.ant.taskdefs.condition.FilesMatch"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[Add a &lt;filesmatch&gt; condition.]]></short-description>
-        <description>
-          <![CDATA[Add a &lt;filesmatch&gt; condition.]]>
-        </description>
-      </element>
-
-      <element name="http" type="org.apache.tools.ant.taskdefs.condition.Http"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[Add an &lt;http&gt; condition.]]></short-description>
-        <description>
-          <![CDATA[Add an &lt;http&gt; condition.]]>
-        </description>
-      </element>
-
-      <element name="isfalse" type="org.apache.tools.ant.taskdefs.condition.IsFalse"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[Add a &lt;isfalse&gt; condition.]]></short-description>
-        <description>
-          <![CDATA[Add a &lt;isfalse&gt; condition.]]>
-        </description>
-      </element>
-
-      <element name="isset" type="org.apache.tools.ant.taskdefs.condition.IsSet"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[Add an &lt;isset&gt; condition.]]></short-description>
-        <description>
-          <![CDATA[Add an &lt;isset&gt; condition.]]>
-        </description>
-      </element>
-
-      <element name="istrue" type="org.apache.tools.ant.taskdefs.condition.IsTrue"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[Add a &lt;istrue&gt; condition.]]></short-description>
-        <description>
-          <![CDATA[Add a &lt;istrue&gt; condition.]]>
-        </description>
-      </element>
-
-      <element name="not" type="org.apache.tools.ant.taskdefs.condition.Not"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[Add an &lt;not&gt; condition "container".]]></short-description>
-        <description>
-          <![CDATA[Add an &lt;not&gt; condition "container".]]>
-        </description>
-      </element>
-
-      <element name="or" type="org.apache.tools.ant.taskdefs.condition.Or"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[Add an &lt;or&gt; condition "container".]]></short-description>
-        <description>
-          <![CDATA[Add an &lt;or&gt; condition "container".]]>
-        </description>
-      </element>
-
-      <element name="os" type="org.apache.tools.ant.taskdefs.condition.Os"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[Add an &lt;os&gt; condition.]]></short-description>
-        <description>
-          <![CDATA[Add an &lt;os&gt; condition.]]>
-        </description>
-      </element>
-
-      <element name="socket" type="org.apache.tools.ant.taskdefs.condition.Socket"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[Add a &lt;socket&gt; condition.]]></short-description>
-        <description>
-          <![CDATA[Add a &lt;socket&gt; condition.]]>
-        </description>
-      </element>
-
-      <element name="uptodate" type="org.apache.tools.ant.taskdefs.UpToDate"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[Add an &lt;uptodate&gt; condition.]]></short-description>
-        <description>
-          <![CDATA[Add an &lt;uptodate&gt; condition.]]>
-        </description>
-      </element>
-
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="copy" category="filesystem"
-      classname="org.apache.tools.ant.taskdefs.Copy"
-      >
-
-  <short-description><![CDATA[Copies a file or directory to a new file or directory.]]></short-description>
-  <description>
-    <![CDATA[Copies a file or directory to a new file
- or directory.  Files are only copied if the source file is newer
- than the destination file, or when the destination file does not
- exist.  It is possible to explicitly overwrite existing files.</p>
-
- <p>This implementation is based on Arnout Kuiper's initial design
- document, the following mailing list discussions, and the
- copyfile/copydir tasks.</p>]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="encoding" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Character encoding.]]></short-description>
-        <description><![CDATA[
-          Sets the character encoding
-        ]]></description>
-      </attribute>
-      <attribute name="failonerror" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[If false, note errors to the output but keep going.]]></short-description>
-        <description><![CDATA[
-          If false, note errors to the output but keep going.
-        ]]></description>
-      </attribute>
-      <attribute name="file" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[Single source file to copy.]]></short-description>
-        <description><![CDATA[
-          Sets a single source file to copy.
-        ]]></description>
-      </attribute>
-      <attribute name="filtering" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[If true, enables filtering.]]></short-description>
-        <description><![CDATA[
-          If true, enables filtering.
-        ]]></description>
-      </attribute>
-      <attribute name="flatten" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[When copying directory trees, the files can be "flattened"
- into a single directory.]]></short-description>
-        <description><![CDATA[
-          When copying directory trees, the files can be "flattened"
- into a single directory.  If there are multiple files with
- the same name in the source directory tree, only the first
- file will be copied into the "flattened" directory, unless
- the forceoverwrite attribute is true.
-        ]]></description>
-      </attribute>
-      <attribute name="includeemptydirs" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Used to copy empty directories.]]></short-description>
-        <description><![CDATA[
-          Used to copy empty directories.
-        ]]></description>
-      </attribute>
-      <attribute name="overwrite" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Overwrite any existing destination file(s).]]></short-description>
-        <description><![CDATA[
-          Overwrite any existing destination file(s).
-        ]]></description>
-      </attribute>
-      <attribute name="preservelastmodified" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Give the copied files the same last modified time as the original files.]]></short-description>
-        <description><![CDATA[
-          Give the copied files the same last modified time as the original files.
-        ]]></description>
-      </attribute>
-      <attribute name="todir" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[Destination directory.]]></short-description>
-        <description><![CDATA[
-          Sets the destination directory.
-        ]]></description>
-      </attribute>
-      <attribute name="tofile" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[Destination file.]]></short-description>
-        <description><![CDATA[
-          Sets the destination file.
-        ]]></description>
-      </attribute>
-      <attribute name="verbose" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Used to force listing of all names of copied files.]]></short-description>
-        <description><![CDATA[
-          Used to force listing of all names of copied files.
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-      <element name="fileset" type="org.apache.tools.ant.types.FileSet"
-               briefType="Fileset"
-               required="NOTDEFINED">
-        <short-description><![CDATA[Adds a set of files to copy.]]></short-description>
-        <description>
-          <![CDATA[Adds a set of files to copy.]]>
-        </description>
-      </element>
-
-      <element name="filterchain" type="org.apache.tools.ant.types.FilterChain"
-               briefType="FilterChain"
-               required="NOTDEFINED">
-        <short-description><![CDATA[Adds a FilterChain.]]></short-description>
-        <description>
-          <![CDATA[Adds a FilterChain.]]>
-        </description>
-      </element>
-
-      <element name="filterset" type="org.apache.tools.ant.types.FilterSet"
-               briefType="Filterset"
-               required="NOTDEFINED">
-        <short-description><![CDATA[Adds a filterset.]]></short-description>
-        <description>
-          <![CDATA[Adds a filterset.]]>
-        </description>
-      </element>
-
-      <element name="mapper" type="org.apache.tools.ant.types.Mapper"
-               briefType="Mapper"
-               required="NOTDEFINED">
-        <short-description><![CDATA[Defines the mapper to map source to destination files.]]></short-description>
-        <description>
-          <![CDATA[Defines the mapper to map source to destination files.]]>
-        </description>
-      </element>
-
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="copydir" category="other"
-      classname="org.apache.tools.ant.taskdefs.Copydir"
-      deprecated="true"
-      matchingTask="true">
-
-  <short-description><![CDATA[Copies a directory.]]></short-description>
-  <description>
-    <![CDATA[Copies a directory.]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="dest" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[No description.]]></short-description>
-        <description><![CDATA[
-        ]]></description>
-      </attribute>
-      <attribute name="filtering" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[No description.]]></short-description>
-        <description><![CDATA[
-        ]]></description>
-      </attribute>
-      <attribute name="flatten" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[No description.]]></short-description>
-        <description><![CDATA[
-        ]]></description>
-      </attribute>
-      <attribute name="forceoverwrite" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[No description.]]></short-description>
-        <description><![CDATA[
-        ]]></description>
-      </attribute>
-      <attribute name="src" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[No description.]]></short-description>
-        <description><![CDATA[
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="copyfile" category="other"
-      classname="org.apache.tools.ant.taskdefs.Copyfile"
-      deprecated="true"
-      >
-
-  <short-description><![CDATA[Copies a file.]]></short-description>
-  <description>
-    <![CDATA[Copies a file.]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="dest" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[No description.]]></short-description>
-        <description><![CDATA[
-        ]]></description>
-      </attribute>
-      <attribute name="filtering" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[No description.]]></short-description>
-        <description><![CDATA[
-        ]]></description>
-      </attribute>
-      <attribute name="forceoverwrite" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[No description.]]></short-description>
-        <description><![CDATA[
-        ]]></description>
-      </attribute>
-      <attribute name="src" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[No description.]]></short-description>
-        <description><![CDATA[
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="csc" category="dotnet"
-      classname="org.apache.tools.ant.taskdefs.optional.dotnet.CSharp"
-      matchingTask="true">
-
-  <short-description><![CDATA[Compiles C# source into executables or modules.]]></short-description>
-  <description>
-    <![CDATA[Compiles C# source into executables or modules.
-
-  The task will only work on win2K until other platforms support
-  csc.exe or an equivalent. CSC.exe must be on the execute path too. <p>
-
-  All parameters are optional: &lt;csc/&gt; should suffice to produce a debug
-  build of all *.cs files. References to external files do require explicit
-  enumeration, so are one of the first attributes to consider adding. <p>
-
-  The task is a directory based task, so attributes like <b>includes="*.cs"
-  </b> and <b>excludes="broken.cs"</b> can be used to control the files pulled
-  in. By default, all *.cs files from the project folder down are included in
-  the command. When this happens the output file -if not specified- is taken
-  as the first file in the list, which may be somewhat hard to control.
-  Specifying the output file with <b>'outfile'</b> seems prudent. <p>
-
-  <p>
-
-  TODO
-  <ol>
-    <li> is incremental build still broken in beta-1?
-    <li> is Win32Icon broken?
-    <li> all the missing options
-  </ol>
-  <p>
-
-  History
-  <Table>
-
-    <tr>
-
-      <td>
-        0.3
-      </td>
-
-      <td>
-        Beta 1 edition
-      </td>
-
-      <td>
-        To avoid having to remember which assemblies to include, the task
-        automatically refers to the main dotnet libraries in Beta1.
-      </tr>
-
-      <tr>
-
-        <td>
-          0.2
-        </td>
-
-        <td>
-          Slightly different
-        </td>
-
-        <td>
-          Split command execution to a separate class;
-        </tr>
-
-        <tr>
-
-          <td>
-            0.1
-          </td>
-
-          <td>
-            "I can't believe it's so rudimentary"
-          </td>
-
-          <td>
-            First pass; minimal builds only support;
-          </tr>
-
-        </table>]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="additionalmodules" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Semicolon separated list of modules to refer to.]]></short-description>
-        <description><![CDATA[
-          Semicolon separated list of modules to refer to.
-        ]]></description>
-      </attribute>
-      <attribute name="debug" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Debug flag on or off.]]></short-description>
-        <description><![CDATA[
-          set the debug flag on or off.
-        ]]></description>
-      </attribute>
-      <attribute name="definitions" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Semicolon separated list of defined constants.]]></short-description>
-        <description><![CDATA[
-          Semicolon separated list of defined constants.
-        ]]></description>
-      </attribute>
-      <attribute name="destdir" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[Destination directory of files to be compiled.]]></short-description>
-        <description><![CDATA[
-          Set the destination directory of files to be compiled.
-        ]]></description>
-      </attribute>
-      <attribute name="destfile" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[Name of exe/library to create.]]></short-description>
-        <description><![CDATA[
-          Set the name of exe/library to create.
-        ]]></description>
-      </attribute>
-      <attribute name="docfile" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[File for generated XML documentation.]]></short-description>
-        <description><![CDATA[
-          file for generated XML documentation
-        ]]></description>
-      </attribute>
-      <attribute name="extraoptions" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Any extra options which are not explicitly supported
- by this task.]]></short-description>
-        <description><![CDATA[
-          Any extra options which are not explicitly supported
- by this task.
-        ]]></description>
-      </attribute>
-      <attribute name="failonerror" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[If true, fail on compilation errors.]]></short-description>
-        <description><![CDATA[
-          If true, fail on compilation errors.
-        ]]></description>
-      </attribute>
-      <attribute name="filealign" type="int"
-                 briefType="int" required="NOTDEFINED">
-        <short-description><![CDATA[File alignment.]]></short-description>
-        <description><![CDATA[
-          Set the file alignment.
- Valid values are 0,512, 1024, 2048, 4096, 8192,
- and 16384, 0 means 'leave to the compiler'
-        ]]></description>
-      </attribute>
-      <attribute name="fullpaths" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[If true, print the full path of files on errors.]]></short-description>
-        <description><![CDATA[
-          If true, print the full path of files on errors.
-        ]]></description>
-      </attribute>
-      <attribute name="includedefaultreferences" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[If true, automatically includes the common assemblies
- in dotnet, and tells the compiler to link in mscore.dll.
-
-  set the automatic reference inclusion flag on or off this flag controls
-  the string of references and the /nostdlib option in CSC.]]></short-description>
-        <description><![CDATA[
-          If true, automatically includes the common assemblies
- in dotnet, and tells the compiler to link in mscore.dll.
-
-  set the automatic reference inclusion flag on or off this flag controls
-  the string of references and the /nostdlib option in CSC
-        ]]></description>
-      </attribute>
-      <attribute name="incremental" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Incremental compilation flag on or off.]]></short-description>
-        <description><![CDATA[
-          set the incremental compilation flag on or off.
-        ]]></description>
-      </attribute>
-      <attribute name="mainclass" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Name of main class for executables.]]></short-description>
-        <description><![CDATA[
-          Sets the name of main class for executables.
-        ]]></description>
-      </attribute>
-      <attribute name="noconfig" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[A flag that tells the compiler not to read in the compiler 
- settings files 'csc.rsp' in its bin directory and then the local directory.]]></short-description>
-        <description><![CDATA[
-          A flag that tells the compiler not to read in the compiler 
- settings files 'csc.rsp' in its bin directory and then the local directory
-        ]]></description>
-      </attribute>
-      <attribute name="optimize" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[If true, enables optimization flag.]]></short-description>
-        <description><![CDATA[
-          If true, enables optimization flag.
-        ]]></description>
-      </attribute>
-      <attribute name="outputfile" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[Output file.]]></short-description>
-        <description><![CDATA[
-          Set the output file
-        ]]></description>
-      </attribute>
-      <attribute name="referencefiles" type="org.apache.tools.ant.types.Path"
-                 briefType="Path" required="NOTDEFINED">
-        <short-description><![CDATA[Path of references to include.]]></short-description>
-        <description><![CDATA[
-          Path of references to include.
- Wildcards should work.
-        ]]></description>
-      </attribute>
-      <attribute name="references" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Semicolon separated list of DLLs to refer to.]]></short-description>
-        <description><![CDATA[
-          Semicolon separated list of DLLs to refer to.
-        ]]></description>
-      </attribute>
-      <attribute name="srcdir" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[Source directory of the files to be compiled.]]></short-description>
-        <description><![CDATA[
-          Set the source directory of the files to be compiled.
-        ]]></description>
-      </attribute>
-      <attribute name="targettype" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Type of target.]]></short-description>
-        <description><![CDATA[
-          Set the type of target.
-        ]]></description>
-      </attribute>
-      <attribute name="unsafe" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[If true, enables the unsafe keyword.]]></short-description>
-        <description><![CDATA[
-          If true, enables the unsafe keyword.
-        ]]></description>
-      </attribute>
-      <attribute name="utf8output" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[If true, require all compiler output to be in UTF8 format.]]></short-description>
-        <description><![CDATA[
-          If true, require all compiler output to be in UTF8 format.
-        ]]></description>
-      </attribute>
-      <attribute name="warnlevel" type="int"
-                 briefType="int" required="NOTDEFINED">
-        <short-description><![CDATA[Level of warning currently between 1 and 4
- with 4 being the strictest.]]></short-description>
-        <description><![CDATA[
-          Level of warning currently between 1 and 4
- with 4 being the strictest.
-        ]]></description>
-      </attribute>
-      <attribute name="win32icon" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[Filename of icon to include.]]></short-description>
-        <description><![CDATA[
-          Set the filename of icon to include.
-        ]]></description>
-      </attribute>
-      <attribute name="win32res" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[Filename of a win32 resource (.RES) file to include.]]></short-description>
-        <description><![CDATA[
-          Sets the filename of a win32 resource (.RES) file to include.
- This is not a .NET resource, but what Windows is used to.
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="cvs" category="scm"
-      classname="org.apache.tools.ant.taskdefs.Cvs"
-      >
-
-  <short-description><![CDATA[Performs operations on a CVS repository. original 1.20 NOTE: This implementation has been moved to AbstractCvsTask with the addition of some accessors for extensibility.]]></short-description>
-  <description>
-    <![CDATA[Performs operations on a CVS repository.
-
- original 1.20
-
-  NOTE: This implementation has been moved to AbstractCvsTask with
-  the addition of some accessors for extensibility.]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="append" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Whether to append output/error when redirecting to a file.]]></short-description>
-        <description><![CDATA[
-          Whether to append output/error when redirecting to a file.
-        ]]></description>
-      </attribute>
-      <attribute name="command" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[The CVS command to execute.]]></short-description>
-        <description><![CDATA[
-          The CVS command to execute.
-        ]]></description>
-      </attribute>
-      <attribute name="compression" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[If true, this is the same as compressionlevel="3".]]></short-description>
-        <description><![CDATA[
-          If true, this is the same as compressionlevel="3".
-        ]]></description>
-      </attribute>
-      <attribute name="compressionlevel" type="int"
-                 briefType="int" required="NOTDEFINED">
-        <short-description><![CDATA[If set to a value 1-9 it adds -zN to the cvs command line, else
- it disables compression.]]></short-description>
-        <description><![CDATA[
-          If set to a value 1-9 it adds -zN to the cvs command line, else
- it disables compression.
-        ]]></description>
-      </attribute>
-      <attribute name="cvsroot" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[The CVSROOT variable.]]></short-description>
-        <description><![CDATA[
-          The CVSROOT variable.
-        ]]></description>
-      </attribute>
-      <attribute name="cvsrsh" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[The CVS_RSH variable.]]></short-description>
-        <description><![CDATA[
-          The CVS_RSH variable.
-        ]]></description>
-      </attribute>
-      <attribute name="date" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Use the most recent revision no later than the given date.]]></short-description>
-        <description><![CDATA[
-          Use the most recent revision no later than the given date.
-        ]]></description>
-      </attribute>
-      <attribute name="dest" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[The directory where the checked out files should be placed.]]></short-description>
-        <description><![CDATA[
-          The directory where the checked out files should be placed.
-        ]]></description>
-      </attribute>
-      <attribute name="error" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[The file to direct standard error from the command.]]></short-description>
-        <description><![CDATA[
-          The file to direct standard error from the command.
-        ]]></description>
-      </attribute>
-      <attribute name="failonerror" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Stop the build process if the command exits with
- a return code other than 0.]]></short-description>
-        <description><![CDATA[
-          Stop the build process if the command exits with
- a return code other than 0.
- Defaults to false.
-        ]]></description>
-      </attribute>
-      <attribute name="noexec" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[If true, report only and don't change any files.]]></short-description>
-        <description><![CDATA[
-          If true, report only and don't change any files.
-        ]]></description>
-      </attribute>
-      <attribute name="output" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[The file to direct standard output from the command.]]></short-description>
-        <description><![CDATA[
-          The file to direct standard output from the command.
-        ]]></description>
-      </attribute>
-      <attribute name="package" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[The package/module to operate upon.]]></short-description>
-        <description><![CDATA[
-          The package/module to operate upon.
-        ]]></description>
-      </attribute>
-      <attribute name="passfile" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[Password file to read passwords from.]]></short-description>
-        <description><![CDATA[
-          Password file to read passwords from.
-        ]]></description>
-      </attribute>
-      <attribute name="port" type="int"
-                 briefType="int" required="NOTDEFINED">
-        <short-description><![CDATA[Port used by CVS to communicate with the server.]]></short-description>
-        <description><![CDATA[
-          Port used by CVS to communicate with the server.
-        ]]></description>
-      </attribute>
-      <attribute name="quiet" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[If true, suppress informational messages.]]></short-description>
-        <description><![CDATA[
-          If true, suppress informational messages.
-        ]]></description>
-      </attribute>
-      <attribute name="tag" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[The tag of the package/module to operate upon.]]></short-description>
-        <description><![CDATA[
-          The tag of the package/module to operate upon.
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-      <element name="commandline" type="org.apache.tools.ant.types.Commandline"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[Adds direct command-line to execute.]]></short-description>
-        <description>
-          <![CDATA[Adds direct command-line to execute.]]>
-        </description>
-      </element>
-
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="cvschangelog" category="other"
-      classname="org.apache.tools.ant.taskdefs.cvslib.ChangeLogTask"
-      >
-
-  <short-description><![CDATA[Examines the output of cvs log and group related changes together.]]></short-description>
-  <description>
-    <![CDATA[Examines the output of cvs log and group related changes together.
-
- It produces an XML output representing the list of changes.
- <PRE>
- <FONT color=#0000ff>&lt;!-- Root element --&gt;</FONT>
- <FONT color=#6a5acd>&lt;!ELEMENT</FONT> changelog <FONT color=#ff00ff>(entry</FONT><FONT color=#ff00ff>+</FONT><FONT color=#ff00ff>)</FONT><FONT color=#6a5acd>&gt;</FONT>
- <FONT color=#0000ff>&lt;!-- CVS Entry --&gt;</FONT>
- <FONT color=#6a5acd>&lt;!ELEMENT</FONT> entry <FONT color=#ff00ff>(date,author,file</FONT><FONT color=#ff00ff>+</FONT><FONT color=#ff00ff>,msg)</FONT><FONT color=#6a5acd>&gt;</FONT>
- <FONT color=#0000ff>&lt;!-- Date of cvs entry --&gt;</FONT>
- <FONT color=#6a5acd>&lt;!ELEMENT</FONT> date <FONT color=#ff00ff>(#PCDATA)</FONT><FONT color=#6a5acd>&gt;</FONT>
- <FONT color=#0000ff>&lt;!-- Author of change --&gt;</FONT>
- <FONT color=#6a5acd>&lt;!ELEMENT</FONT> author <FONT color=#ff00ff>(#PCDATA)</FONT><FONT color=#6a5acd>&gt;</FONT>
- <FONT color=#0000ff>&lt;!-- List of files affected --&gt;</FONT>
- <FONT color=#6a5acd>&lt;!ELEMENT</FONT> msg <FONT color=#ff00ff>(#PCDATA)</FONT><FONT color=#6a5acd>&gt;</FONT>
- <FONT color=#0000ff>&lt;!-- File changed --&gt;</FONT>
- <FONT color=#6a5acd>&lt;!ELEMENT</FONT> file <FONT color=#ff00ff>(name,revision,prevrevision</FONT><FONT color=#ff00ff>?</FONT><FONT color=#ff00ff>)</FONT><FONT color=#6a5acd>&gt;</FONT>
- <FONT color=#0000ff>&lt;!-- Name of the file --&gt;</FONT>
- <FONT color=#6a5acd>&lt;!ELEMENT</FONT> name <FONT color=#ff00ff>(#PCDATA)</FONT><FONT color=#6a5acd>&gt;</FONT>
- <FONT color=#0000ff>&lt;!-- Revision number --&gt;</FONT>
- <FONT color=#6a5acd>&lt;!ELEMENT</FONT> revision <FONT color=#ff00ff>(#PCDATA)</FONT><FONT color=#6a5acd>&gt;</FONT>
- <FONT color=#0000ff>&lt;!-- Previous revision number --&gt;</FONT>
- <FONT color=#6a5acd>&lt;!ELEMENT</FONT> prevrevision <FONT color=#ff00ff>(#PCDATA)</FONT><FONT color=#6a5acd>&gt;</FONT>
- </PRE>]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="daysinpast" type="int"
-                 briefType="int" required="NOTDEFINED">
-        <short-description><![CDATA[Number of days worth of log entries to process.]]></short-description>
-        <description><![CDATA[
-          Set the number of days worth of log entries to process.
-        ]]></description>
-      </attribute>
-      <attribute name="destfile" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[Output file for the log.]]></short-description>
-        <description><![CDATA[
-          Set the output file for the log.
-        ]]></description>
-      </attribute>
-      <attribute name="dir" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[Base dir for cvs.]]></short-description>
-        <description><![CDATA[
-          Set the base dir for cvs.
-        ]]></description>
-      </attribute>
-      <attribute name="end" type="java.util.Date"
-                 briefType="Date" required="NOTDEFINED">
-        <short-description><![CDATA[Date at which the changelog should stop.]]></short-description>
-        <description><![CDATA[
-          Set the date at which the changelog should stop.
-        ]]></description>
-      </attribute>
-      <attribute name="start" type="java.util.Date"
-                 briefType="Date" required="NOTDEFINED">
-        <short-description><![CDATA[Date at which the changelog should start.]]></short-description>
-        <description><![CDATA[
-          Set the date at which the changelog should start.
-        ]]></description>
-      </attribute>
-      <attribute name="usersfile" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[Lookup list of user names & addresses.]]></short-description>
-        <description><![CDATA[
-          Set a lookup list of user names & addresses
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-      <element name="fileset" type="org.apache.tools.ant.types.FileSet"
-               briefType="Fileset"
-               required="NOTDEFINED">
-        <short-description><![CDATA[Adds a set of files about which cvs logs will be generated.]]></short-description>
-        <description>
-          <![CDATA[Adds a set of files about which cvs logs will be generated.]]>
-        </description>
-      </element>
-
-      <element name="user" type="org.apache.tools.ant.taskdefs.cvslib.CvsUser"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[Add a user to list changelog knows about.]]></short-description>
-        <description>
-          <![CDATA[Add a user to list changelog knows about.]]>
-        </description>
-      </element>
-
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="cvspass" category="scm"
-      classname="org.apache.tools.ant.taskdefs.CVSPass"
-      >
-
-  <short-description><![CDATA[Adds an new entry to a CVS password file.]]></short-description>
-  <description>
-    <![CDATA[Adds an new entry to a CVS password file.]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="cvsroot" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[The CVS repository to add an entry for.]]></short-description>
-        <description><![CDATA[
-          The CVS repository to add an entry for.
-        ]]></description>
-      </attribute>
-      <attribute name="passfile" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[Password file to add the entry to.]]></short-description>
-        <description><![CDATA[
-          Password file to add the entry to.
-        ]]></description>
-      </attribute>
-      <attribute name="password" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Password to be added to the password file.]]></short-description>
-        <description><![CDATA[
-          Password to be added to the password file.
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="cvstagdiff" category="other"
-      classname="org.apache.tools.ant.taskdefs.cvslib.CvsTagDiff"
-      >
-
-  <short-description><![CDATA[Examines the output of cvs rdiff between two tags.]]></short-description>
-  <description>
-    <![CDATA[Examines the output of cvs rdiff between two tags.
-
- It produces an XML output representing the list of changes.
- <PRE>
- &lt;!-- Root element --&gt;
- &lt;!ELEMENT tagdiff ( entry+ ) &gt;
- &lt;!-- Start tag of the report --&gt;
- &lt;!ATTLIST tagdiff startTag NMTOKEN #IMPLIED &gt;
- &lt;!-- End tag of the report --&gt;
- &lt;!ATTLIST tagdiff endTag NMTOKEN #IMPLIED &gt;
- &lt;!-- Start date of the report --&gt;
- &lt;!ATTLIST tagdiff startDate NMTOKEN #IMPLIED &gt;
- &lt;!-- End date of the report --&gt;
- &lt;!ATTLIST tagdiff endDate NMTOKEN #IMPLIED &gt;
-
- &lt;!-- CVS tag entry --&gt;
- &lt;!ELEMENT entry ( file ) &gt;
- &lt;!-- File added, changed or removed --&gt;
- &lt;!ELEMENT file ( name, revision?, prevrevision? ) &gt;
- &lt;!-- Name of the file --&gt;
- &lt;!ELEMENT name ( #PCDATA ) &gt;
- &lt;!-- Revision number --&gt;
- &lt;!ELEMENT revision ( #PCDATA ) &gt;
- &lt;!-- Previous revision number --&gt;
- &lt;!ELEMENT prevrevision ( #PCDATA ) &gt;
- </PRE>]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="compression" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[If true, this is the same as compressionlevel="3".]]></short-description>
-        <description><![CDATA[
-          If true, this is the same as compressionlevel="3".
-        ]]></description>
-      </attribute>
-      <attribute name="compressionlevel" type="int"
-                 briefType="int" required="NOTDEFINED">
-        <short-description><![CDATA[If set to a value 1-9 it adds -zN to the cvs command line, else
- it disables compression.]]></short-description>
-        <description><![CDATA[
-          If set to a value 1-9 it adds -zN to the cvs command line, else
- it disables compression.
-        ]]></description>
-      </attribute>
-      <attribute name="cvsroot" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[The CVSROOT variable.]]></short-description>
-        <description><![CDATA[
-          The CVSROOT variable.
-        ]]></description>
-      </attribute>
-      <attribute name="cvsrsh" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[The CVS_RSH variable.]]></short-description>
-        <description><![CDATA[
-          The CVS_RSH variable.
-        ]]></description>
-      </attribute>
-      <attribute name="destfile" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[Output file for the diff.]]></short-description>
-        <description><![CDATA[
-          Set the output file for the diff.
-        ]]></description>
-      </attribute>
-      <attribute name="enddate" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[End date.]]></short-description>
-        <description><![CDATA[
-          Set the end date.
-        ]]></description>
-      </attribute>
-      <attribute name="endtag" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[End tag.]]></short-description>
-        <description><![CDATA[
-          Set the end tag.
-        ]]></description>
-      </attribute>
-      <attribute name="failonerror" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Stop the build process if the command exits with
- a return code other than 0.]]></short-description>
-        <description><![CDATA[
-          Stop the build process if the command exits with
- a return code other than 0.
- Defaults to false.
-        ]]></description>
-      </attribute>
-      <attribute name="package" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[The package/module to analyze.]]></short-description>
-        <description><![CDATA[
-          The package/module to analyze.
-        ]]></description>
-      </attribute>
-      <attribute name="passfile" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[Password file to read passwords from.]]></short-description>
-        <description><![CDATA[
-          Password file to read passwords from.
-        ]]></description>
-      </attribute>
-      <attribute name="port" type="int"
-                 briefType="int" required="NOTDEFINED">
-        <short-description><![CDATA[Port used by CVS to communicate with the server.]]></short-description>
-        <description><![CDATA[
-          Port used by CVS to communicate with the server.
-        ]]></description>
-      </attribute>
-      <attribute name="quiet" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[If true, suppress informational messages.]]></short-description>
-        <description><![CDATA[
-          If true, suppress informational messages.
-        ]]></description>
-      </attribute>
-      <attribute name="startdate" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Start date.]]></short-description>
-        <description><![CDATA[
-          Set the start date.
-        ]]></description>
-      </attribute>
-      <attribute name="starttag" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Start tag.]]></short-description>
-        <description><![CDATA[
-          Set the start tag.
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="ddcreator" category="other"
-      classname="org.apache.tools.ant.taskdefs.optional.ejb.DDCreator"
-      matchingTask="true">
-
-  <short-description><![CDATA[Builds a serialized deployment descriptor given a text file description of the descriptor in the format supported by WebLogic.]]></short-description>
-  <description>
-    <![CDATA[Builds a serialized deployment descriptor given a text file description of the
- descriptor in the format supported by WebLogic.
-
- This ant task is a front end for the weblogic DDCreator tool.]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="classpath" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Classpath to be used for this compilation.]]></short-description>
-        <description><![CDATA[
-          Set the classpath to be used for this compilation.
-        ]]></description>
-      </attribute>
-      <attribute name="descriptors" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Directory from where the text descriptions of the deployment descriptors are
- to be read.]]></short-description>
-        <description><![CDATA[
-          Set the directory from where the text descriptions of the deployment descriptors are
- to be read.
-        ]]></description>
-      </attribute>
-      <attribute name="dest" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Directory into which the serialized deployment descriptors are to
- be written.]]></short-description>
-        <description><![CDATA[
-          Set the directory into which the serialized deployment descriptors are to
- be written.
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="delete" category="filesystem"
-      classname="org.apache.tools.ant.taskdefs.Delete"
-      matchingTask="true">
-
-  <short-description><![CDATA[Deletes a file or directory, or set of files defined by a fileset.]]></short-description>
-  <description>
-    <![CDATA[Deletes a file or directory, or set of files defined by a fileset.
- The original delete task would delete a file, or a set of files 
- using the include/exclude syntax.  The deltree task would delete a 
- directory tree.  This task combines the functionality of these two
- originally distinct tasks.
- <p>Currently Delete extends MatchingTask.  This is intend <i>only</i>
- to provide backwards compatibility for a release.  The future position
- is to use nested filesets exclusively.</p>]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="defaultexcludes" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Sets whether default exclusions should be used or not.]]></short-description>
-        <description><![CDATA[
-          Sets whether default exclusions should be used or not.
-        ]]></description>
-      </attribute>
-      <attribute name="dir" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[Directory from which files are to be deleted.]]></short-description>
-        <description><![CDATA[
-          Set the directory from which files are to be deleted
-        ]]></description>
-      </attribute>
-      <attribute name="excludes" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Set of exclude patterns.]]></short-description>
-        <description><![CDATA[
-          Sets the set of exclude patterns. Patterns may be separated by a comma
- or a space.
-        ]]></description>
-      </attribute>
-      <attribute name="excludesfile" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[Name of the file containing the includes patterns.]]></short-description>
-        <description><![CDATA[
-          Sets the name of the file containing the includes patterns.
-        ]]></description>
-      </attribute>
-      <attribute name="failonerror" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[If false, note errors but continue.]]></short-description>
-        <description><![CDATA[
-          If false, note errors but continue.
-        ]]></description>
-      </attribute>
-      <attribute name="file" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[Name of a single file to be removed.]]></short-description>
-        <description><![CDATA[
-          Set the name of a single file to be removed.
-        ]]></description>
-      </attribute>
-      <attribute name="includeemptydirs" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[If true, delete empty directories.]]></short-description>
-        <description><![CDATA[
-          If true, delete empty directories.
-        ]]></description>
-      </attribute>
-      <attribute name="includes" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Set of include patterns.]]></short-description>
-        <description><![CDATA[
-          Sets the set of include patterns. Patterns may be separated by a comma
- or a space.
-        ]]></description>
-      </attribute>
-      <attribute name="includesfile" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[Name of the file containing the includes patterns.]]></short-description>
-        <description><![CDATA[
-          Sets the name of the file containing the includes patterns.
-        ]]></description>
-      </attribute>
-      <attribute name="quiet" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[If true and the file does not exist, do not display a diagnostic
- message or modify the exit status to reflect an error.]]></short-description>
-        <description><![CDATA[
-          If true and the file does not exist, do not display a diagnostic
- message or modify the exit status to reflect an error.
- This means that if a file or directory cannot be deleted,
- then no error is reported. This setting emulates the
- -f option to the Unix &quot;rm&quot; command.
- Default is false meaning things are &quot;noisy&quot;
-        ]]></description>
-      </attribute>
-      <attribute name="verbose" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[If true, list all names of deleted files.]]></short-description>
-        <description><![CDATA[
-          If true, list all names of deleted files.
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-      <element name="fileset" type="org.apache.tools.ant.types.FileSet"
-               briefType="Fileset"
-               required="NOTDEFINED">
-        <short-description><![CDATA[Adds a set of files to be deleted.]]></short-description>
-        <description>
-          <![CDATA[Adds a set of files to be deleted.]]>
-        </description>
-      </element>
-
-      <element name="exclude" type="org.apache.tools.ant.types.PatternSet.NameEntry"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[Add a name entry on the exclude list.]]></short-description>
-        <description>
-          <![CDATA[add a name entry on the exclude list]]>
-        </description>
-      </element>
-
-      <element name="excludesfile" type="org.apache.tools.ant.types.PatternSet.NameEntry"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[Add a name entry on the include files list.]]></short-description>
-        <description>
-          <![CDATA[add a name entry on the include files list]]>
-        </description>
-      </element>
-
-      <element name="include" type="org.apache.tools.ant.types.PatternSet.NameEntry"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[Add a name entry on the include list.]]></short-description>
-        <description>
-          <![CDATA[add a name entry on the include list]]>
-        </description>
-      </element>
-
-      <element name="includesfile" type="org.apache.tools.ant.types.PatternSet.NameEntry"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[Add a name entry on the include files list.]]></short-description>
-        <description>
-          <![CDATA[add a name entry on the include files list]]>
-        </description>
-      </element>
-
-      <element name="patternset" type="org.apache.tools.ant.types.PatternSet"
-               briefType="Patternset"
-               required="NOTDEFINED">
-        <short-description><![CDATA[Add a set of patterns.]]></short-description>
-        <description>
-          <![CDATA[add a set of patterns]]>
-        </description>
-      </element>
-
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="deltree" category="other"
-      classname="org.apache.tools.ant.taskdefs.Deltree"
-      deprecated="true"
-      >
-
-  <short-description><![CDATA[No Description.]]></short-description>
-  <description>
-    <![CDATA[]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="dir" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[Directory to be deleted.]]></short-description>
-        <description><![CDATA[
-          Set the directory to be deleted
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="depend" category="other"
-      classname="org.apache.tools.ant.taskdefs.optional.depend.Depend"
-      matchingTask="true">
-
-  <short-description><![CDATA[Generates a dependency file for a given set of classes.]]></short-description>
-  <description>
-    <![CDATA[Generates a dependency file for a given set of classes.]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="cache" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[Dependency cache file.]]></short-description>
-        <description><![CDATA[
-          Sets the dependency cache file.
-        ]]></description>
-      </attribute>
-      <attribute name="classpath" type="org.apache.tools.ant.types.Path"
-                 briefType="Path" required="NOTDEFINED">
-        <short-description><![CDATA[Classpath to be used for this dependency check.]]></short-description>
-        <description><![CDATA[
-          Set the classpath to be used for this dependency check.
-        ]]></description>
-      </attribute>
-      <attribute name="classpathref" type="org.apache.tools.ant.types.Reference"
-                 briefType="Reference" required="NOTDEFINED">
-        <short-description><![CDATA[Adds a reference to a classpath defined elsewhere.]]></short-description>
-        <description><![CDATA[
-          Adds a reference to a classpath defined elsewhere.
-        ]]></description>
-      </attribute>
-      <attribute name="closure" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[If true, transitive dependencies are followed until the
- closure of the dependency set if reached.]]></short-description>
-        <description><![CDATA[
-          If true, transitive dependencies are followed until the
- closure of the dependency set if reached.
- When not set, the depend task will only follow
- direct dependencies between classes.
-        ]]></description>
-      </attribute>
-      <attribute name="destdir" type="org.apache.tools.ant.types.Path"
-                 briefType="Path" required="NOTDEFINED">
-        <short-description><![CDATA[Destination directory where the compiled Java files exist.]]></short-description>
-        <description><![CDATA[
-          Set the destination directory where the compiled Java files exist.
-        ]]></description>
-      </attribute>
-      <attribute name="dump" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[If true, the dependency information will be written
- to the debug level log.]]></short-description>
-        <description><![CDATA[
-          If true, the dependency information will be written
- to the debug level log.
-        ]]></description>
-      </attribute>
-      <attribute name="srcdir" type="org.apache.tools.ant.types.Path"
-                 briefType="Path" required="NOTDEFINED">
-        <short-description><![CDATA[Directories path to find the Java source files.]]></short-description>
-        <description><![CDATA[
-          Set the directories path to find the Java source files.
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-      <element name="classpath" type="org.apache.tools.ant.types.Path"
-               briefType="Path"
-               required="NOTDEFINED">
-        <short-description><![CDATA[Adds a classpath to be used for this dependency check.]]></short-description>
-        <description>
-          <![CDATA[Adds a classpath to be used for this dependency check.]]>
-        </description>
-      </element>
-
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="dependset" category="filesystem"
-      classname="org.apache.tools.ant.taskdefs.DependSet"
-      matchingTask="true">
-
-  <short-description><![CDATA[Examines and removes out of date target files.]]></short-description>
-  <description>
-    <![CDATA[Examines and removes out of date target files.  If any of the target files
- are out of date with respect to any of the source files, all target
- files are removed.  This is useful where dependencies cannot be
- computed (for example, dynamically interpreted parameters or files
- that need to stay in synch but are not directly linked) or where
- the ant task in question could compute them but does not (for
- example, the linked DTD for an XML file using the style task).
-
- nested arguments:
- <ul>
- <li>srcfileset     (fileset describing the source files to examine)
- <li>srcfilelist    (filelist describing the source files to examine)
- <li>targetfileset  (fileset describing the target files to examine)
- <li>targetfilelist (filelist describing the target files to examine)
- </ul>
- At least one instance of either a fileset or filelist for both source and 
- target are required.
- <p>
- This task will examine each of the source files against each of the target 
- files. If any target files are out of date with respect to any of the source 
- files, all targets are removed. If any files named in a (src or target) 
- filelist do not exist, all targets are removed.
- Hint: If missing files should be ignored, specify them as include patterns 
- in filesets, rather than using filelists.
- </p><p>
- This task attempts to optimize speed of dependency checking.  It will stop 
- after the first out of date file is found and remove all targets, rather 
- than exhaustively checking every source vs target combination unnecessarily.
- </p><p>
- Example uses: 
- <ul><li>
- Record the fact that an XML file must be up to date
- with respect to its XSD (Schema file), even though the XML file
- itself includes no reference to its XSD.
- </li><li>
- Record the fact that an XSL stylesheet includes other
- sub-stylesheets
- </li><li>
- Record the fact that java files must be recompiled if the ant build
- file changes
- </li></ul>]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-    </attributes>
-
-    <elements>
-      <element name="srcfilelist" type="org.apache.tools.ant.types.FileList"
-               briefType="Filelist"
-               required="NOTDEFINED">
-        <short-description><![CDATA[Add a list of source files.]]></short-description>
-        <description>
-          <![CDATA[Add a list of source files.]]>
-        </description>
-      </element>
-
-      <element name="srcfileset" type="org.apache.tools.ant.types.FileSet"
-               briefType="Fileset"
-               required="NOTDEFINED">
-        <short-description><![CDATA[Add a set of source files.]]></short-description>
-        <description>
-          <![CDATA[Add a set of source files.]]>
-        </description>
-      </element>
-
-      <element name="targetfilelist" type="org.apache.tools.ant.types.FileList"
-               briefType="Filelist"
-               required="NOTDEFINED">
-        <short-description><![CDATA[Add a list of target files.]]></short-description>
-        <description>
-          <![CDATA[Add a list of target files.]]>
-        </description>
-      </element>
-
-      <element name="targetfileset" type="org.apache.tools.ant.types.FileSet"
-               briefType="Fileset"
-               required="NOTDEFINED">
-        <short-description><![CDATA[Add a set of target files.]]></short-description>
-        <description>
-          <![CDATA[Add a set of target files.]]>
-        </description>
-      </element>
-
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="dirname" category="property"
-      classname="org.apache.tools.ant.taskdefs.Dirname"
-      >
-
-  <short-description><![CDATA[Determines the directory name of the specified file.]]></short-description>
-  <description>
-    <![CDATA[Determines the directory name of the specified file.
-
- This task can accept the following attributes:
- <ul>
- <li>file
- <li>property
- </ul>
- Both <b>file</b> and <b>property</b> are required.
- <p>
- When this task executes, it will set the specified property to the
- value of the specified file up to, but not including, the last path
- element. If file is a file, the directory will be the current
- directory.]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="file" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[Path to take the dirname of.]]></short-description>
-        <description><![CDATA[
-          Path to take the dirname of.
-        ]]></description>
-      </attribute>
-      <attribute name="property" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[The name of the property to set.]]></short-description>
-        <description><![CDATA[
-          The name of the property to set.
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="ear" category="packaging"
-      classname="org.apache.tools.ant.taskdefs.Ear"
-      matchingTask="true">
-
-  <short-description><![CDATA[Creates a EAR archive.]]></short-description>
-  <description>
-    <![CDATA[Creates a EAR archive. Based on WAR task]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="appxml" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[File to incorporate as application.xml.]]></short-description>
-        <description><![CDATA[
-          File to incorporate as application.xml.
-        ]]></description>
-      </attribute>
-      <attribute name="basedir" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[Directory from which to archive files; optional.]]></short-description>
-        <description><![CDATA[
-          Directory from which to archive files; optional.
-        ]]></description>
-      </attribute>
-      <attribute name="compress" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Whether we want to compress the files or only store them;
- optional, default=true;.]]></short-description>
-        <description><![CDATA[
-          Whether we want to compress the files or only store them;
- optional, default=true;
-        ]]></description>
-      </attribute>
-      <attribute name="destfile" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[The file to create; required.]]></short-description>
-        <description><![CDATA[
-          The file to create; required.
-        ]]></description>
-      </attribute>
-      <attribute name="duplicate" type="org.apache.tools.ant.taskdefs.Zip.Duplicate"
-                 briefType="&quot;add&quot;, &quot;preserve&quot;, &quot;fail&quot;" required="NOTDEFINED">
-        <short-description><![CDATA[Sets behavior for when a duplicate file is about to be added -
- one of <code>keep</code>, <code>skip</code> or <code>overwrite</code>.]]></short-description>
-        <description><![CDATA[
-          Sets behavior for when a duplicate file is about to be added -
- one of <code>keep</code>, <code>skip</code> or <code>overwrite</code>.
- Possible values are: <code>keep</code> (keep both
- of the files); <code>skip</code> (keep the first version
- of the file found); <code>overwrite</code> overwrite the file
- with the new file
- Default for zip tasks is <code>keep</code>
-        ]]></description>
-      </attribute>
-      <attribute name="encoding" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Encoding to use for filenames, defaults to the platform's
- default encoding.]]></short-description>
-        <description><![CDATA[
-          Encoding to use for filenames, defaults to the platform's
- default encoding.
-
- <p>For a list of possible values see <a
- href="http://java.sun.com/products/jdk/1.2/docs/guide/internat/encoding.doc.html">http://java.sun.com/products/jdk/1.2/docs/guide/internat/encoding.doc.html</a>.</p>
-        ]]></description>
-      </attribute>
-      <attribute name="filesonly" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[If true, emulate Sun's jar utility by not adding parent directories;
- optional, defaults to false.]]></short-description>
-        <description><![CDATA[
-          If true, emulate Sun's jar utility by not adding parent directories;
- optional, defaults to false.
-        ]]></description>
-      </attribute>
-      <attribute name="index" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Set whether or not to create an index list for classes.]]></short-description>
-        <description><![CDATA[
-          Set whether or not to create an index list for classes.
- This may speed up classloading in some cases.
-        ]]></description>
-      </attribute>
-      <attribute name="manifest" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[The manifest file to use.]]></short-description>
-        <description><![CDATA[
-          The manifest file to use. This can be either the location of a manifest,
- or the name of a jar added through a fileset. If its the name of an added
- jar, the task expects the manifest to be in the jar at META-INF/MANIFEST.MF.
-        ]]></description>
-      </attribute>
-      <attribute name="update" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[If true, updates an existing file, otherwise overwrite
- any existing one; optional defaults to false.]]></short-description>
-        <description><![CDATA[
-          If true, updates an existing file, otherwise overwrite
- any existing one; optional defaults to false.
-        ]]></description>
-      </attribute>
-      <attribute name="whenempty" type="org.apache.tools.ant.taskdefs.Zip.WhenEmpty"
-                 briefType="&quot;fail&quot;, &quot;skip&quot;, &quot;create&quot;" required="NOTDEFINED">
-        <short-description><![CDATA[Sets behavior of the task when no files match.]]></short-description>
-        <description><![CDATA[
-          Sets behavior of the task when no files match.
- Possible values are: <code>fail</code> (throw an exception
- and halt the build); <code>skip</code> (do not create
- any archive, but issue a warning); <code>create</code>
- (make an archive with no entries).
- Default for zip tasks is <code>skip</code>;
- for jar tasks, <code>create</code>.
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-      <element name="archives" type="org.apache.tools.ant.types.ZipFileSet"
-               briefType="ZipFileset"
-               required="NOTDEFINED">
-        <short-description><![CDATA[Adds zipfileset.]]></short-description>
-        <description>
-          <![CDATA[Adds zipfileset.]]>
-        </description>
-      </element>
-
-      <element name="manifest" type="org.apache.tools.ant.taskdefs.Manifest"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[Allows the manifest for the archive file to be provided inline
- in the buildfile rather than in an external file.]]></short-description>
-        <description>
-          <![CDATA[Allows the manifest for the archive file to be provided inline
- in the buildfile rather than in an external file.]]>
-        </description>
-      </element>
-
-      <element name="fileset" type="org.apache.tools.ant.types.FileSet"
-               briefType="Fileset"
-               required="NOTDEFINED">
-        <short-description><![CDATA[Adds a set of files.]]></short-description>
-        <description>
-          <![CDATA[Adds a set of files.]]>
-        </description>
-      </element>
-
-      <element name="metainf" type="org.apache.tools.ant.types.ZipFileSet"
-               briefType="ZipFileset"
-               required="NOTDEFINED">
-        <short-description><![CDATA[Adds a zipfileset to include in the META-INF directory.]]></short-description>
-        <description>
-          <![CDATA[Adds a zipfileset to include in the META-INF directory.]]>
-        </description>
-      </element>
-
-      <element name="zipgroupfileset" type="org.apache.tools.ant.types.FileSet"
-               briefType="Fileset"
-               required="NOTDEFINED">
-        <short-description><![CDATA[Adds a group of zip files.]]></short-description>
-        <description>
-          <![CDATA[Adds a group of zip files.]]>
-        </description>
-      </element>
-
-      <element name="zipfileset" type="org.apache.tools.ant.types.ZipFileSet"
-               briefType="ZipFileset"
-               required="NOTDEFINED">
-        <short-description><![CDATA[Adds a set of files that can be
- read from an archive and be given a prefix/fullpath.]]></short-description>
-        <description>
-          <![CDATA[Adds a set of files that can be
- read from an archive and be given a prefix/fullpath.]]>
-        </description>
-      </element>
-
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="echo" category="utility"
-      classname="org.apache.tools.ant.taskdefs.Echo"
-      >
-
-  <short-description><![CDATA[Writes a message to the Ant logging facilities.]]></short-description>
-  <description>
-    <![CDATA[Writes a message to the Ant logging facilities.]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="append" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[If true, append to existing file.]]></short-description>
-        <description><![CDATA[
-          If true, append to existing file.
-        ]]></description>
-      </attribute>
-      <attribute name="file" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[File to write to.]]></short-description>
-        <description><![CDATA[
-          File to write to.
-        ]]></description>
-      </attribute>
-      <attribute name="level" type="org.apache.tools.ant.taskdefs.Echo.EchoLevel"
-                 briefType="&quot;error&quot;, &quot;warning&quot;, &quot;info&quot;, &quot;verbose&quot;, &quot;debug&quot;" required="NOTDEFINED">
-        <short-description><![CDATA[Logging level.]]></short-description>
-        <description><![CDATA[
-          Set the logging level. Level should be one of
- <ul>
-  <li>error</li>
-  <li>warning</li>
-  <li>info</li>
-  <li>verbose</li>
-  <li>debug</li>
- </ul>
- <p>The default is &quot;warning&quot; to ensure that messages are
- displayed by default when using the -quiet command line option.</p>
-        ]]></description>
-      </attribute>
-      <attribute name="message" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Message to write.]]></short-description>
-        <description><![CDATA[
-          Message to write.
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-    </elements>
-
-      <body >
-        <description><![CDATA[
-          Set a multiline message.
-        ]]></description>
-      </body>
-
-  </structure>
-
-</task>
-
-
-<task name="echoproperties" category="other"
-      classname="org.apache.tools.ant.taskdefs.optional.EchoProperties"
-      >
-
-  <short-description><![CDATA[Displays all the current properties in the build.]]></short-description>
-  <description>
-    <![CDATA[Displays all the current properties in the build. The output can be sent to
-  a file if desired. <P>
-
-  Attribute "destfile" defines a file to send the properties to. This can be
-  processed as a standard property file later. <P>
-
-  Attribute "prefix" defines a prefix which is used to filter the properties
-  only those properties starting with this prefix will be echoed. <P>
-
-  By default, the "failonerror" attribute is enabled. If an error occurs while
-  writing the properties to a file, and this attribute is enabled, then a
-  BuildException will be thrown. If disabled, then IO errors will be reported
-  as a log statement, but no error will be thrown. <P>
-
-  Examples: <pre>
-  &lt;echoproperties  /&gt;
- </pre> Report the current properties to the log. <P>
-
-  <pre>
-  &lt;echoproperties destfile="my.properties" /&gt;
- </pre> Report the current properties to the file "my.properties", and will
-  fail the build if the file could not be created or written to. <P>
-
-  <pre>
-  &lt;echoproperties destfile="my.properties" failonerror="false"
-      prefix="ant" /&gt;
- </pre> Report all properties beginning with 'ant' to the file
-  "my.properties", and will log a message if the file could not be created or
-  written to, but will still allow the build to continue.]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="destfile" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[File to store the property output.]]></short-description>
-        <description><![CDATA[
-          Set a file to store the property output.  If this is never specified,
-  then the output will be sent to the Ant log.
-        ]]></description>
-      </attribute>
-      <attribute name="failonerror" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[If true, the task will fail if an error occurs writing the properties
- file, otherwise errors are just logged.]]></short-description>
-        <description><![CDATA[
-          If true, the task will fail if an error occurs writing the properties
- file, otherwise errors are just logged.
-        ]]></description>
-      </attribute>
-      <attribute name="prefix" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[If the prefix is set, then only properties which start with this
-  prefix string will be recorded.]]></short-description>
-        <description><![CDATA[
-          If the prefix is set, then only properties which start with this
-  prefix string will be recorded.  If this is never set, or it is set
-  to an empty string or <tt>null</tt>, then all properties will be
-  recorded. <P>
-
-  For example, if the property is set as:
-    <PRE>&lt;echoproperties  prefix="ant." /&gt;</PRE>
-  then the property "ant.home" will be recorded, but "ant-example"
-  will not.
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="ejbc" category="other"
-      classname="org.apache.tools.ant.taskdefs.optional.ejb.Ejbc"
-      matchingTask="true">
-
-  <short-description><![CDATA[Builds EJB support classes using WebLogic's ejbc tool from a directory containing a set of deployment descriptors.]]></short-description>
-  <description>
-    <![CDATA[Builds EJB support classes using WebLogic's ejbc tool from a directory containing
- a set of deployment descriptors.]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="classpath" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Classpath to be used for this compilation.]]></short-description>
-        <description><![CDATA[
-          Set the classpath to be used for this compilation.
-        ]]></description>
-      </attribute>
-      <attribute name="descriptors" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Directory from where the serialized deployment descriptors are
- to be read.]]></short-description>
-        <description><![CDATA[
-          Set the directory from where the serialized deployment descriptors are
- to be read.
-        ]]></description>
-      </attribute>
-      <attribute name="dest" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Directory into which the support classes, RMI stubs, etc are to be written.]]></short-description>
-        <description><![CDATA[
-          Set the directory into which the support classes, RMI stubs, etc are to be written.
-        ]]></description>
-      </attribute>
-      <attribute name="keepgenerated" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[If true, ejbc will keep the
- intermediate Java files used to build the class files.]]></short-description>
-        <description><![CDATA[
-          If true, ejbc will keep the
- intermediate Java files used to build the class files.
- This can be useful when debugging.
-        ]]></description>
-      </attribute>
-      <attribute name="manifest" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Name of the generated manifest file.]]></short-description>
-        <description><![CDATA[
-          Set the name of the generated manifest file.
-
- For each EJB that is processed an entry is created in this file. This can then be used
- to create a jar file for dploying the beans.
-        ]]></description>
-      </attribute>
-      <attribute name="src" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Directory containing the source code for the home interface, remote interface
- and public key class definitions.]]></short-description>
-        <description><![CDATA[
-          Set the directory containing the source code for the home interface, remote interface
- and public key class definitions.
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="ejbjar" category="other"
-      classname="org.apache.tools.ant.taskdefs.optional.ejb.EjbJar"
-      matchingTask="true">
-
-  <short-description><![CDATA[Provides automated EJB JAR file creation.]]></short-description>
-  <description>
-    <![CDATA[Provides automated EJB JAR file creation.
- <p>
- Extends the
- MatchingTask class provided in the default ant distribution to provide a
- directory scanning EJB jarfile generator.
- </p>
-
- <p>
- The task works by taking the deployment descriptors one at a time and
- parsing them to locate the names of the classes which should be placed in
- the jar. The classnames are translated to java.io.Files by replacing
- periods with File.separatorChar and resolving the generated filename as a
- relative path under the srcDir attribute. All necessary files are then
- assembled into a jarfile. One jarfile is constructed for each deployment
- descriptor found.
- </p>]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="basejarname" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Base name of the EJB JAR that is to be created if it is not
- to be determined from the name of the deployment descriptor files.]]></short-description>
-        <description><![CDATA[
-          Set the base name of the EJB JAR that is to be created if it is not
- to be determined from the name of the deployment descriptor files.
-        ]]></description>
-      </attribute>
-      <attribute name="basenameterminator" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[The string which terminates the bean name.]]></short-description>
-        <description><![CDATA[
-          The string which terminates the bean name.
- The convention used by this task is
- that bean descriptors are named as the BeanName with some suffix. The
- baseNameTerminator string separates the bean name and the suffix and
- is used to determine the bean name.
-        ]]></description>
-      </attribute>
-      <attribute name="classpath" type="org.apache.tools.ant.types.Path"
-                 briefType="Path" required="NOTDEFINED">
-        <short-description><![CDATA[Classpath to use when resolving classes for inclusion in the jar.]]></short-description>
-        <description><![CDATA[
-          Set the classpath to use when resolving classes for inclusion in the jar.
-        ]]></description>
-      </attribute>
-      <attribute name="dependency" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Analyzer to use when adding in dependencies to the JAR.]]></short-description>
-        <description><![CDATA[
-          Set the analyzer to use when adding in dependencies to the JAR.
-        ]]></description>
-      </attribute>
-      <attribute name="descriptordir" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[Descriptor directory.]]></short-description>
-        <description><![CDATA[
-          Set the descriptor directory. The descriptor directory contains the
- EJB deployment descriptors. These are XML files that declare the
- properties of a bean in a particular deployment scenario. Such
- properties include, for example, the transactional nature of the bean
- and the security access control to the bean's methods.
-        ]]></description>
-      </attribute>
-      <attribute name="destdir" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[Destination directory.]]></short-description>
-        <description><![CDATA[
-          Set the destination directory. The EJB jar files will be written into
- this directory. The jar files that exist in this directory are also
- used when determining if the contents of the jar file have changed.
- Note that this parameter is only used if no deployment tools are
- specified. Typically each deployment tool will specify its own
- destination directory.
-        ]]></description>
-      </attribute>
-      <attribute name="flatdestdir" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Controls whether the
- destination JARs are written out in the destination directory with
- the same hierarchical structure from which the deployment descriptors
- have been read.]]></short-description>
-        <description><![CDATA[
-          Controls whether the
- destination JARs are written out in the destination directory with
- the same hierarchical structure from which the deployment descriptors
- have been read. If this is set to true the generated EJB jars are
- written into the root of the destination directory, otherwise they
- are written out in the same relative position as the deployment
- descriptors in the descriptor directory.
-        ]]></description>
-      </attribute>
-      <attribute name="genericjarsuffix" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Suffix for the generated jar file.]]></short-description>
-        <description><![CDATA[
-          Set the suffix for the generated jar file. When generic jars are
- generated, they have a suffix which is appended to the the bean name
- to create the name of the jar file. Note that this suffix includes
- the extension fo te jar file and should therefore end with an
- appropriate extension such as .jar or .ear
-        ]]></description>
-      </attribute>
-      <attribute name="manifest" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[Manifest file to use when jarring.]]></short-description>
-        <description><![CDATA[
-          Set the Manifest file to use when jarring. As of EJB 1.1, manifest
- files are no longer used to configure the EJB. However, they still
- have a vital importance if the EJB is intended to be packaged in an
- EAR file. By adding "Class-Path" settings to a Manifest file, the EJB
- can look for classes inside the EAR file itself, allowing for easier
- deployment. This is outlined in the J2EE specification, and all J2EE
- components are meant to support it.
-        ]]></description>
-      </attribute>
-      <attribute name="naming" type="org.apache.tools.ant.taskdefs.optional.ejb.EjbJar.NamingScheme"
-                 briefType="&quot;ejb-name&quot;, &quot;directory&quot;, &quot;descriptor&quot;, &quot;basejarname&quot;" required="NOTDEFINED">
-        <short-description><![CDATA[Naming scheme used to determine the name of the generated jars
- from the deployment descriptor.]]></short-description>
-        <description><![CDATA[
-          Set the naming scheme used to determine the name of the generated jars
- from the deployment descriptor
-        ]]></description>
-      </attribute>
-      <attribute name="srcdir" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[Source directory, which is the directory that
- contains the classes that will be added to the EJB jar.]]></short-description>
-        <description><![CDATA[
-          Sets the source directory, which is the directory that
- contains the classes that will be added to the EJB jar. Typically
- this will include the home and remote interfaces and the bean class.
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-      <element name="borland" type="org.apache.tools.ant.taskdefs.optional.ejb.BorlandDeploymentTool"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[Adds a deployment tool for Borland server.]]></short-description>
-        <description>
-          <![CDATA[Adds a deployment tool for Borland server.]]>
-        </description>
-      </element>
-
-      <element name="classpath" type="org.apache.tools.ant.types.Path"
-               briefType="Path"
-               required="NOTDEFINED">
-        <short-description><![CDATA[Adds to the classpath used to locate the super classes and
- interfaces of the classes that will make up the EJB JAR.]]></short-description>
-        <description>
-          <![CDATA[Adds to the classpath used to locate the super classes and
- interfaces of the classes that will make up the EJB JAR.]]>
-        </description>
-      </element>
-
-      <element name="dtd" type="org.apache.tools.ant.taskdefs.optional.ejb.EjbJar.DTDLocation"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[Create a DTD location record.]]></short-description>
-        <description>
-          <![CDATA[Create a DTD location record. This stores the location of a DTD. The
- DTD is identified by its public Id. The location may either be a file
- location or a resource location.]]>
-        </description>
-      </element>
-
-      <element name="iplanet" type="org.apache.tools.ant.taskdefs.optional.ejb.IPlanetDeploymentTool"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[Adds a deployment tool for iPlanet Application Server.]]></short-description>
-        <description>
-          <![CDATA[Adds a deployment tool for iPlanet Application Server.]]>
-        </description>
-      </element>
-
-      <element name="jboss" type="org.apache.tools.ant.taskdefs.optional.ejb.JbossDeploymentTool"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[Adds a deployment tool for JBoss server.]]></short-description>
-        <description>
-          <![CDATA[Adds a deployment tool for JBoss server.]]>
-        </description>
-      </element>
-
-      <element name="jonas" type="org.apache.tools.ant.taskdefs.optional.ejb.JonasDeploymentTool"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[Adds a deployment tool for JOnAS server.]]></short-description>
-        <description>
-          <![CDATA[Adds a deployment tool for JOnAS server.]]>
-        </description>
-      </element>
-
-      <element name="support" type="org.apache.tools.ant.types.FileSet"
-               briefType="Fileset"
-               required="NOTDEFINED">
-        <short-description><![CDATA[Adds a fileset for support elements.]]></short-description>
-        <description>
-          <![CDATA[Adds a fileset for support elements.]]>
-        </description>
-      </element>
-
-      <element name="weblogic" type="org.apache.tools.ant.taskdefs.optional.ejb.WeblogicDeploymentTool"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[Adds a deployment tool for Weblogic server.]]></short-description>
-        <description>
-          <![CDATA[Adds a deployment tool for Weblogic server.]]>
-        </description>
-      </element>
-
-      <element name="weblogictoplink" type="org.apache.tools.ant.taskdefs.optional.ejb.WeblogicTOPLinkDeploymentTool"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[Adds a deployment tool for Weblogic when using the Toplink
- Object-Relational mapping.]]></short-description>
-        <description>
-          <![CDATA[Adds a deployment tool for Weblogic when using the Toplink
- Object-Relational mapping.]]>
-        </description>
-      </element>
-
-      <element name="websphere" type="org.apache.tools.ant.taskdefs.optional.ejb.WebsphereDeploymentTool"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[Adds a deployment tool for Websphere 4.0 server.]]></short-description>
-        <description>
-          <![CDATA[Adds a deployment tool for Websphere 4.0 server.]]>
-        </description>
-      </element>
-
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="exec" category="control"
-      classname="org.apache.tools.ant.taskdefs.ExecTask"
-      >
-
-  <short-description><![CDATA[Executes a given command if the os platform is appropriate.]]></short-description>
-  <description>
-    <![CDATA[Executes a given command if the os platform is appropriate.]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="append" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Whether output should be appended to or overwrite an existing file.]]></short-description>
-        <description><![CDATA[
-          Whether output should be appended to or overwrite an existing file.
- Defaults to false.
-        ]]></description>
-      </attribute>
-      <attribute name="dir" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[The working directory of the process.]]></short-description>
-        <description><![CDATA[
-          The working directory of the process.
-        ]]></description>
-      </attribute>
-      <attribute name="executable" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[The command to execute.]]></short-description>
-        <description><![CDATA[
-          The command to execute.
-        ]]></description>
-      </attribute>
-      <attribute name="failifexecutionfails" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Stop the build if program cannot be started.]]></short-description>
-        <description><![CDATA[
-          Stop the build if program cannot be started. Defaults to true.
-        ]]></description>
-      </attribute>
-      <attribute name="failonerror" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Fail if the command exits with a non-zero return code.]]></short-description>
-        <description><![CDATA[
-          Fail if the command exits with a non-zero return code.
-        ]]></description>
-      </attribute>
-      <attribute name="newenvironment" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Do not propagate old environment when new environment variables are specified.]]></short-description>
-        <description><![CDATA[
-          Do not propagate old environment when new environment variables are specified.
-        ]]></description>
-      </attribute>
-      <attribute name="os" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[List of operating systems on which the command may be executed.]]></short-description>
-        <description><![CDATA[
-          List of operating systems on which the command may be executed.
-        ]]></description>
-      </attribute>
-      <attribute name="output" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[File the output of the process is redirected to.]]></short-description>
-        <description><![CDATA[
-          File the output of the process is redirected to.
-        ]]></description>
-      </attribute>
-      <attribute name="outputproperty" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Property name whose value should be set to the output of
- the process.]]></short-description>
-        <description><![CDATA[
-          Property name whose value should be set to the output of
- the process.
-        ]]></description>
-      </attribute>
-      <attribute name="resultproperty" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[The name of a property in which the return code of the
- command should be stored.]]></short-description>
-        <description><![CDATA[
-          The name of a property in which the return code of the
- command should be stored. Only of interest if failonerror=false.
-        ]]></description>
-      </attribute>
-      <attribute name="vmlauncher" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[If true, launch new process with VM, otherwise use the OS's shell.]]></short-description>
-        <description><![CDATA[
-          If true, launch new process with VM, otherwise use the OS's shell.
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-      <element name="env" type="org.apache.tools.ant.types.Environment.Variable"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[Add an environment variable to the launched process.]]></short-description>
-        <description>
-          <![CDATA[Add an environment variable to the launched process.]]>
-        </description>
-      </element>
-
-      <element name="arg" type="org.apache.tools.ant.types.Commandline.Argument"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[Adds a command-line argument.]]></short-description>
-        <description>
-          <![CDATA[Adds a command-line argument.]]>
-        </description>
-      </element>
-
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="fail" category="control"
-      classname="org.apache.tools.ant.taskdefs.Exit"
-      >
-
-  <short-description><![CDATA[Exits the active build, giving an additional message if available.]]></short-description>
-  <description>
-    <![CDATA[Exits the active build, giving an additional message
- if available.]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="if" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Only fail if a property of the given name exists in the current project.]]></short-description>
-        <description><![CDATA[
-          Only fail if a property of the given name exists in the current project.
-        ]]></description>
-      </attribute>
-      <attribute name="message" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[A message giving further information on why the build exited.]]></short-description>
-        <description><![CDATA[
-          A message giving further information on why the build exited.
-        ]]></description>
-      </attribute>
-      <attribute name="unless" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Only fail if a property of the given name does not
- exist in the current project.]]></short-description>
-        <description><![CDATA[
-          Only fail if a property of the given name does not
- exist in the current project.
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-    </elements>
-
-      <body >
-        <description><![CDATA[
-          Set a multiline message.
-        ]]></description>
-      </body>
-
-  </structure>
-
-</task>
-
-
-<task name="filter" category="filesystem"
-      classname="org.apache.tools.ant.taskdefs.Filter"
-      >
-
-  <short-description><![CDATA[Sets a token filter that is used by the file copy tasks to do token substitution.]]></short-description>
-  <description>
-    <![CDATA[Sets a token filter that is used by the file copy tasks
- to do token substitution. Sets mutiple tokens by
- reading these from a file.]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="filtersfile" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[The file from which the filters must be read.]]></short-description>
-        <description><![CDATA[
-          The file from which the filters must be read.
- This file must be a formatted as a property file.
-        ]]></description>
-      </attribute>
-      <attribute name="token" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[The token string without @ delimiters.]]></short-description>
-        <description><![CDATA[
-          The token string without @ delimiters.
-        ]]></description>
-      </attribute>
-      <attribute name="value" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[The string that should replace the token during filtered copies.]]></short-description>
-        <description><![CDATA[
-          The string that should replace the token during filtered copies.
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="fixcrlf" category="filesystem"
-      classname="org.apache.tools.ant.taskdefs.FixCRLF"
-      matchingTask="true">
-
-  <short-description><![CDATA[Converts text source files to local OS formatting conventions, as well as repair text files damaged by misconfigured or misguided editors or file transfer programs.]]></short-description>
-  <description>
-    <![CDATA[Converts text source files to local OS formatting conventions, as
- well as repair text files damaged by misconfigured or misguided editors or
- file transfer programs.
- <p>
- This task can take the following arguments:
- <ul>
- <li>srcdir
- <li>destdir
- <li>include
- <li>exclude
- <li>cr
- <li>eol
- <li>tab
- <li>eof
- <li>encoding
- </ul>
- Of these arguments, only <b>sourcedir</b> is required.
- <p>
- When this task executes, it will scan the srcdir based on the include
- and exclude properties.
- <p>
- This version generalises the handling of EOL characters, and allows
- for CR-only line endings (which I suspect is the standard on Macs.)
- Tab handling has also been generalised to accommodate any tabwidth
- from 2 to 80, inclusive.  Importantly, it will leave untouched any
- literal TAB characters embedded within string or character constants.
- <p>
- <em>Warning:</em> do not run on binary files.
- <em>Caution:</em> run with care on carefully formatted files.
- This may sound obvious, but if you don't specify asis, presume that
- your files are going to be modified.  If "tabs" is "add" or "remove",
- whitespace characters may be added or removed as necessary.  Similarly,
- for CR's - in fact "eol"="crlf" or cr="add" can result in cr
- characters being removed in one special case accommodated, i.e.,
- CRCRLF is regarded as a single EOL to handle cases where other
- programs have converted CRLF into CRCRLF.]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="destdir" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[Destination where the fixed files should be placed.]]></short-description>
-        <description><![CDATA[
-          Set the destination where the fixed files should be placed.
- Default is to replace the original file.
-        ]]></description>
-      </attribute>
-      <attribute name="encoding" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Specifies the encoding Ant expects the files to be in -
- defaults to the platforms default encoding.]]></short-description>
-        <description><![CDATA[
-          Specifies the encoding Ant expects the files to be in -
- defaults to the platforms default encoding.
-        ]]></description>
-      </attribute>
-      <attribute name="eof" type="org.apache.tools.ant.taskdefs.FixCRLF.AddAsisRemove"
-                 briefType="&quot;add&quot;, &quot;asis&quot;, &quot;remove&quot;" required="NOTDEFINED">
-        <short-description><![CDATA[Specify how DOS EOF (control-z) characters are to be handled.]]></short-description>
-        <description><![CDATA[
-          Specify how DOS EOF (control-z) characters are to be handled.
-        ]]></description>
-      </attribute>
-      <attribute name="eol" type="org.apache.tools.ant.taskdefs.FixCRLF.CrLf"
-                 briefType="&quot;asis&quot;, &quot;cr&quot;, &quot;lf&quot;, &quot;crlf&quot;" required="NOTDEFINED">
-        <short-description><![CDATA[Specify how EndOfLine characters are to be handled.]]></short-description>
-        <description><![CDATA[
-          Specify how EndOfLine characters are to be handled.
-        ]]></description>
-      </attribute>
-      <attribute name="javafiles" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Set to true if modifying Java source files.]]></short-description>
-        <description><![CDATA[
-          Set to true if modifying Java source files.
-        ]]></description>
-      </attribute>
-      <attribute name="srcdir" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[Source dir to find the source text files.]]></short-description>
-        <description><![CDATA[
-          Set the source dir to find the source text files.
-        ]]></description>
-      </attribute>
-      <attribute name="tab" type="org.apache.tools.ant.taskdefs.FixCRLF.AddAsisRemove"
-                 briefType="&quot;add&quot;, &quot;asis&quot;, &quot;remove&quot;" required="NOTDEFINED">
-        <short-description><![CDATA[Specify how tab characters are to be handled.]]></short-description>
-        <description><![CDATA[
-          Specify how tab characters are to be handled.
-        ]]></description>
-      </attribute>
-      <attribute name="tablength" type="int"
-                 briefType="int" required="NOTDEFINED">
-        <short-description><![CDATA[Specify tab length in characters.]]></short-description>
-        <description><![CDATA[
-          Specify tab length in characters.
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="ftp" category="other"
-      classname="org.apache.tools.ant.taskdefs.optional.net.FTP"
-      >
-
-  <short-description><![CDATA[Basic FTP client.]]></short-description>
-  <description>
-    <![CDATA[Basic FTP client. Performs the following actions:
- <ul>
-   <li> <strong>send</strong> - send files to a remote server. This is the
-   default action.</li>
-   <li> <strong>get</strong> - retrive files from a remote server.</li>
-   <li> <strong>del</strong> - delete files from a remote server.</li>
-   <li> <strong>list</strong> - create a file listing.</li>
-   <li> <strong>chmod</strong> - change unix file permissions.</li>
- </ul>
- <strong>Note:</strong> Some FTP servers - notably the Solaris server - seem
- to hold data ports open after a "retr" operation, allowing them to timeout
- instead of shutting them down cleanly. This happens in active or passive
- mode, and the ports will remain open even after ending the FTP session. FTP
- "send" operations seem to close ports immediately. This behavior may cause
- problems on some systems when downloading large sets of files.]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="action" type="org.apache.tools.ant.taskdefs.optional.net.FTP.Action"
-                 briefType="&quot;send&quot;, &quot;put&quot;, &quot;recv&quot;, &quot;get&quot;, &quot;del&quot;, &quot;delete&quot;, &quot;list&quot;, &quot;mkdir&quot;, &quot;chmod&quot;" required="NOTDEFINED">
-        <short-description><![CDATA[FTP action to be taken.]]></short-description>
-        <description><![CDATA[
-          Sets the FTP action to be taken. Currently accepts "put", "get", "del",
- "mkdir", "chmod" and "list".
-        ]]></description>
-      </attribute>
-      <attribute name="binary" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[If true, uses binary mode, otherwise text mode (default is binary).]]></short-description>
-        <description><![CDATA[
-          If true, uses binary mode, otherwise text mode (default is binary).
-        ]]></description>
-      </attribute>
-      <attribute name="chmod" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[File permission mode (Unix only) for files sent to the server.]]></short-description>
-        <description><![CDATA[
-          Sets the file permission mode (Unix only) for files sent to the server.
-        ]]></description>
-      </attribute>
-      <attribute name="depends" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Set to true to transmit only files that are new or changed from their
- remote counterparts.]]></short-description>
-        <description><![CDATA[
-          Set to true to transmit only files that are new or changed from their
- remote counterparts. The default is to transmit all files.
-        ]]></description>
-      </attribute>
-      <attribute name="ignorenoncriticalerrors" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Flag to skip errors on directory creation.
- (and maybe later other server specific errors).]]></short-description>
-        <description><![CDATA[
-          set the flag to skip errors on directory creation.
- (and maybe later other server specific errors)
-        ]]></description>
-      </attribute>
-      <attribute name="listing" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[The output file for the "list" action.]]></short-description>
-        <description><![CDATA[
-          The output file for the "list" action. This attribute is ignored for
- any other actions.
-        ]]></description>
-      </attribute>
-      <attribute name="newer" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[A synonym for <tt>depends</tt>.]]></short-description>
-        <description><![CDATA[
-          A synonym for <tt>depends</tt>. Set to true to transmit only new or changed
- files.
-        ]]></description>
-      </attribute>
-      <attribute name="passive" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Specifies whether to use passive mode.]]></short-description>
-        <description><![CDATA[
-          Specifies whether to use passive mode. Set to true if you are behind a
- firewall and cannot connect without it. Passive mode is disabled by
- default.
-        ]]></description>
-      </attribute>
-      <attribute name="password" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Login password for the given user id.]]></short-description>
-        <description><![CDATA[
-          Sets the login password for the given user id.
-        ]]></description>
-      </attribute>
-      <attribute name="port" type="int"
-                 briefType="int" required="NOTDEFINED">
-        <short-description><![CDATA[FTP port used by the remote server.]]></short-description>
-        <description><![CDATA[
-          Sets the FTP port used by the remote server.
-        ]]></description>
-      </attribute>
-      <attribute name="remotedir" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Remote directory where files will be placed.]]></short-description>
-        <description><![CDATA[
-          Sets the remote directory where files will be placed. This may be a
- relative or absolute path, and must be in the path syntax expected by
- the remote server. No correction of path syntax will be performed.
-        ]]></description>
-      </attribute>
-      <attribute name="separator" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Remote file separator character.]]></short-description>
-        <description><![CDATA[
-          Sets the remote file separator character. This normally defaults to the
- Unix standard forward slash, but can be manually overridden using this
- call if the remote server requires some other separator. Only the first
- character of the string is used.
-        ]]></description>
-      </attribute>
-      <attribute name="server" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[FTP server to send files to.]]></short-description>
-        <description><![CDATA[
-          Sets the FTP server to send files to.
-        ]]></description>
-      </attribute>
-      <attribute name="skipfailedtransfers" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[If true, enables unsuccessful file put, delete and get
- operations to be skipped with a warning and the remainder
- of the files still transferred.]]></short-description>
-        <description><![CDATA[
-          If true, enables unsuccessful file put, delete and get
- operations to be skipped with a warning and the remainder
- of the files still transferred.
-        ]]></description>
-      </attribute>
-      <attribute name="umask" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Default mask for file creation on a unix server.]]></short-description>
-        <description><![CDATA[
-          Sets the default mask for file creation on a unix server.
-        ]]></description>
-      </attribute>
-      <attribute name="userid" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Login user id to use on the specified server.]]></short-description>
-        <description><![CDATA[
-          Sets the login user id to use on the specified server.
-        ]]></description>
-      </attribute>
-      <attribute name="verbose" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Set to true to receive notification about each file as it is
- transferred.]]></short-description>
-        <description><![CDATA[
-          Set to true to receive notification about each file as it is
- transferred.
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-      <element name="fileset" type="org.apache.tools.ant.types.FileSet"
-               briefType="Fileset"
-               required="NOTDEFINED">
-        <short-description><![CDATA[A set of files to upload or download.]]></short-description>
-        <description>
-          <![CDATA[A set of files to upload or download]]>
-        </description>
-      </element>
-
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="genkey" category="java"
-      classname="org.apache.tools.ant.taskdefs.GenerateKey"
-      >
-
-  <short-description><![CDATA[Generates a key in a keystore.]]></short-description>
-  <description>
-    <![CDATA[Generates a key in a keystore.]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="alias" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[The alias to add under.]]></short-description>
-        <description><![CDATA[
-          The alias to add under.
-        ]]></description>
-      </attribute>
-      <attribute name="dname" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[The distinguished name for entity.]]></short-description>
-        <description><![CDATA[
-          The distinguished name for entity.
-        ]]></description>
-      </attribute>
-      <attribute name="keyalg" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[The method to use when generating name-value pair.]]></short-description>
-        <description><![CDATA[
-          The method to use when generating name-value pair.
-        ]]></description>
-      </attribute>
-      <attribute name="keypass" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Password for private key (if different).]]></short-description>
-        <description><![CDATA[
-          Password for private key (if different).
-        ]]></description>
-      </attribute>
-      <attribute name="keysize" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Indicates the size of key generated.]]></short-description>
-        <description><![CDATA[
-          Indicates the size of key generated.
-        ]]></description>
-      </attribute>
-      <attribute name="keystore" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Keystore location.]]></short-description>
-        <description><![CDATA[
-          Keystore location.
-        ]]></description>
-      </attribute>
-      <attribute name="sigalg" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[The algorithm to use in signing.]]></short-description>
-        <description><![CDATA[
-          The algorithm to use in signing.
-        ]]></description>
-      </attribute>
-      <attribute name="storepass" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Password for keystore integrity.]]></short-description>
-        <description><![CDATA[
-          Password for keystore integrity.
- Must be at least 6 characters long.
-        ]]></description>
-      </attribute>
-      <attribute name="storetype" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Keystore type.]]></short-description>
-        <description><![CDATA[
-          Keystore type.
-        ]]></description>
-      </attribute>
-      <attribute name="validity" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Indicates how many days certificate is valid.]]></short-description>
-        <description><![CDATA[
-          Indicates how many days certificate is valid.
-        ]]></description>
-      </attribute>
-      <attribute name="verbose" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[If true, verbose output when signing.]]></short-description>
-        <description><![CDATA[
-          If true, verbose output when signing.
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-      <element name="dname" type="org.apache.tools.ant.taskdefs.GenerateKey.DistinguishedName"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[Distinguished name list.]]></short-description>
-        <description>
-          <![CDATA[Distinguished name list.]]>
-        </description>
-      </element>
-
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="get" category="network"
-      classname="org.apache.tools.ant.taskdefs.Get"
-      >
-
-  <short-description><![CDATA[Gets a particular file from a URL source.]]></short-description>
-  <description>
-    <![CDATA[Gets a particular file from a URL source.
- Options include verbose reporting, timestamp based fetches and controlling
- actions on failures. NB: access through a firewall only works if the whole
- Java runtime is correctly configured.]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="dest" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[Where to copy the source file.]]></short-description>
-        <description><![CDATA[
-          Where to copy the source file.
-        ]]></description>
-      </attribute>
-      <attribute name="ignoreerrors" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[If true, log errors but do not treat as fatal.]]></short-description>
-        <description><![CDATA[
-          If true, log errors but do not treat as fatal.
-        ]]></description>
-      </attribute>
-      <attribute name="password" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Password for the basic authentication.]]></short-description>
-        <description><![CDATA[
-          password for the basic authentication.
-        ]]></description>
-      </attribute>
-      <attribute name="src" type="java.net.URL"
-                 briefType="URL" required="NOTDEFINED">
-        <short-description><![CDATA[URL to get.]]></short-description>
-        <description><![CDATA[
-          Set the URL to get.
-        ]]></description>
-      </attribute>
-      <attribute name="usetimestamp" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[If true, conditionally download a file based on the timestamp
- of the local copy.]]></short-description>
-        <description><![CDATA[
-          If true, conditionally download a file based on the timestamp
- of the local copy.
-
- <p>In this situation, the if-modified-since header is set so
- that the file is only fetched if it is newer than the local
- file (or there is no local file) This flag is only valid on
- HTTP connections, it is ignored in other cases.  When the flag
- is set, the local copy of the downloaded file will also have
- its timestamp set to the remote file time.</p>
-
- <p>Note that remote files of date 1/1/1970 (GMT) are treated as
- 'no timestamp', and web servers often serve files with a
- timestamp in the future by replacing their timestamp with that
- of the current time. Also, inter-computer clock differences can
- cause no end of grief.</p>
-        ]]></description>
-      </attribute>
-      <attribute name="username" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Username for basic auth.]]></short-description>
-        <description><![CDATA[
-          Username for basic auth.
-        ]]></description>
-      </attribute>
-      <attribute name="verbose" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[If true, show verbose progress information.]]></short-description>
-        <description><![CDATA[
-          If true, show verbose progress information.
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="gunzip" category="packaging"
-      classname="org.apache.tools.ant.taskdefs.GUnzip"
-      >
-
-  <short-description><![CDATA[Expands a file that has been compressed with the GZIP algorithm.]]></short-description>
-  <description>
-    <![CDATA[Expands a file that has been compressed with the GZIP
- algorithm. Normally used to compress non-compressed archives such
- as TAR files.]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="dest" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[The destination file or directory; optional.]]></short-description>
-        <description><![CDATA[
-          The destination file or directory; optional.
-        ]]></description>
-      </attribute>
-      <attribute name="src" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[The file to expand; required.]]></short-description>
-        <description><![CDATA[
-          The file to expand; required.
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="gzip" category="packaging"
-      classname="org.apache.tools.ant.taskdefs.GZip"
-      >
-
-  <short-description><![CDATA[Compresses a file with the GZIP algorithm.]]></short-description>
-  <description>
-    <![CDATA[Compresses a file with the GZIP algorithm. Normally used to compress
- non-compressed archives such as TAR files.]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="src" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[The file to compress; required.]]></short-description>
-        <description><![CDATA[
-          the file to compress; required.
-        ]]></description>
-      </attribute>
-      <attribute name="zipfile" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[The required destination file.]]></short-description>
-        <description><![CDATA[
-          the required destination file.
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="icontract" category="other"
-      classname="org.apache.tools.ant.taskdefs.optional.IContract"
-      matchingTask="true">
-
-  <short-description><![CDATA[Instruments Java classes with iContract DBC preprocessor.]]></short-description>
-  <description>
-    <![CDATA[Instruments Java classes with iContract DBC preprocessor.
- <br/>
- The task can generate a properties file for <a href="http://hjem.sol.no/hellesoy/icontrol.html">iControl</a>,
- a graphical user interface that lets you turn on/off assertions. iControl generates a control file that you can refer to
- from this task using the controlfile attribute.
- iContract is at <a href="http://www.reliable-systems.com/tools/">http://www.reliable-systems.com/tools/</a>
- <p/>
- Thanks to Rainer Schmitz for enhancements and comments.]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="builddir" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[Build directory for instrumented classes.]]></short-description>
-        <description><![CDATA[
-          Sets the build directory for instrumented classes.
-        ]]></description>
-      </attribute>
-      <attribute name="classdir" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[Class directory (uninstrumented classes).]]></short-description>
-        <description><![CDATA[
-          Sets the class directory (uninstrumented classes).
-        ]]></description>
-      </attribute>
-      <attribute name="classpath" type="org.apache.tools.ant.types.Path"
-                 briefType="Path" required="NOTDEFINED">
-        <short-description><![CDATA[Classpath to be used for invocation of iContract.]]></short-description>
-        <description><![CDATA[
-          Sets the classpath to be used for invocation of iContract.
-        ]]></description>
-      </attribute>
-      <attribute name="classpathref" type="org.apache.tools.ant.types.Reference"
-                 briefType="Reference" required="NOTDEFINED">
-        <short-description><![CDATA[Adds a reference to a classpath defined elsewhere.]]></short-description>
-        <description><![CDATA[
-          Adds a reference to a classpath defined elsewhere.
-        ]]></description>
-      </attribute>
-      <attribute name="controlfile" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[Control file to pass to iContract.]]></short-description>
-        <description><![CDATA[
-          Sets the control file to pass to iContract.
-        ]]></description>
-      </attribute>
-      <attribute name="failthrowable" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Throwable (Exception) to be thrown on assertion violation.]]></short-description>
-        <description><![CDATA[
-          Sets the Throwable (Exception) to be thrown on assertion violation.
-        ]]></description>
-      </attribute>
-      <attribute name="instrumentdir" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[Instrumentation directory.]]></short-description>
-        <description><![CDATA[
-          Sets the instrumentation directory.
-        ]]></description>
-      </attribute>
-      <attribute name="invariant" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Turns on/off invariant instrumentation.]]></short-description>
-        <description><![CDATA[
-          Turns on/off invariant instrumentation.
-        ]]></description>
-      </attribute>
-      <attribute name="post" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Turns on/off postcondition instrumentation.]]></short-description>
-        <description><![CDATA[
-          Turns on/off postcondition instrumentation.
-        ]]></description>
-      </attribute>
-      <attribute name="pre" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Turns on/off precondition instrumentation.]]></short-description>
-        <description><![CDATA[
-          Turns on/off precondition instrumentation.
-        ]]></description>
-      </attribute>
-      <attribute name="quiet" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Tells iContract to be quiet.]]></short-description>
-        <description><![CDATA[
-          Tells iContract to be quiet.
-        ]]></description>
-      </attribute>
-      <attribute name="repbuilddir" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[Build directory for instrumented classes.]]></short-description>
-        <description><![CDATA[
-          Sets the build directory for instrumented classes.
-        ]]></description>
-      </attribute>
-      <attribute name="repositorydir" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[Build directory for repository classes.]]></short-description>
-        <description><![CDATA[
-          Sets the build directory for repository classes.
-        ]]></description>
-      </attribute>
-      <attribute name="srcdir" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[Source directory.]]></short-description>
-        <description><![CDATA[
-          Sets the source directory.
-        ]]></description>
-      </attribute>
-      <attribute name="targets" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[Name of the file where targets will be written.]]></short-description>
-        <description><![CDATA[
-          Sets the name of the file where targets will be written. That is the
- file that tells iContract what files to process.
-        ]]></description>
-      </attribute>
-      <attribute name="updateicontrol" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[If true, updates iControl properties file.]]></short-description>
-        <description><![CDATA[
-          If true, updates iControl properties file
-        ]]></description>
-      </attribute>
-      <attribute name="verbosity" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Verbosity level of iContract.]]></short-description>
-        <description><![CDATA[
-          Sets the verbosity level of iContract. Any combination of
- error*,warning*,note*,info*,progress*,debug* (comma separated) can be
- used. Defaults to error*,warning*
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-      <element name="classpath" type="org.apache.tools.ant.types.Path"
-               briefType="Path"
-               required="NOTDEFINED">
-        <short-description><![CDATA[Classpath.]]></short-description>
-        <description>
-          <![CDATA[Sets the classpath.]]>
-        </description>
-      </element>
-
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="ilasm" category="other"
-      classname="org.apache.tools.ant.taskdefs.optional.dotnet.Ilasm"
-      matchingTask="true">
-
-  <short-description><![CDATA[Assembles .NET Intermediate Language files.]]></short-description>
-  <description>
-    <![CDATA[Assembles .NET Intermediate Language files. The task will only work
-  on win2K until other platforms support csc.exe or an equivalent. ilasm.exe
-  must be on the execute path too. <p>
-
-  <p>
-
-  All parameters are optional: &lt;il/&gt; should suffice to produce a debug
-  build of all *.il files. The option set is roughly compatible with the
-  CSharp class; even though the command line options are only vaguely
-  equivalent. [The low level commands take things like /OUT=file, csc wants
-  /out:file ... /verbose is used some places; /quiet here in ildasm... etc.]
-  It would be nice if someone made all the command line tools consistent (and
-  not as brittle as the java cmdline tools) <p>
-
-  The task is a directory based task, so attributes like <b>includes="*.il"
-  </b> and <b>excludes="broken.il"</b> can be used to control the files pulled
-  in. Each file is built on its own, producing an appropriately named output
-  file unless manually specified with <b>outfile</b>]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="debug" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Debug flag on or off.]]></short-description>
-        <description><![CDATA[
-          set the debug flag on or off.
-        ]]></description>
-      </attribute>
-      <attribute name="extraoptions" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Any extra options which are not explicitly
- supported by this task.]]></short-description>
-        <description><![CDATA[
-          Any extra options which are not explicitly
- supported by this task.
-        ]]></description>
-      </attribute>
-      <attribute name="failonerror" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[If true, fails if ilasm tool fails.]]></short-description>
-        <description><![CDATA[
-          If true, fails if ilasm tool fails.
-        ]]></description>
-      </attribute>
-      <attribute name="keyfile" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[The name of a file containing a private key.]]></short-description>
-        <description><![CDATA[
-          the name of a file containing a private key.
-        ]]></description>
-      </attribute>
-      <attribute name="listing" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[If true, produce a listing (off by default).]]></short-description>
-        <description><![CDATA[
-          If true, produce a listing (off by default).
-        ]]></description>
-      </attribute>
-      <attribute name="outputfile" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[Output file.]]></short-description>
-        <description><![CDATA[
-          Set the output file.
-        ]]></description>
-      </attribute>
-      <attribute name="resourcefile" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[Name of resource file to include.]]></short-description>
-        <description><![CDATA[
-          name of resource file to include.
-        ]]></description>
-      </attribute>
-      <attribute name="srcdir" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[Source directory containing the files to be compiled.]]></short-description>
-        <description><![CDATA[
-          Set the source directory containing the files to be compiled.
-        ]]></description>
-      </attribute>
-      <attribute name="targettype" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Type of target, either "exe" or "library".]]></short-description>
-        <description><![CDATA[
-          Sets the type of target, either "exe" or "library".
-        ]]></description>
-      </attribute>
-      <attribute name="verbose" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[If true, enable verbose ILASM output.]]></short-description>
-        <description><![CDATA[
-          If true, enable verbose ILASM output.
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="input" category="control"
-      classname="org.apache.tools.ant.taskdefs.Input"
-      >
-
-  <short-description><![CDATA[Reads an input line from the console.]]></short-description>
-  <description>
-    <![CDATA[Reads an input line from the console.]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="addproperty" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Defines the name of a property to be created from input.]]></short-description>
-        <description><![CDATA[
-          Defines the name of a property to be created from input. Behaviour is
- according to property task which means that existing properties
- cannot be overriden.
-        ]]></description>
-      </attribute>
-      <attribute name="message" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Message which gets displayed to the user during the build run.]]></short-description>
-        <description><![CDATA[
-          Sets the Message which gets displayed to the user during the build run.
-        ]]></description>
-      </attribute>
-      <attribute name="validargs" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Defines valid input parameters as comma separated strings.]]></short-description>
-        <description><![CDATA[
-          Defines valid input parameters as comma separated strings. If set, input
- task will reject any input not defined as accepted and requires the user
- to reenter it. Validargs are case sensitive. If you want 'a' and 'A' to
- be accepted you need to define both values as accepted arguments.
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-    </elements>
-
-      <body >
-        <description><![CDATA[
-          Set a multiline message.
-        ]]></description>
-      </body>
-
-  </structure>
-
-</task>
-
-
-<task name="iplanet-ejbc" category="ejb"
-      classname="org.apache.tools.ant.taskdefs.optional.ejb.IPlanetEjbcTask"
-      >
-
-  <short-description><![CDATA[Compiles EJB stubs and skeletons for the iPlanet Application Server.]]></short-description>
-  <description>
-    <![CDATA[Compiles EJB stubs and skeletons for the iPlanet Application Server.
- The EJBs to be processed are specified by the EJB 1.1 standard XML
- descriptor, and additional attributes are obtained from the iPlanet Application
- Server-specific XML descriptor.  Since the XML descriptors can include
- multiple EJBs, this is a convenient way of specifying many EJBs in a single
- Ant task.  The following attributes are allowed:
-   <ul>
-     <li><i>ejbdescriptor</i> -- Standard EJB 1.1 XML descriptor (typically
-                                 titled "ejb-jar.xml").  This attribute is
-                                 required.
-     <li><i>iasdescriptor</i> -- EJB XML descriptor for iPlanet Application
-                                 Server (typically titled "ias-ejb-jar.xml).
-                                 This attribute is required.
-     <li><i>dest</i> -- The is the base directory where the RMI stubs and
-                        skeletons are written.  In addition, the class files
-                        for each bean (home interface, remote interface, and
-                        EJB implementation) must be found in this directory.
-                        This attribute is required.
-     <li><i>classpath</i> -- The classpath used when generating EJB stubs and
-                             skeletons.  This is an optional attribute (if
-                             omitted, the classpath specified when Ant was
-                             started will be used).  Nested "classpath"
-                             elements may also be used.
-     <li><i>keepgenerated</i> -- Indicates whether or not the Java source
-                                 files which are generated by ejbc will be
-                                 saved or automatically deleted.  If "yes",
-                                 the source files will be retained.  This is
-                                 an optional attribute (if omitted, it
-                                 defaults to "no").
-     <li><i>debug</i> -- Indicates whether or not the ejbc utility should
-                         log additional debugging statements to the standard
-                         output.  If "yes", the additional debugging statements
-                         will be generated (if omitted, it defaults to "no").
-     <li><i>iashome</i> -- May be used to specify the "home" directory for
-                           this iPlanet Application Server installation.  This
-                           is used to find the ejbc utility if it isn't
-                           included in the user's system path.  This is an
-                           optional attribute (if specified, it should refer
-                           to the <code>[install-location]/iplanet/ias6/ias
-                           </code> directory).  If omitted, the ejbc utility
-                           must be on the user's system path.
-   </ul>
- <p>
- For each EJB specified, this task will locate the three classes that comprise
- the EJB.  If these class files cannot be located in the <code>dest</code>
- directory, the task will fail.  The task will also attempt to locate the EJB
- stubs and skeletons in this directory.  If found, the timestamps on the
- stubs and skeletons will be checked to ensure they are up to date.  Only if
- these files cannot be found or if they are out of date will ejbc be called
- to generate new stubs and skeletons.]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="classpath" type="org.apache.tools.ant.types.Path"
-                 briefType="Path" required="NOTDEFINED">
-        <short-description><![CDATA[Classpath to be used when compiling the EJB stubs and skeletons.]]></short-description>
-        <description><![CDATA[
-          Sets the classpath to be used when compiling the EJB stubs and skeletons.
-        ]]></description>
-      </attribute>
-      <attribute name="debug" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[If true, debugging output will be generated when ejbc is
- executed.]]></short-description>
-        <description><![CDATA[
-          If true, debugging output will be generated when ejbc is
- executed.
-        ]]></description>
-      </attribute>
-      <attribute name="dest" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[Destination directory where the EJB source classes must exist
- and where the stubs and skeletons will be written.]]></short-description>
-        <description><![CDATA[
-          Sets the destination directory where the EJB source classes must exist
- and where the stubs and skeletons will be written.  The destination
- directory must exist before this task is executed.
-        ]]></description>
-      </attribute>
-      <attribute name="ejbdescriptor" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[Location of the standard XML EJB descriptor.]]></short-description>
-        <description><![CDATA[
-          Sets the location of the standard XML EJB descriptor.  Typically, this
- file is named "ejb-jar.xml".
-        ]]></description>
-      </attribute>
-      <attribute name="iasdescriptor" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[Location of the iAS-specific XML EJB descriptor.]]></short-description>
-        <description><![CDATA[
-          Sets the location of the iAS-specific XML EJB descriptor.  Typically,
- this file is named "ias-ejb-jar.xml".
-        ]]></description>
-      </attribute>
-      <attribute name="iashome" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[May be used to specify the "home" directory for this iAS installation.]]></short-description>
-        <description><![CDATA[
-          May be used to specify the "home" directory for this iAS installation.
- The directory specified should typically be
- <code>[install-location]/iplanet/ias6/ias</code>.
-        ]]></description>
-      </attribute>
-      <attribute name="keepgenerated" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[If true, the Java source files which are generated by ejbc will be saved .]]></short-description>
-        <description><![CDATA[
-          If true, the Java source files which are generated by ejbc will be saved .
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-      <element name="classpath" type="org.apache.tools.ant.types.Path"
-               briefType="Path"
-               required="NOTDEFINED">
-        <short-description><![CDATA[Adds to the classpath used when compiling the EJB stubs and skeletons.]]></short-description>
-        <description>
-          <![CDATA[Adds to the classpath used when compiling the EJB stubs and skeletons.]]>
-        </description>
-      </element>
-
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="jar" category="packaging"
-      classname="org.apache.tools.ant.taskdefs.Jar"
-      matchingTask="true">
-
-  <short-description><![CDATA[Creates a JAR archive.]]></short-description>
-  <description>
-    <![CDATA[Creates a JAR archive.]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="basedir" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[Directory from which to archive files; optional.]]></short-description>
-        <description><![CDATA[
-          Directory from which to archive files; optional.
-        ]]></description>
-      </attribute>
-      <attribute name="compress" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Whether we want to compress the files or only store them;
- optional, default=true;.]]></short-description>
-        <description><![CDATA[
-          Whether we want to compress the files or only store them;
- optional, default=true;
-        ]]></description>
-      </attribute>
-      <attribute name="destfile" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[The file to create; required.]]></short-description>
-        <description><![CDATA[
-          The file to create; required.
-        ]]></description>
-      </attribute>
-      <attribute name="duplicate" type="org.apache.tools.ant.taskdefs.Zip.Duplicate"
-                 briefType="&quot;add&quot;, &quot;preserve&quot;, &quot;fail&quot;" required="NOTDEFINED">
-        <short-description><![CDATA[Sets behavior for when a duplicate file is about to be added -
- one of <code>keep</code>, <code>skip</code> or <code>overwrite</code>.]]></short-description>
-        <description><![CDATA[
-          Sets behavior for when a duplicate file is about to be added -
- one of <code>keep</code>, <code>skip</code> or <code>overwrite</code>.
- Possible values are: <code>keep</code> (keep both
- of the files); <code>skip</code> (keep the first version
- of the file found); <code>overwrite</code> overwrite the file
- with the new file
- Default for zip tasks is <code>keep</code>
-        ]]></description>
-      </attribute>
-      <attribute name="encoding" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Encoding to use for filenames, defaults to the platform's
- default encoding.]]></short-description>
-        <description><![CDATA[
-          Encoding to use for filenames, defaults to the platform's
- default encoding.
-
- <p>For a list of possible values see <a
- href="http://java.sun.com/products/jdk/1.2/docs/guide/internat/encoding.doc.html">http://java.sun.com/products/jdk/1.2/docs/guide/internat/encoding.doc.html</a>.</p>
-        ]]></description>
-      </attribute>
-      <attribute name="filesonly" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[If true, emulate Sun's jar utility by not adding parent directories;
- optional, defaults to false.]]></short-description>
-        <description><![CDATA[
-          If true, emulate Sun's jar utility by not adding parent directories;
- optional, defaults to false.
-        ]]></description>
-      </attribute>
-      <attribute name="index" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Set whether or not to create an index list for classes.]]></short-description>
-        <description><![CDATA[
-          Set whether or not to create an index list for classes.
- This may speed up classloading in some cases.
-        ]]></description>
-      </attribute>
-      <attribute name="manifest" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[The manifest file to use.]]></short-description>
-        <description><![CDATA[
-          The manifest file to use. This can be either the location of a manifest,
- or the name of a jar added through a fileset. If its the name of an added
- jar, the task expects the manifest to be in the jar at META-INF/MANIFEST.MF.
-        ]]></description>
-      </attribute>
-      <attribute name="update" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[If true, updates an existing file, otherwise overwrite
- any existing one; optional defaults to false.]]></short-description>
-        <description><![CDATA[
-          If true, updates an existing file, otherwise overwrite
- any existing one; optional defaults to false.
-        ]]></description>
-      </attribute>
-      <attribute name="whenempty" type="org.apache.tools.ant.taskdefs.Zip.WhenEmpty"
-                 briefType="&quot;fail&quot;, &quot;skip&quot;, &quot;create&quot;" required="NOTDEFINED">
-        <short-description><![CDATA[Sets behavior of the task when no files match.]]></short-description>
-        <description><![CDATA[
-          Sets behavior of the task when no files match.
- Possible values are: <code>fail</code> (throw an exception
- and halt the build); <code>skip</code> (do not create
- any archive, but issue a warning); <code>create</code>
- (make an archive with no entries).
- Default for zip tasks is <code>skip</code>;
- for jar tasks, <code>create</code>.
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-      <element name="manifest" type="org.apache.tools.ant.taskdefs.Manifest"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[Allows the manifest for the archive file to be provided inline
- in the buildfile rather than in an external file.]]></short-description>
-        <description>
-          <![CDATA[Allows the manifest for the archive file to be provided inline
- in the buildfile rather than in an external file.]]>
-        </description>
-      </element>
-
-      <element name="fileset" type="org.apache.tools.ant.types.FileSet"
-               briefType="Fileset"
-               required="NOTDEFINED">
-        <short-description><![CDATA[Adds a set of files.]]></short-description>
-        <description>
-          <![CDATA[Adds a set of files.]]>
-        </description>
-      </element>
-
-      <element name="metainf" type="org.apache.tools.ant.types.ZipFileSet"
-               briefType="ZipFileset"
-               required="NOTDEFINED">
-        <short-description><![CDATA[Adds a zipfileset to include in the META-INF directory.]]></short-description>
-        <description>
-          <![CDATA[Adds a zipfileset to include in the META-INF directory.]]>
-        </description>
-      </element>
-
-      <element name="zipgroupfileset" type="org.apache.tools.ant.types.FileSet"
-               briefType="Fileset"
-               required="NOTDEFINED">
-        <short-description><![CDATA[Adds a group of zip files.]]></short-description>
-        <description>
-          <![CDATA[Adds a group of zip files.]]>
-        </description>
-      </element>
-
-      <element name="zipfileset" type="org.apache.tools.ant.types.ZipFileSet"
-               briefType="ZipFileset"
-               required="NOTDEFINED">
-        <short-description><![CDATA[Adds a set of files that can be
- read from an archive and be given a prefix/fullpath.]]></short-description>
-        <description>
-          <![CDATA[Adds a set of files that can be
- read from an archive and be given a prefix/fullpath.]]>
-        </description>
-      </element>
-
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="jarlib-available" category="other"
-      classname="org.apache.tools.ant.taskdefs.optional.extension.JarLibAvailableTask"
-      >
-
-  <short-description><![CDATA[Checks whether an extension is present in a fileset or an extensionSet.]]></short-description>
-  <description>
-    <![CDATA[Checks whether an extension is present in a fileset or an extensionSet.]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="file" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[The JAR library to check.]]></short-description>
-        <description><![CDATA[
-          The JAR library to check.
-        ]]></description>
-      </attribute>
-      <attribute name="property" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[The name of property to set if extensions are available.]]></short-description>
-        <description><![CDATA[
-          The name of property to set if extensions are available.
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-      <element name="extension" type="org.apache.tools.ant.taskdefs.optional.extension.ExtensionAdapter"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[Extension looking for.]]></short-description>
-        <description>
-          <![CDATA[Set the Extension looking for.]]>
-        </description>
-      </element>
-
-      <element name="extensionset" type="org.apache.tools.ant.taskdefs.optional.extension.ExtensionSet"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[Adds a set of extensions to search in.]]></short-description>
-        <description>
-          <![CDATA[Adds a set of extensions to search in.]]>
-        </description>
-      </element>
-
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="jarlib-display" category="other"
-      classname="org.apache.tools.ant.taskdefs.optional.extension.JarLibDisplayTask"
-      >
-
-  <short-description><![CDATA[Displays the "Optional Package" and "Package Specification" information contained within the specified JARs.]]></short-description>
-  <description>
-    <![CDATA[Displays the "Optional Package" and "Package Specification" information
- contained within the specified JARs.
-
- <p>Prior to JDK1.3, an "Optional Package" was known as an Extension.
- The specification for this mechanism is available in the JDK1.3
- documentation in the directory
- $JDK_HOME/docs/guide/extensions/versioning.html. Alternatively it is
- available online at <a href="http://java.sun.com/j2se/1.3/docs/guide/extensions/versioning.html">
- http://java.sun.com/j2se/1.3/docs/guide/extensions/versioning.html</a>.</p>]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="file" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[The JAR library to display information for.]]></short-description>
-        <description><![CDATA[
-          The JAR library to display information for.
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-      <element name="fileset" type="org.apache.tools.ant.types.FileSet"
-               briefType="Fileset"
-               required="NOTDEFINED">
-        <short-description><![CDATA[Adds a set of files about which library data will be displayed.]]></short-description>
-        <description>
-          <![CDATA[Adds a set of files about which library data will be displayed.]]>
-        </description>
-      </element>
-
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="jarlib-manifest" category="other"
-      classname="org.apache.tools.ant.taskdefs.optional.extension.JarLibManifestTask"
-      >
-
-  <short-description><![CDATA[Generates a manifest that declares all the dependencies.]]></short-description>
-  <description>
-    <![CDATA[Generates a manifest that declares all the dependencies.
- The dependencies are determined by looking in the
- specified path and searching for Extension / "Optional Package"
- specifications in the manifests of the jars.
-
- <p>Prior to JDK1.3, an "Optional Package" was known as an Extension.
- The specification for this mechanism is available in the JDK1.3
- documentation in the directory
- $JDK_HOME/docs/guide/extensions/versioning.html. Alternatively it is
- available online at <a href="http://java.sun.com/j2se/1.3/docs/guide/extensions/versioning.html">
- http://java.sun.com/j2se/1.3/docs/guide/extensions/versioning.html</a>.</p>]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="destfile" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[The location where generated manifest is placed.]]></short-description>
-        <description><![CDATA[
-          The location where generated manifest is placed.
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-      <element name="attribute" type="org.apache.tools.ant.taskdefs.optional.extension.ExtraAttribute"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[Adds an attribute that is to be put in main section of manifest.]]></short-description>
-        <description>
-          <![CDATA[Adds an attribute that is to be put in main section of manifest.]]>
-        </description>
-      </element>
-
-      <element name="depends" type="org.apache.tools.ant.taskdefs.optional.extension.ExtensionSet"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[Adds a set of extensions that this library requires.]]></short-description>
-        <description>
-          <![CDATA[Adds a set of extensions that this library requires.]]>
-        </description>
-      </element>
-
-      <element name="extension" type="org.apache.tools.ant.taskdefs.optional.extension.ExtensionAdapter"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[Adds an extension that this library implements.]]></short-description>
-        <description>
-          <![CDATA[Adds an extension that this library implements.]]>
-        </description>
-      </element>
-
-      <element name="options" type="org.apache.tools.ant.taskdefs.optional.extension.ExtensionSet"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[Adds a set of extensions that this library optionally requires.]]></short-description>
-        <description>
-          <![CDATA[Adds a set of extensions that this library optionally requires.]]>
-        </description>
-      </element>
-
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="jarlib-resolve" category="other"
-      classname="org.apache.tools.ant.taskdefs.optional.extension.JarLibResolveTask"
-      >
-
-  <short-description><![CDATA[Tries to locate a JAR to satisfy an extension and place location of JAR into property.]]></short-description>
-  <description>
-    <![CDATA[Tries to locate a JAR to satisfy an extension and place
- location of JAR into property.]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="checkextension" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[If true, libraries returned by nested resolvers should be
- checked to see if they supply extension.]]></short-description>
-        <description><![CDATA[
-          If true, libraries returned by nested resolvers should be
- checked to see if they supply extension.
-        ]]></description>
-      </attribute>
-      <attribute name="failonerror" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[If true, failure to locate library should fail build.]]></short-description>
-        <description><![CDATA[
-          If true, failure to locate library should fail build.
-        ]]></description>
-      </attribute>
-      <attribute name="property" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[The name of the property in which the location of
- library is stored.]]></short-description>
-        <description><![CDATA[
-          The name of the property in which the location of
- library is stored.
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-      <element name="ant" type="org.apache.tools.ant.taskdefs.optional.extension.resolvers.AntResolver"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[Adds Ant resolver to run an Ant buildfile to generate a library.]]></short-description>
-        <description>
-          <![CDATA[Adds Ant resolver to run an Ant buildfile to generate a library.]]>
-        </description>
-      </element>
-
-      <element name="extension" type="org.apache.tools.ant.taskdefs.optional.extension.ExtensionAdapter"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[Extension looking for.]]></short-description>
-        <description>
-          <![CDATA[Set the Extension looking for.]]>
-        </description>
-      </element>
-
-      <element name="location" type="org.apache.tools.ant.taskdefs.optional.extension.resolvers.LocationResolver"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[Adds location resolver to look for a library in a location
- relative to project directory.]]></short-description>
-        <description>
-          <![CDATA[Adds location resolver to look for a library in a location
- relative to project directory.]]>
-        </description>
-      </element>
-
-      <element name="url" type="org.apache.tools.ant.taskdefs.optional.extension.resolvers.URLResolver"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[Adds a URL resolver to download a library from a URL
- to a local file.]]></short-description>
-        <description>
-          <![CDATA[Adds a URL resolver to download a library from a URL
- to a local file.]]>
-        </description>
-      </element>
-
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="java" category="java"
-      classname="org.apache.tools.ant.taskdefs.Java"
-      >
-
-  <short-description><![CDATA[Launcher for Java applications.]]></short-description>
-  <description>
-    <![CDATA[Launcher for Java applications. Allows use of
- the same JVM for the called application thus resulting in much
- faster operation.]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="append" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[If true, append output to existing file.]]></short-description>
-        <description><![CDATA[
-          If true, append output to existing file.
-        ]]></description>
-      </attribute>
-      <attribute name="classname" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Java class to execute.]]></short-description>
-        <description><![CDATA[
-          Sets the Java class to execute.
-        ]]></description>
-      </attribute>
-      <attribute name="classpath" type="org.apache.tools.ant.types.Path"
-                 briefType="Path" required="NOTDEFINED">
-        <short-description><![CDATA[Classpath to be used when running the Java class.]]></short-description>
-        <description><![CDATA[
-          Set the classpath to be used when running the Java class
-        ]]></description>
-      </attribute>
-      <attribute name="classpathref" type="org.apache.tools.ant.types.Reference"
-                 briefType="Reference" required="NOTDEFINED">
-        <short-description><![CDATA[Classpath to use, by reference.]]></short-description>
-        <description><![CDATA[
-          Classpath to use, by reference.
-        ]]></description>
-      </attribute>
-      <attribute name="dir" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[The working directory of the process.]]></short-description>
-        <description><![CDATA[
-          The working directory of the process
-        ]]></description>
-      </attribute>
-      <attribute name="failonerror" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[If true, then fail if the command exits with a
- returncode other than 0.]]></short-description>
-        <description><![CDATA[
-          If true, then fail if the command exits with a
- returncode other than 0
-        ]]></description>
-      </attribute>
-      <attribute name="fork" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[If true, execute in a new VM.]]></short-description>
-        <description><![CDATA[
-          If true, execute in a new VM.
-        ]]></description>
-      </attribute>
-      <attribute name="jvmversion" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[JVM version.]]></short-description>
-        <description><![CDATA[
-          Sets the JVM version.
-        ]]></description>
-      </attribute>
-      <attribute name="jar" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[The location of the JAR file to execute.]]></short-description>
-        <description><![CDATA[
-          The location of the JAR file to execute.
-        ]]></description>
-      </attribute>
-      <attribute name="jvm" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Command used to start the VM (only if not forking).]]></short-description>
-        <description><![CDATA[
-          Set the command used to start the VM (only if not forking).
-        ]]></description>
-      </attribute>
-      <attribute name="jvmargs" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Command line arguments for the JVM.]]></short-description>
-        <description><![CDATA[
-          Set the command line arguments for the JVM.
-        ]]></description>
-      </attribute>
-      <attribute name="maxmemory" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Corresponds to -mx or -Xmx depending on VM version.]]></short-description>
-        <description><![CDATA[
-          Corresponds to -mx or -Xmx depending on VM version.
-        ]]></description>
-      </attribute>
-      <attribute name="newenvironment" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[If true, use a completely new environment.]]></short-description>
-        <description><![CDATA[
-          If true, use a completely new environment.
-
- <p>Will be ignored if we are not forking a new VM.
-        ]]></description>
-      </attribute>
-      <attribute name="output" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[File the output of the process is redirected to.]]></short-description>
-        <description><![CDATA[
-          File the output of the process is redirected to.
-        ]]></description>
-      </attribute>
-      <attribute name="timeout" type="java.lang.Long"
-                 briefType="long" required="NOTDEFINED">
-        <short-description><![CDATA[Timeout in milliseconds after which the process will be killed.]]></short-description>
-        <description><![CDATA[
-          Timeout in milliseconds after which the process will be killed.
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-      <element name="env" type="org.apache.tools.ant.types.Environment.Variable"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[Adds an environment variable.]]></short-description>
-        <description>
-          <![CDATA[Adds an environment variable.
-
- <p>Will be ignored if we are not forking a new VM.]]>
-        </description>
-      </element>
-
-      <element name="sysproperty" type="org.apache.tools.ant.types.Environment.Variable"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[Adds a system property.]]></short-description>
-        <description>
-          <![CDATA[Adds a system property.]]>
-        </description>
-      </element>
-
-      <element name="arg" type="org.apache.tools.ant.types.Commandline.Argument"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[Adds a command-line argument.]]></short-description>
-        <description>
-          <![CDATA[Adds a command-line argument.]]>
-        </description>
-      </element>
-
-      <element name="classpath" type="org.apache.tools.ant.types.Path"
-               briefType="Path"
-               required="NOTDEFINED">
-        <short-description><![CDATA[Adds a path to the classpath.]]></short-description>
-        <description>
-          <![CDATA[Adds a path to the classpath.]]>
-        </description>
-      </element>
-
-      <element name="jvmarg" type="org.apache.tools.ant.types.Commandline.Argument"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[Adds a JVM argument.]]></short-description>
-        <description>
-          <![CDATA[Adds a JVM argument.]]>
-        </description>
-      </element>
-
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="javac" category="java"
-      classname="org.apache.tools.ant.taskdefs.Javac"
-      matchingTask="true">
-
-  <!-- javac task -->
-<external>
-<description>
-
-<p>Compiles a Java source tree.</p>
-
-<p>The source and destination directory will be recursively scanned for Java
-source files to compile. Only Java files that have no corresponding class file
-or where the class file is older than the java file will be compiled.</p>
-
-<p>Note: Ant uses only the names of the source and class files to find
-the classes that need a rebuild. It will not scan the source and therefor
-will have no knowledge about nested classes, classes that are named different
-from the source file and so on.</p>
-
-<p>The directory structure of the source tree should follow the package
-hierarchy.</p>
-
-<p>It is possible to refine the set of files that are being compiled/copied.
-This can be done with the <i>includes</i>, <i>includesfile</i>, <i>excludes</i>, <i>excludesfile</i> and <i>defaultexcludes</i>
-attributes. With the <i>includes</i> or <i>includesfile</i> attribute you specify the files you want to
-have included by using patterns. The <i>exclude</i> or <i>excludesfile</i> attribute is used to specify
-the files you want to have excluded. This is also done with patterns. And
-finally with the <i>defaultexcludes</i> attribute, you can specify whether you
-want to use default exclusions or not. See the section on <a
-href="../dirtasks.html#directorybasedtasks">directory based tasks</a>, on how the
-inclusion/exclusion of files works, and how to write patterns.</p>
-
-<p>It is possible to use different compilers. This can be selected with the
-&quot;build.compiler&quot; property or the compiler attribute. Here are the choices:-</p>
-<ul>
-  <li>classic (the standard compiler of JDK 1.1/1.2) - javac1.1 and
-     javac1.2 can be used as aliases</li>
-  <li>modern (the standard compiler of JDK 1.3/1.4) - javac1.3 and
-     javac1.4 can be used as aliases</li>
-  <li>jikes (the <a
-    href="http://oss.software.ibm.com/developerworks/opensource/jikes/project" target="_top">Jikes</a>
-    compiler)</li>
-  <li>jvc (the Command-Line Compiler from Microsoft's SDK for Java /
-    Visual J++) - microsoft can be used as an alias</li>
-  <li>kjc (the <a href="http://www.dms.at/kopi/" target="_top">kopi</a>
-    compiler)</li>
-  <li>gcj (the gcj compiler from gcc)</li>
-  <li>sj (Symantec java compiler) - symantec can be used as an alias</li>
-  <li>extJavac (run either modern or classic in a JVM of its own)</li>
-</ul>
-<p>For JDK 1.1/1.2, classic is the default. For JDK 1.3/1.4, modern is the default.
-If you wish to use a different compiler interface than those
-supplied, write a class that implements the CompilerAdapter interface
-(package org.apache.tools.ant.taskdefs.compilers). Supply the full
-classname in the &quot;build.compiler&quot; property.</p>
-
-<p>The fork attribute overrides the build.compiler setting and expects
-a JDK1.1 or higher to be set in java.home.</p>
-
-<p>This task will drop all entries that point to non-existent
-files/directories from the CLASSPATH it passes to the compiler.</p>
-
-<p><strong>Windows Note:</strong>When the modern compiler is used
-in unforked mode on Windows, it locks up the files present in the
-classpath of the &lt;javac&gt; task, and does not release them.  The side
-effect of this is that you will not be able to delete or move
-those files later on in the build.  The workaround is to fork when
-invoking the compiler.</p>
-
-</description>
-
-<section anchor="examples" name="Examples">
-<pre>  &lt;javac srcdir=&quot;${src}&quot;
-         destdir=&quot;${build}&quot;
-         classpath=&quot;xyz.jar&quot;
-         debug=&quot;on&quot;
-  /&gt;</pre>
-<p>compiles all <code>.java</code> files under the <code>${src}</code>
-directory, and stores
-the <code>.class</code> files in the <code>${build}</code> directory.
-The classpath used contains <code>xyz.jar</code>, and debug information is on.</p>
-
-<pre>  &lt;javac srcdir=&quot;${src}&quot;
-         destdir=&quot;${build}&quot;
-         fork=&quot;true&quot;
-  /&gt;</pre>
-<p>compiles all <code>.java</code> files under the <code>${src}</code>
-directory, and stores the <code>.class</code> files in the
-<code>${build}</code> directory.  This will fork off the javac
-compiler using the default javac executable.</p>
-
-<pre>  &lt;javac srcdir=&quot;${src}&quot;
-         destdir=&quot;${build}&quot;
-         fork=&quot;java$$javac.exe&quot;
-  /&gt;</pre>
-<p>compiles all <code>.java</code> files under the <code>${src}</code>
-directory, and stores the <code>.class</code> files in the
-<code>${build}</code> directory.  This will fork off the javac
-compiler using the executable named <code>java$javac.exe</code>.  Note
-that the <code>$</code> sign needs to be escaped by a second one.</p>
-
-<pre>  &lt;javac srcdir=&quot;${src}&quot;
-         destdir=&quot;${build}&quot;
-         includes=&quot;mypackage/p1/**,mypackage/p2/**&quot;
-         excludes=&quot;mypackage/p1/testpackage/**&quot;
-         classpath=&quot;xyz.jar&quot;
-         debug=&quot;on&quot;
-  /&gt;</pre>
-<p>compiles <code>.java</code> files under the <code>${src}</code>
-directory, and stores the
-<code>.class</code> files in the <code>${build}</code> directory.
-The classpath used contains <code>xyz.jar</code>, and debug information is on.
-Only files under <code>mypackage/p1</code> and <code>mypackage/p2</code> are
-used. Files in the <code>mypackage/p1/testpackage</code> directory are excluded
-from compilation.</p>
-
-<pre>  &lt;javac srcdir=&quot;${src}:${src2}&quot;
-         destdir=&quot;${build}&quot;
-         includes=&quot;mypackage/p1/**,mypackage/p2/**&quot;
-         excludes=&quot;mypackage/p1/testpackage/**&quot;
-         classpath=&quot;xyz.jar&quot;
-         debug=&quot;on&quot;
-  /&gt;</pre>
-
-<p>is the same as the previous example, with the addition of a second
-source path, defined by
-the property <code>src2</code>. This can also be represented using nested
-<code>&lt;src&gt;</code> elements as follows:</p>
-
-<pre>  &lt;javac destdir=&quot;${build}&quot;
-         classpath=&quot;xyz.jar&quot;
-         debug=&quot;on&quot;&gt;
-    &lt;src path=&quot;${src}&quot;/&gt;
-    &lt;src path=&quot;${src2}&quot;/&gt;
-    &lt;include name=&quot;mypackage/p1/**&quot;/&gt;
-    &lt;include name=&quot;mypackage/p2/**&quot;/&gt;
-    &lt;exclude name=&quot;mypackage/p1/testpackage/**&quot;/&gt;
-  &lt;/javac&gt;</pre>
-
-<p><b>Note:</b> If you are using Ant on Windows and a new DOS window pops up
-for every use of an external compiler, this may be a problem of the JDK you are using.
-This problem may occur with all JDKs &lt; 1.2.</p>
-
-<p><b>Note:</b> If you wish to compile only source-files located in some packages below a
-common root you should not include these packages in the srcdir-attribute. Use include/exclude-attributes
-or elements to filter for these packages. If you include part of your package-structure inside the srcdir-attribute
-(or nested src-elements) Ant will start to recompile your sources every time you call it.</p>
-
-</section>
-
-<section anchor="jikes" name="Jikes Notes">
-
-<p>Jikes supports some extra options, which can be set be defining
-properties prior to invoking the task. The ant developers are aware that
-this is ugly and inflexible -expect a better solution in the future. All
-the options are boolean, and must be set to &quot;true&quot; or &quot;yes&quot; to be
-interpreted as anything other than false; by default
-build.compiler.warnings is &quot;true&quot; while all others are &quot;false&quot;</p>
-
-<table border="1" cellpadding="2" cellspacing="0">
-  <tr>
-    <td valign="top">
-	build.compiler.emacs
-	</td>
-	<td valign="top">
-	Enable emacs compatible error messages
-    </td>
-  </tr>
-  <tr>
-    <td valign="top">
-	build.compiler.warnings<br />
-        <b>This property has been deprecated, use the nowarn attribute
-          instead</b>
-	</td>
-	<td valign="top">
-	don't disable warning messages
-    </td>
-  </tr>
-  <tr>
-    <td valign="top">
-	build.compiler.pedantic
-	</td>
-	<td valign="top">
-	enable pedantic warnings
-    </td>
-  </tr>
-  <tr>
-    <td valign="top">
-	build.compiler.fulldepend
-	</td>
-	<td valign="top">
-	enable full dependency checking,<br />
-	&quot;+F&quot; in the jikes manual.
-    </td>
-  </tr>
-</table>
-
-</section>
-</external>
-
-  <short-description><![CDATA[Compiles Java source files.]]></short-description>
-  <description>
-    <![CDATA[Compiles Java source files. This task can take the following
- arguments:
- <ul>
- <li>sourcedir
- <li>destdir
- <li>deprecation
- <li>classpath
- <li>bootclasspath
- <li>extdirs
- <li>optimize
- <li>debug
- <li>encoding
- <li>target
- <li>depend
- <li>vebose
- <li>failonerror
- <li>includeantruntime
- <li>includejavaruntime
- <li>source
- <li>compiler
- </ul>
- Of these arguments, the <b>sourcedir</b> and <b>destdir</b> are required.
- <p>
- When this task executes, it will recursively scan the sourcedir and
- destdir looking for Java source files to compile. This task makes its
- compile decision based on timestamp.]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="bootclasspathref" type="org.apache.tools.ant.types.Reference"
-                 briefType="Reference" required="NOTDEFINED">
-        <short-description><![CDATA[Adds a reference to a classpath defined elsewhere.]]></short-description>
-        <description><![CDATA[
-          Adds a reference to a classpath defined elsewhere.
-        ]]></description>
-      </attribute>
-      <attribute name="bootclasspath" type="org.apache.tools.ant.types.Path"
-                 briefType="Path" required="NOTDEFINED">
-        <short-description><![CDATA[Bootclasspath that will be used to compile the classes
- against.]]></short-description>
-        <description><![CDATA[
-          Sets the bootclasspath that will be used to compile the classes
- against.
-        ]]></description>
-      </attribute>
-      <attribute name="classpath" type="org.apache.tools.ant.types.Path"
-                 briefType="Path" required="NOTDEFINED">
-        <short-description><![CDATA[Classpath to be used for this compilation.]]></short-description>
-        <description><![CDATA[
-          Set the classpath to be used for this compilation.
-        ]]></description>
-      </attribute>
-      <attribute name="classpathref" type="org.apache.tools.ant.types.Reference"
-                 briefType="Reference" required="NOTDEFINED">
-        <short-description><![CDATA[Adds a reference to a classpath defined elsewhere.]]></short-description>
-        <description><![CDATA[
-          Adds a reference to a classpath defined elsewhere.
-        ]]></description>
-      </attribute>
-      <attribute name="compiler" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Choose the implementation for this particular task.]]></short-description>
-        <description><![CDATA[
-          Choose the implementation for this particular task.
-        ]]></description>
-      </attribute>
-      <attribute name="debug" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Indicates whether source should be compiled
- with debug information; defaults to off.]]></short-description>
-        <description><![CDATA[
-          Indicates whether source should be compiled
- with debug information; defaults to off.
-        ]]></description>
-      </attribute>
-      <attribute name="debuglevel" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Keyword list to be appended to the -g command-line switch.]]></short-description>
-        <description><![CDATA[
-          Keyword list to be appended to the -g command-line switch.
-
- This will be ignored by all implementations except modern
- and classic(ver >= 1.2). Legal values are none or a
- comma-separated list of the following keywords: lines, vars,
- and source. If debuglevel is not specified, by default, :none
- will be appended to -g. If debug is not turned on, this attribute
- will be ignored.
-        ]]></description>
-      </attribute>
-      <attribute name="depend" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Enables dependency-tracking for compilers
- that support this (jikes and classic).]]></short-description>
-        <description><![CDATA[
-          Enables dependency-tracking for compilers
- that support this (jikes and classic).
-        ]]></description>
-      </attribute>
-      <attribute name="deprecation" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Indicates whether source should be
- compiled with deprecation information; defaults to off.]]></short-description>
-        <description><![CDATA[
-          Indicates whether source should be
- compiled with deprecation information; defaults to off.
-        ]]></description>
-      </attribute>
-      <attribute name="destdir" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[Destination directory into which the Java source
- files should be compiled.]]></short-description>
-        <description><![CDATA[
-          Set the destination directory into which the Java source
- files should be compiled.
-        ]]></description>
-      </attribute>
-      <attribute name="encoding" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Java source file encoding name.]]></short-description>
-        <description><![CDATA[
-          Set the Java source file encoding name.
-        ]]></description>
-      </attribute>
-      <attribute name="executable" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[The name of the javac executable.]]></short-description>
-        <description><![CDATA[
-          Sets the the name of the javac executable.
-
- <p>Ignored unless fork is true or extJavac has been specified
- as the compiler.</p>
-        ]]></description>
-      </attribute>
-      <attribute name="extdirs" type="org.apache.tools.ant.types.Path"
-                 briefType="Path" required="NOTDEFINED">
-        <short-description><![CDATA[Extension directories that will be used during the
- compilation.]]></short-description>
-        <description><![CDATA[
-          Sets the extension directories that will be used during the
- compilation.
-        ]]></description>
-      </attribute>
-      <attribute name="failonerror" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Indicates whether the build will continue
- even if there are compilation errors; defaults to true.]]></short-description>
-        <description><![CDATA[
-          Indicates whether the build will continue
- even if there are compilation errors; defaults to true.
-        ]]></description>
-      </attribute>
-      <attribute name="fork" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[If true, forks the javac compiler.]]></short-description>
-        <description><![CDATA[
-          If true, forks the javac compiler.
-        ]]></description>
-      </attribute>
-      <attribute name="includeantruntime" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[If true, includes Ant's own classpath in the classpath.]]></short-description>
-        <description><![CDATA[
-          If true, includes Ant's own classpath in the classpath.
-        ]]></description>
-      </attribute>
-      <attribute name="includejavaruntime" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[If true, includes the Java runtime libraries in the classpath.]]></short-description>
-        <description><![CDATA[
-          If true, includes the Java runtime libraries in the classpath.
-        ]]></description>
-      </attribute>
-      <attribute name="listfiles" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[If true, list the source files being handed off to the compiler.]]></short-description>
-        <description><![CDATA[
-          If true, list the source files being handed off to the compiler.
-        ]]></description>
-      </attribute>
-      <attribute name="memoryinitialsize" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[The initial size of the memory for the underlying VM
- if javac is run externally; ignored otherwise.]]></short-description>
-        <description><![CDATA[
-          The initial size of the memory for the underlying VM
- if javac is run externally; ignored otherwise.
- Defaults to the standard VM memory setting.
- (Examples: 83886080, 81920k, or 80m)
-        ]]></description>
-      </attribute>
-      <attribute name="memorymaximumsize" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[The maximum size of the memory for the underlying VM
- if javac is run externally; ignored otherwise.]]></short-description>
-        <description><![CDATA[
-          The maximum size of the memory for the underlying VM
- if javac is run externally; ignored otherwise.
- Defaults to the standard VM memory setting.
- (Examples: 83886080, 81920k, or 80m)
-        ]]></description>
-      </attribute>
-      <attribute name="nowarn" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[If true, enables the -nowarn option.]]></short-description>
-        <description><![CDATA[
-          If true, enables the -nowarn option.
-        ]]></description>
-      </attribute>
-      <attribute name="optimize" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[If true, compiles with optimization enabled.]]></short-description>
-        <description><![CDATA[
-          If true, compiles with optimization enabled.
-        ]]></description>
-      </attribute>
-      <attribute name="source" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Value of the -source command-line switch; will be ignored
- by all implementations except modern and jikes.]]></short-description>
-        <description><![CDATA[
-          Value of the -source command-line switch; will be ignored
- by all implementations except modern and jikes.
-
- If you use this attribute together with jikes, you must
- make sure that your version of jikes supports the -source switch.
- Legal values are 1.3 and 1.4 - by default, no -source argument
- will be used at all.
-        ]]></description>
-      </attribute>
-      <attribute name="sourcepath" type="org.apache.tools.ant.types.Path"
-                 briefType="Path" required="NOTDEFINED">
-        <short-description><![CDATA[Sourcepath to be used for this compilation.]]></short-description>
-        <description><![CDATA[
-          Set the sourcepath to be used for this compilation.
-        ]]></description>
-      </attribute>
-      <attribute name="sourcepathref" type="org.apache.tools.ant.types.Reference"
-                 briefType="Reference" required="NOTDEFINED">
-        <short-description><![CDATA[Adds a reference to a source path defined elsewhere.]]></short-description>
-        <description><![CDATA[
-          Adds a reference to a source path defined elsewhere.
-        ]]></description>
-      </attribute>
-      <attribute name="srcdir" type="org.apache.tools.ant.types.Path"
-                 briefType="Path" required="NOTDEFINED">
-        <short-description><![CDATA[Source directories to find the source Java files.]]></short-description>
-        <description><![CDATA[
-          Set the source directories to find the source Java files.
-        ]]></description>
-      </attribute>
-      <attribute name="target" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Target VM that the classes will be compiled for.]]></short-description>
-        <description><![CDATA[
-          Sets the target VM that the classes will be compiled for. Valid
- strings are "1.1", "1.2", and "1.3".
-        ]]></description>
-      </attribute>
-      <attribute name="verbose" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[If true, asks the compiler for verbose output.]]></short-description>
-        <description><![CDATA[
-          If true, asks the compiler for verbose output.
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-      <element name="bootclasspath" type="org.apache.tools.ant.types.Path"
-               briefType="Path"
-               required="NOTDEFINED">
-        <short-description><![CDATA[Adds a path to the bootclasspath.]]></short-description>
-        <description>
-          <![CDATA[Adds a path to the bootclasspath.]]>
-        </description>
-      </element>
-
-      <element name="classpath" type="org.apache.tools.ant.types.Path"
-               briefType="Path"
-               required="NOTDEFINED">
-        <short-description><![CDATA[Adds a path to the classpath.]]></short-description>
-        <description>
-          <![CDATA[Adds a path to the classpath.]]>
-        </description>
-      </element>
-
-      <element name="compilerarg" type="org.apache.tools.ant.taskdefs.Javac.ImplementationSpecificArgument"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[Adds an implementation specific command-line argument.]]></short-description>
-        <description>
-          <![CDATA[Adds an implementation specific command-line argument.]]>
-        </description>
-      </element>
-
-      <element name="extdirs" type="org.apache.tools.ant.types.Path"
-               briefType="Path"
-               required="NOTDEFINED">
-        <short-description><![CDATA[Adds a path to extdirs.]]></short-description>
-        <description>
-          <![CDATA[Adds a path to extdirs.]]>
-        </description>
-      </element>
-
-      <element name="sourcepath" type="org.apache.tools.ant.types.Path"
-               briefType="Path"
-               required="NOTDEFINED">
-        <short-description><![CDATA[Adds a path to sourcepath.]]></short-description>
-        <description>
-          <![CDATA[Adds a path to sourcepath.]]>
-        </description>
-      </element>
-
-      <element name="src" type="org.apache.tools.ant.types.Path"
-               briefType="Path"
-               required="NOTDEFINED">
-        <short-description><![CDATA[Adds a path for source compilation.]]></short-description>
-        <description>
-          <![CDATA[Adds a path for source compilation.]]>
-        </description>
-      </element>
-
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="javacc" category="other"
-      classname="org.apache.tools.ant.taskdefs.optional.javacc.JavaCC"
-      >
-
-  <short-description><![CDATA[JavaCC compiler compiler task.]]></short-description>
-  <description>
-    <![CDATA[JavaCC compiler compiler task.]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="buildparser" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[BUILD_PARSER grammar option.]]></short-description>
-        <description><![CDATA[
-          Sets the BUILD_PARSER grammar option.
-        ]]></description>
-      </attribute>
-      <attribute name="buildtokenmanager" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[BUILD_TOKEN_MANAGER grammar option.]]></short-description>
-        <description><![CDATA[
-          Sets the BUILD_TOKEN_MANAGER grammar option.
-        ]]></description>
-      </attribute>
-      <attribute name="cachetokens" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[CACHE_TOKENS grammar option.]]></short-description>
-        <description><![CDATA[
-          Sets the CACHE_TOKENS grammar option.
-        ]]></description>
-      </attribute>
-      <attribute name="choiceambiguitycheck" type="int"
-                 briefType="int" required="NOTDEFINED">
-        <short-description><![CDATA[CHOICE_AMBIGUITY_CHECK grammar option.]]></short-description>
-        <description><![CDATA[
-          Sets the CHOICE_AMBIGUITY_CHECK grammar option.
-        ]]></description>
-      </attribute>
-      <attribute name="commontokenaction" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[COMMON_TOKEN_ACTION grammar option.]]></short-description>
-        <description><![CDATA[
-          Sets the COMMON_TOKEN_ACTION grammar option.
-        ]]></description>
-      </attribute>
-      <attribute name="debuglookahead" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[DEBUG_LOOKAHEAD grammar option.]]></short-description>
-        <description><![CDATA[
-          Sets the DEBUG_LOOKAHEAD grammar option.
-        ]]></description>
-      </attribute>
-      <attribute name="debugparser" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[DEBUG_PARSER grammar option.]]></short-description>
-        <description><![CDATA[
-          Sets the DEBUG_PARSER grammar option.
-        ]]></description>
-      </attribute>
-      <attribute name="debugtokenmanager" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[DEBUG_TOKEN_MANAGER grammar option.]]></short-description>
-        <description><![CDATA[
-          Sets the DEBUG_TOKEN_MANAGER grammar option.
-        ]]></description>
-      </attribute>
-      <attribute name="errorreporting" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[ERROR_REPORTING grammar option.]]></short-description>
-        <description><![CDATA[
-          Sets the ERROR_REPORTING grammar option.
-        ]]></description>
-      </attribute>
-      <attribute name="forcelacheck" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[FORCE_LA_CHECK grammar option.]]></short-description>
-        <description><![CDATA[
-          Sets the FORCE_LA_CHECK grammar option.
-        ]]></description>
-      </attribute>
-      <attribute name="ignorecase" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[IGNORE_CASE grammar option.]]></short-description>
-        <description><![CDATA[
-          Sets the IGNORE_CASE grammar option.
-        ]]></description>
-      </attribute>
-      <attribute name="javacchome" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[The directory containing the JavaCC distribution.]]></short-description>
-        <description><![CDATA[
-          The directory containing the JavaCC distribution.
-        ]]></description>
-      </attribute>
-      <attribute name="javaunicodeescape" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[JAVA_UNICODE_ESCAPE grammar option.]]></short-description>
-        <description><![CDATA[
-          Sets the JAVA_UNICODE_ESCAPE grammar option.
-        ]]></description>
-      </attribute>
-      <attribute name="lookahead" type="int"
-                 briefType="int" required="NOTDEFINED">
-        <short-description><![CDATA[LOOKAHEAD grammar option.]]></short-description>
-        <description><![CDATA[
-          Sets the LOOKAHEAD grammar option.
-        ]]></description>
-      </attribute>
-      <attribute name="optimizetokenmanager" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[OPTIMIZE_TOKEN_MANAGER grammar option.]]></short-description>
-        <description><![CDATA[
-          Sets the OPTIMIZE_TOKEN_MANAGER grammar option.
-        ]]></description>
-      </attribute>
-      <attribute name="otherambiguitycheck" type="int"
-                 briefType="int" required="NOTDEFINED">
-        <short-description><![CDATA[OTHER_AMBIGUITY_CHECK grammar option.]]></short-description>
-        <description><![CDATA[
-          Sets the OTHER_AMBIGUITY_CHECK grammar option.
-        ]]></description>
-      </attribute>
-      <attribute name="outputdirectory" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[The directory to write the generated files to.]]></short-description>
-        <description><![CDATA[
-          The directory to write the generated files to.
- If not set, the files are written to the directory
- containing the grammar file.
-        ]]></description>
-      </attribute>
-      <attribute name="sanitycheck" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[SANITY_CHECK grammar option.]]></short-description>
-        <description><![CDATA[
-          Sets the SANITY_CHECK grammar option.
-        ]]></description>
-      </attribute>
-      <attribute name="static" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[STATIC grammar option.]]></short-description>
-        <description><![CDATA[
-          Sets the STATIC grammar option.
-        ]]></description>
-      </attribute>
-      <attribute name="target" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[The grammar file to process.]]></short-description>
-        <description><![CDATA[
-          The grammar file to process.
-        ]]></description>
-      </attribute>
-      <attribute name="unicodeinput" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[UNICODE_INPUT grammar option.]]></short-description>
-        <description><![CDATA[
-          Sets the UNICODE_INPUT grammar option.
-        ]]></description>
-      </attribute>
-      <attribute name="usercharstream" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[USER_CHAR_STREAM grammar option.]]></short-description>
-        <description><![CDATA[
-          Sets the USER_CHAR_STREAM grammar option.
-        ]]></description>
-      </attribute>
-      <attribute name="usertokenmanager" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[USER_TOKEN_MANAGER grammar option.]]></short-description>
-        <description><![CDATA[
-          Sets the USER_TOKEN_MANAGER grammar option.
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="javadoc" category="java"
-      classname="org.apache.tools.ant.taskdefs.Javadoc"
-      >
-
-  <!-- javadoc task -->
-<external>
-<description>
-
-<p>Generates code documentation using the javadoc tool.</p>
-
-<p>The source directory will be recursively scanned for Java source files to process
-but only those matching the inclusion rules, and not matching the exclusions rules
-will be passed to the javadoc tool. This
-allows wildcards to be used to choose between package names, reducing verbosity
-and management costs over time. This task, however, has no notion of
-&quot;changed&quot; files, unlike the <a href="javac.html">javac</a> task. This means
-all packages will be processed each time this task is run. In general, however,
-this task is used much less frequently.</p>
-
-<p>This task works seamlessly between different javadoc versions (1.1 and 1.2),
-with the obvious restriction that the 1.2 attributes will be ignored if run in a
-1.1 VM.</p>
-
-<p>NOTE: since javadoc calls System.exit(), javadoc cannot be run inside the
-same VM as ant without breaking functionality. For this reason, this task
-always forks the VM. This overhead is not significant since javadoc is normally a heavy
-application and will be called infrequently.</p>
-
-<p>NOTE: the packagelist attribute allows you to specify the list of packages to
-document outside of the Ant file. It's a much better practice to include everything
-inside the build.xml file. This option was added in order to make it easier to
-migrate from regular makefiles, where you would use this option of javadoc.
-The packages listed in packagelist are not checked, so the task performs even
-if some packages are missing or broken. Use this option if you wish to convert from
-an existing makefile. Once things are running you should then switch to the regular
-notation. </p>
-
-<p><i><b>DEPRECATION:</b> the javadoc2 task simply points to the javadoc task and it's
-there for back compatibility reasons. Since this task will be removed in future
-versions, you are strongly encouraged to use <a href="javadoc.html">javadoc</a>
-instead.</i></p>
-</description>
-
-<section anchor="examples" name="Example">
-<pre>  &lt;javadoc packagenames=&quot;com.dummy.test.*&quot;
-           sourcepath=&quot;src&quot;
-           excludepackagenames=&quot;com.dummy.test.doc-files.*&quot;
-           defaultexcludes=&quot;yes&quot;
-           destdir=&quot;docs/api&quot;
-           author=&quot;true&quot;
-           version=&quot;true&quot;
-           use=&quot;true&quot;
-           windowtitle=&quot;Test API&quot;&gt;
-    &lt;doctitle&gt;&lt;![CDATA[&lt;h1&gt;Test&lt;/h1&gt;]]&gt;&lt;/doctitle&gt;
-    &lt;bottom&gt;&lt;![CDATA[&lt;i&gt;Copyright &amp;#169; 2000 Dummy Corp. All Rights Reserved.&lt;/i&gt;]]&gt;&lt;/bottom&gt;
-    &lt;tag name=&quot;todo&quot; scope=&quot;all&quot; description=&quot;To do:&quot; /&gt;
-    &lt;group title=&quot;Group 1 Packages&quot; packages=&quot;com.dummy.test.a*&quot;/&gt;
-    &lt;group title=&quot;Group 2 Packages&quot; packages=&quot;com.dummy.test.b*:com.dummy.test.c*&quot;/&gt;
-    &lt;link offline=&quot;true&quot; href=&quot;http://java.sun.com/products/jdk/1.2/docs/api/&quot; packagelistLoc=&quot;C:\tmp&quot;/&gt;
-    &lt;link href=&quot;http://developer.java.sun.com/developer/products/xml/docs/api/&quot;/&gt;
-  &lt;/javadoc&gt;</pre>
-</section>
-</external>
-
-  <short-description><![CDATA[Generates Javadoc documentation for a collection of source code.]]></short-description>
-  <description>
-    <![CDATA[Generates Javadoc documentation for a collection
- of source code.
-
- <P>Current known limitations are:
-
- <P><UL>
-    <LI>patterns must be of the form "xxx.*", every other pattern doesn't
-        work.
-    <LI>there is no control on arguments sanity since they are left
-        to the javadoc implementation.
-    <LI>argument J in javadoc1 is not supported (what is that for anyway?)
- </UL>
-
- <P>If no <CODE>doclet</CODE> is set, then the <CODE>version</CODE> and
- <CODE>author</CODE> are by default <CODE>"yes"</CODE>.
-
- <P>Note: This task is run on another VM because the Javadoc code calls
- <CODE>System.exit()</CODE> which would break Ant functionality.]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="access" type="org.apache.tools.ant.taskdefs.Javadoc.AccessType"
-                 briefType="&quot;protected&quot;, &quot;public&quot;, &quot;package&quot;, &quot;private&quot;" required="NOTDEFINED">
-        <short-description><![CDATA[Scope to be processed.]]></short-description>
-        <description><![CDATA[
-          Set the scope to be processed. This is an alternative to the
- use of the setPublic, setPrivate, etc methods. It gives better build
- file control over what scope is processed.
-        ]]></description>
-      </attribute>
-      <attribute name="additionalparam" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Set an additional parameter on the command line.]]></short-description>
-        <description><![CDATA[
-          Set an additional parameter on the command line
-        ]]></description>
-      </attribute>
-      <attribute name="author" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Include the author tag in the generated documentation.]]></short-description>
-        <description><![CDATA[
-          Include the author tag in the generated documentation.
-        ]]></description>
-      </attribute>
-      <attribute name="bootclasspathref" type="org.apache.tools.ant.types.Reference"
-                 briefType="Reference" required="NOTDEFINED">
-        <short-description><![CDATA[Adds a reference to a CLASSPATH defined elsewhere.]]></short-description>
-        <description><![CDATA[
-          Adds a reference to a CLASSPATH defined elsewhere.
-        ]]></description>
-      </attribute>
-      <attribute name="bootclasspath" type="org.apache.tools.ant.types.Path"
-                 briefType="Path" required="NOTDEFINED">
-        <short-description><![CDATA[Boot classpath to use.]]></short-description>
-        <description><![CDATA[
-          Set the boot classpath to use.
-        ]]></description>
-      </attribute>
-      <attribute name="bottom" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Text to be placed at the bottom of each output file.]]></short-description>
-        <description><![CDATA[
-          Set the text to be placed at the bottom of each output file.
-        ]]></description>
-      </attribute>
-      <attribute name="charset" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Charset for cross-platform viewing of generated documentation.]]></short-description>
-        <description><![CDATA[
-          Charset for cross-platform viewing of generated documentation.
-        ]]></description>
-      </attribute>
-      <attribute name="classpath" type="org.apache.tools.ant.types.Path"
-                 briefType="Path" required="NOTDEFINED">
-        <short-description><![CDATA[Classpath to be used for this javadoc run.]]></short-description>
-        <description><![CDATA[
-          Set the classpath to be used for this javadoc run.
-        ]]></description>
-      </attribute>
-      <attribute name="classpathref" type="org.apache.tools.ant.types.Reference"
-                 briefType="Reference" required="NOTDEFINED">
-        <short-description><![CDATA[Adds a reference to a CLASSPATH defined elsewhere.]]></short-description>
-        <description><![CDATA[
-          Adds a reference to a CLASSPATH defined elsewhere.
-        ]]></description>
-      </attribute>
-      <attribute name="defaultexcludes" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Sets whether default exclusions should be used or not.]]></short-description>
-        <description><![CDATA[
-          Sets whether default exclusions should be used or not.
-        ]]></description>
-      </attribute>
-      <attribute name="destdir" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[Directory where the Javadoc output will be generated.]]></short-description>
-        <description><![CDATA[
-          Set the directory where the Javadoc output will be generated.
-        ]]></description>
-      </attribute>
-      <attribute name="docencoding" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Output file encoding name.]]></short-description>
-        <description><![CDATA[
-          Output file encoding name.
-        ]]></description>
-      </attribute>
-      <attribute name="doclet" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Class that starts the doclet used in generating the 
- documentation.]]></short-description>
-        <description><![CDATA[
-          Set the class that starts the doclet used in generating the 
- documentation.
-        ]]></description>
-      </attribute>
-      <attribute name="docletpath" type="org.apache.tools.ant.types.Path"
-                 briefType="Path" required="NOTDEFINED">
-        <short-description><![CDATA[Classpath used to find the doclet class.]]></short-description>
-        <description><![CDATA[
-          Set the classpath used to find the doclet class.
-        ]]></description>
-      </attribute>
-      <attribute name="docletpathref" type="org.apache.tools.ant.types.Reference"
-                 briefType="Reference" required="NOTDEFINED">
-        <short-description><![CDATA[Classpath used to find the doclet class by reference.]]></short-description>
-        <description><![CDATA[
-          Set the classpath used to find the doclet class by reference.
-        ]]></description>
-      </attribute>
-      <attribute name="doctitle" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Title of the generated overview page.]]></short-description>
-        <description><![CDATA[
-          Set the title of the generated overview page.
-        ]]></description>
-      </attribute>
-      <attribute name="encoding" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Encoding name of the source files,.]]></short-description>
-        <description><![CDATA[
-          Set the encoding name of the source files,
-        ]]></description>
-      </attribute>
-      <attribute name="excludepackagenames" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[List of packages to be excluded.]]></short-description>
-        <description><![CDATA[
-          Set the list of packages to be excluded.
-        ]]></description>
-      </attribute>
-      <attribute name="extdirs" type="org.apache.tools.ant.types.Path"
-                 briefType="Path" required="NOTDEFINED">
-        <short-description><![CDATA[Location of the extensions directories.]]></short-description>
-        <description><![CDATA[
-          Set the location of the extensions directories.
-        ]]></description>
-      </attribute>
-      <attribute name="failonerror" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Should the build process fail if javadoc fails (as indicated by
- a non zero return code)?.]]></short-description>
-        <description><![CDATA[
-          Should the build process fail if javadoc fails (as indicated by
- a non zero return code)?
-
- <p>Default is false.</p>
-        ]]></description>
-      </attribute>
-      <attribute name="footer" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Footer text to be placed at the bottom of each output file.]]></short-description>
-        <description><![CDATA[
-          Set the footer text to be placed at the bottom of each output file.
-        ]]></description>
-      </attribute>
-      <attribute name="group" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Group specified packages together in overview page.]]></short-description>
-        <description><![CDATA[
-          Group specified packages together in overview page.
-        ]]></description>
-      </attribute>
-      <attribute name="header" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Header text to be placed at the top of each output file.]]></short-description>
-        <description><![CDATA[
-          Set the header text to be placed at the top of each output file.
-        ]]></description>
-      </attribute>
-      <attribute name="helpfile" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[Specifies the HTML help file to use.]]></short-description>
-        <description><![CDATA[
-          Specifies the HTML help file to use.
-        ]]></description>
-      </attribute>
-      <attribute name="link" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Create links to javadoc output at the given URL.]]></short-description>
-        <description><![CDATA[
-          Create links to javadoc output at the given URL.
-        ]]></description>
-      </attribute>
-      <attribute name="linkoffline" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Link to docs at "url" using package list at "url2"
- - separate the URLs by using a space character.]]></short-description>
-        <description><![CDATA[
-          Link to docs at "url" using package list at "url2"
- - separate the URLs by using a space character.
-        ]]></description>
-      </attribute>
-      <attribute name="locale" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Local to use in documentation generation.]]></short-description>
-        <description><![CDATA[
-          Set the local to use in documentation generation.
-        ]]></description>
-      </attribute>
-      <attribute name="maxmemory" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Maximum memory to be used by the javadoc process.]]></short-description>
-        <description><![CDATA[
-          Set the maximum memory to be used by the javadoc process
-        ]]></description>
-      </attribute>
-      <attribute name="nodeprecated" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[If true, do not include @deprecated information.]]></short-description>
-        <description><![CDATA[
-          If true, do not include @deprecated information.
-        ]]></description>
-      </attribute>
-      <attribute name="nodeprecatedlist" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[If true, do not generate deprecated list.]]></short-description>
-        <description><![CDATA[
-          If true, do not generate deprecated list.
-        ]]></description>
-      </attribute>
-      <attribute name="nohelp" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[If true, do not generate help link.]]></short-description>
-        <description><![CDATA[
-          If true, do not generate help link
-        ]]></description>
-      </attribute>
-      <attribute name="noindex" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[If true, do not generate index.]]></short-description>
-        <description><![CDATA[
-          If true, do not generate index.
-        ]]></description>
-      </attribute>
-      <attribute name="nonavbar" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[If true, do not generate navigation bar.]]></short-description>
-        <description><![CDATA[
-          If true, do not generate navigation bar.
-        ]]></description>
-      </attribute>
-      <attribute name="notree" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[If true, do not generate class hierarchy.]]></short-description>
-        <description><![CDATA[
-          If true, do not generate class hierarchy.
-        ]]></description>
-      </attribute>
-      <attribute name="old" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Indicate whether Javadoc should produce old style (JDK 1.1) 
- documentation.]]></short-description>
-        <description><![CDATA[
-          Indicate whether Javadoc should produce old style (JDK 1.1) 
- documentation.
-
- This is not supported by JDK 1.1 and has been phased out in JDK 1.4
-        ]]></description>
-      </attribute>
-      <attribute name="overview" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[Specify the file containing the overview to be included in the generated
- documentation.]]></short-description>
-        <description><![CDATA[
-          Specify the file containing the overview to be included in the generated
- documentation.
-        ]]></description>
-      </attribute>
-      <attribute name="package" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Indicate whether only package, protected and public classes and 
- members are to be included in the scope processed.]]></short-description>
-        <description><![CDATA[
-          Indicate whether only package, protected and public classes and 
- members are to be included in the scope processed
-        ]]></description>
-      </attribute>
-      <attribute name="packagelist" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[The name of a file containing the packages to process.]]></short-description>
-        <description><![CDATA[
-          The name of a file containing the packages to process.
-        ]]></description>
-      </attribute>
-      <attribute name="packagenames" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Package names to be processed.]]></short-description>
-        <description><![CDATA[
-          Set the package names to be processed.
-        ]]></description>
-      </attribute>
-      <attribute name="private" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Indicate whether all classes and 
- members are to be included in the scope processed.]]></short-description>
-        <description><![CDATA[
-          Indicate whether all classes and 
- members are to be included in the scope processed
-        ]]></description>
-      </attribute>
-      <attribute name="protected" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Indicate whether only protected and public classes and members are to 
- be included in the scope processed.]]></short-description>
-        <description><![CDATA[
-          Indicate whether only protected and public classes and members are to 
- be included in the scope processed
-        ]]></description>
-      </attribute>
-      <attribute name="public" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Indicate whether only public classes and members are to be included in 
- the scope processed.]]></short-description>
-        <description><![CDATA[
-          Indicate whether only public classes and members are to be included in 
- the scope processed
-        ]]></description>
-      </attribute>
-      <attribute name="serialwarn" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[If true, generate warning about @serial tag.]]></short-description>
-        <description><![CDATA[
-          If true, generate warning about @serial tag.
-        ]]></description>
-      </attribute>
-      <attribute name="source" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Enables the -source switch, will be ignored if javadoc is not
- the 1.4 version or a different doclet than the standard doclet
- is used.]]></short-description>
-        <description><![CDATA[
-          Enables the -source switch, will be ignored if javadoc is not
- the 1.4 version or a different doclet than the standard doclet
- is used.
-        ]]></description>
-      </attribute>
-      <attribute name="sourcefiles" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[List of source files to process.]]></short-description>
-        <description><![CDATA[
-          Set the list of source files to process.
-        ]]></description>
-      </attribute>
-      <attribute name="sourcepath" type="org.apache.tools.ant.types.Path"
-                 briefType="Path" required="NOTDEFINED">
-        <short-description><![CDATA[Specify where to find source file.]]></short-description>
-        <description><![CDATA[
-          Specify where to find source file
-        ]]></description>
-      </attribute>
-      <attribute name="sourcepathref" type="org.apache.tools.ant.types.Reference"
-                 briefType="Reference" required="NOTDEFINED">
-        <short-description><![CDATA[Adds a reference to a CLASSPATH defined elsewhere.]]></short-description>
-        <description><![CDATA[
-          Adds a reference to a CLASSPATH defined elsewhere.
-        ]]></description>
-      </attribute>
-      <attribute name="splitindex" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Generate a split index.]]></short-description>
-        <description><![CDATA[
-          Generate a split index
-        ]]></description>
-      </attribute>
-      <attribute name="stylesheetfile" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[Specifies the CSS stylesheet file to use.]]></short-description>
-        <description><![CDATA[
-          Specifies the CSS stylesheet file to use.
-        ]]></description>
-      </attribute>
-      <attribute name="use" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Generate the &quot;use&quot page for each package.]]></short-description>
-        <description><![CDATA[
-          Generate the &quot;use&quot page for each package.
-        ]]></description>
-      </attribute>
-      <attribute name="useexternalfile" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Work around command line length limit by using an external file
- for the sourcefiles.]]></short-description>
-        <description><![CDATA[
-          Work around command line length limit by using an external file
- for the sourcefiles.
-        ]]></description>
-      </attribute>
-      <attribute name="verbose" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Run javadoc in verbose mode.]]></short-description>
-        <description><![CDATA[
-          Run javadoc in verbose mode
-        ]]></description>
-      </attribute>
-      <attribute name="version" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Include the version tag in the generated documentation.]]></short-description>
-        <description><![CDATA[
-          Include the version tag in the generated documentation.
-        ]]></description>
-      </attribute>
-      <attribute name="windowtitle" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Title to be placed in the HTML &lt;title&gt; tag of the 
- generated documentation.]]></short-description>
-        <description><![CDATA[
-          Set the title to be placed in the HTML &lt;title&gt; tag of the 
- generated documentation.
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-      <element name="bottom" type="org.apache.tools.ant.taskdefs.Javadoc.Html"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[Text to be placed at the bottom of each output file.]]></short-description>
-        <description>
-          <![CDATA[Set the text to be placed at the bottom of each output file.]]>
-        </description>
-      </element>
-
-      <element name="doctitle" type="org.apache.tools.ant.taskdefs.Javadoc.Html"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[Add a document title to use for the overview page.]]></short-description>
-        <description>
-          <![CDATA[Add a document title to use for the overview page.]]>
-        </description>
-      </element>
-
-      <element name="excludepackage" type="org.apache.tools.ant.taskdefs.Javadoc.PackageName"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[Add a package to be excluded from the javadoc run.]]></short-description>
-        <description>
-          <![CDATA[Add a package to be excluded from the javadoc run.]]>
-        </description>
-      </element>
-
-      <element name="fileset" type="org.apache.tools.ant.types.FileSet"
-               briefType="Fileset"
-               required="NOTDEFINED">
-        <short-description><![CDATA[Adds a fileset.]]></short-description>
-        <description>
-          <![CDATA[Adds a fileset.
-
- <p>All included files will be added as sourcefiles.  The task
- will automatically add
- <code>includes=&quot;**&#47;*.java&quot;</code> to the
- fileset.</p>]]>
-        </description>
-      </element>
-
-      <element name="footer" type="org.apache.tools.ant.taskdefs.Javadoc.Html"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[Footer text to be placed at the bottom of each output file.]]></short-description>
-        <description>
-          <![CDATA[Set the footer text to be placed at the bottom of each output file.]]>
-        </description>
-      </element>
-
-      <element name="header" type="org.apache.tools.ant.taskdefs.Javadoc.Html"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[Header text to be placed at the top of each output file.]]></short-description>
-        <description>
-          <![CDATA[Set the header text to be placed at the top of each output file.]]>
-        </description>
-      </element>
-
-      <element name="package" type="org.apache.tools.ant.taskdefs.Javadoc.PackageName"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[Add a single package to be processed.]]></short-description>
-        <description>
-          <![CDATA[Add a single package to be processed.
-
- If the package name ends with &quot;.*&quot; the Javadoc task
- will find and process all subpackages.]]>
-        </description>
-      </element>
-
-      <element name="packageset" type="org.apache.tools.ant.types.DirSet"
-               briefType="Dirset"
-               required="NOTDEFINED">
-        <short-description><![CDATA[Adds a packageset.]]></short-description>
-        <description>
-          <![CDATA[Adds a packageset.
-
- <p>All included directories will be translated into package
- names be converting the directory separator into dots.</p>]]>
-        </description>
-      </element>
-
-      <element name="source" type="org.apache.tools.ant.taskdefs.Javadoc.SourceFile"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[Add a single source file.]]></short-description>
-        <description>
-          <![CDATA[Add a single source file.]]>
-        </description>
-      </element>
-
-      <element name="taglet" type="org.apache.tools.ant.taskdefs.Javadoc.ExtensionInfo"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[Add a taglet.]]></short-description>
-        <description>
-          <![CDATA[Add a taglet]]>
-        </description>
-      </element>
-
-      <element name="bootclasspath" type="org.apache.tools.ant.types.Path"
-               briefType="Path"
-               required="NOTDEFINED">
-        <short-description><![CDATA[Create a Path to be configured with the boot classpath.]]></short-description>
-        <description>
-          <![CDATA[Create a Path to be configured with the boot classpath]]>
-        </description>
-      </element>
-
-      <element name="classpath" type="org.apache.tools.ant.types.Path"
-               briefType="Path"
-               required="NOTDEFINED">
-        <short-description><![CDATA[Create a Path to be configured with the classpath to use.]]></short-description>
-        <description>
-          <![CDATA[Create a Path to be configured with the classpath to use]]>
-        </description>
-      </element>
-
-      <element name="doclet" type="org.apache.tools.ant.taskdefs.Javadoc.DocletInfo"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[Create a doclet to be used in the documentation generation.]]></short-description>
-        <description>
-          <![CDATA[Create a doclet to be used in the documentation generation.]]>
-        </description>
-      </element>
-
-      <element name="group" type="org.apache.tools.ant.taskdefs.Javadoc.GroupArgument"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[Separates packages on the overview page into whatever
- groups you specify, one group per table.]]></short-description>
-        <description>
-          <![CDATA[Separates packages on the overview page into whatever
- groups you specify, one group per table.]]>
-        </description>
-      </element>
-
-      <element name="link" type="org.apache.tools.ant.taskdefs.Javadoc.LinkArgument"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[Create link to javadoc output at the given URL.]]></short-description>
-        <description>
-          <![CDATA[Create link to javadoc output at the given URL.]]>
-        </description>
-      </element>
-
-      <element name="sourcepath" type="org.apache.tools.ant.types.Path"
-               briefType="Path"
-               required="NOTDEFINED">
-        <short-description><![CDATA[Create a path to be configured with the locations of the source
- files.]]></short-description>
-        <description>
-          <![CDATA[Create a path to be configured with the locations of the source
- files.]]>
-        </description>
-      </element>
-
-      <element name="tag" type="org.apache.tools.ant.taskdefs.Javadoc.TagArgument"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[Creates and adds a -tag argument.]]></short-description>
-        <description>
-          <![CDATA[Creates and adds a -tag argument. This is used to specify
- custom tags. This argument is only available for JavaDoc 1.4,
- and will generate a verbose message (and then be ignored)
- when run on Java versions below 1.4.]]>
-        </description>
-      </element>
-
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="javah" category="other"
-      classname="org.apache.tools.ant.taskdefs.optional.Javah"
-      >
-
-  <short-description><![CDATA[Generates JNI header files using javah.]]></short-description>
-  <description>
-    <![CDATA[Generates JNI header files using javah.
-
- This task can take the following arguments:
- <ul>
- <li>classname - the fully-qualified name of a class</li>
- <li>outputFile - Concatenates the resulting header or source files for all
-     the classes listed into this file</li>
- <li>destdir - Sets the directory where javah saves the header files or the
-     stub files</li>
- <li>classpath</li>
- <li>bootclasspath</li>
- <li>force - Specifies that output files should always be written
-(JDK1.2 only)</li>
- <li>old - Specifies that old JDK1.0-style header files should be generated
-     (otherwise output file contain JNI-style native method
-      function prototypes) (JDK1.2 only)</li>
- <li>stubs - generate C declarations from the Java object file (used with old)</li>
- <li>verbose - causes javah to print a message to stdout concerning the status
-     of the generated files</li>
- <li>extdirs - Override location of installed extensions</li>
- </ul>
- Of these arguments, either <b>outputFile</b> or <b>destdir</b> is required,
- but not both. More than one classname may be specified, using a comma-separated
- list or by using <code>&lt;class name="xxx"&gt;</code> elements within the task.
- <p>
- When this task executes, it will generate C header and source files that
- are needed to implement native methods.]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="bootclasspathref" type="org.apache.tools.ant.types.Reference"
-                 briefType="Reference" required="NOTDEFINED">
-        <short-description><![CDATA[Adds a reference to a classpath defined elsewhere.]]></short-description>
-        <description><![CDATA[
-          Adds a reference to a classpath defined elsewhere.
-        ]]></description>
-      </attribute>
-      <attribute name="bootclasspath" type="org.apache.tools.ant.types.Path"
-                 briefType="Path" required="NOTDEFINED">
-        <short-description><![CDATA[Location of bootstrap class files.]]></short-description>
-        <description><![CDATA[
-          location of bootstrap class files.
-        ]]></description>
-      </attribute>
-      <attribute name="class" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[The fully-qualified name of the class (or classes, separated by commas).]]></short-description>
-        <description><![CDATA[
-          the fully-qualified name of the class (or classes, separated by commas).
-        ]]></description>
-      </attribute>
-      <attribute name="classpath" type="org.apache.tools.ant.types.Path"
-                 briefType="Path" required="NOTDEFINED">
-        <short-description><![CDATA[The classpath to use.]]></short-description>
-        <description><![CDATA[
-          the classpath to use.
-        ]]></description>
-      </attribute>
-      <attribute name="classpathref" type="org.apache.tools.ant.types.Reference"
-                 briefType="Reference" required="NOTDEFINED">
-        <short-description><![CDATA[Adds a reference to a classpath defined elsewhere.]]></short-description>
-        <description><![CDATA[
-          Adds a reference to a classpath defined elsewhere.
-        ]]></description>
-      </attribute>
-      <attribute name="destdir" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[Destination directory into which the Java source
- files should be compiled.]]></short-description>
-        <description><![CDATA[
-          Set the destination directory into which the Java source
- files should be compiled.
-        ]]></description>
-      </attribute>
-      <attribute name="force" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[If true, output files should always be written (JDK1.2 only).]]></short-description>
-        <description><![CDATA[
-          If true, output files should always be written (JDK1.2 only).
-        ]]></description>
-      </attribute>
-      <attribute name="old" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[If true, specifies that old JDK1.0-style header files should be
- generated.
- (otherwise output file contain JNI-style native method function prototypes) (JDK1.2 only).]]></short-description>
-        <description><![CDATA[
-          If true, specifies that old JDK1.0-style header files should be
- generated.
- (otherwise output file contain JNI-style native method function prototypes) (JDK1.2 only)
-        ]]></description>
-      </attribute>
-      <attribute name="outputfile" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[Concatenates the resulting header or source files for all
- the classes listed into this file.]]></short-description>
-        <description><![CDATA[
-          Concatenates the resulting header or source files for all
- the classes listed into this file.
-        ]]></description>
-      </attribute>
-      <attribute name="stubs" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[If true, generate C declarations from the Java object file (used with old).]]></short-description>
-        <description><![CDATA[
-          If true, generate C declarations from the Java object file (used with old).
-        ]]></description>
-      </attribute>
-      <attribute name="verbose" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[If true, causes Javah to print a message concerning
- the status of the generated files.]]></short-description>
-        <description><![CDATA[
-          If true, causes Javah to print a message concerning
- the status of the generated files.
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-      <element name="bootclasspath" type="org.apache.tools.ant.types.Path"
-               briefType="Path"
-               required="NOTDEFINED">
-        <short-description><![CDATA[Adds path to bootstrap class files.]]></short-description>
-        <description>
-          <![CDATA[Adds path to bootstrap class files.]]>
-        </description>
-      </element>
-
-      <element name="class" type="org.apache.tools.ant.taskdefs.optional.Javah.ClassArgument"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[Adds class to process.]]></short-description>
-        <description>
-          <![CDATA[Adds class to process.]]>
-        </description>
-      </element>
-
-      <element name="classpath" type="org.apache.tools.ant.types.Path"
-               briefType="Path"
-               required="NOTDEFINED">
-        <short-description><![CDATA[Path to use for classpath.]]></short-description>
-        <description>
-          <![CDATA[Path to use for classpath.]]>
-        </description>
-      </element>
-
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="jdepend" category="other"
-      classname="org.apache.tools.ant.taskdefs.optional.jdepend.JDependTask"
-      >
-
-  <short-description><![CDATA[Runs JDepend tests.]]></short-description>
-  <description>
-    <![CDATA[Runs JDepend tests.
-
- <p>JDepend is a tool to generate design quality metrics for each Java package.
- It has been initially created by Mike Clark. JDepend can be found at <a
- href="http://www.clarkware.com/software/JDepend.html">http://www.clarkware.com/software/JDepend.html</a>.
-
- The current implementation spawn a new Java VM.]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="classpath" type="org.apache.tools.ant.types.Path"
-                 briefType="Path" required="NOTDEFINED">
-        <short-description><![CDATA[Classpath to be used for this compilation.]]></short-description>
-        <description><![CDATA[
-          Set the classpath to be used for this compilation.
-        ]]></description>
-      </attribute>
-      <attribute name="classpathref" type="org.apache.tools.ant.types.Reference"
-                 briefType="Reference" required="NOTDEFINED">
-        <short-description><![CDATA[Adds a reference to a classpath defined elsewhere.]]></short-description>
-        <description><![CDATA[
-          Adds a reference to a classpath defined elsewhere.
-        ]]></description>
-      </attribute>
-      <attribute name="dir" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[The directory to invoke the VM in.]]></short-description>
-        <description><![CDATA[
-          The directory to invoke the VM in. Ignored if no JVM is forked.
-        ]]></description>
-      </attribute>
-      <attribute name="fork" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[If true, forks into a new JVM.]]></short-description>
-        <description><![CDATA[
-          If true, forks into a new JVM. Default: false.
-        ]]></description>
-      </attribute>
-      <attribute name="format" type="org.apache.tools.ant.taskdefs.optional.jdepend.JDependTask.FormatAttribute"
-                 briefType="&quot;xml&quot;, &quot;text&quot;" required="NOTDEFINED">
-        <short-description><![CDATA[The format to write the output in, "xml" or "text".]]></short-description>
-        <description><![CDATA[
-          The format to write the output in, "xml" or "text".
-        ]]></description>
-      </attribute>
-      <attribute name="haltonerror" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Whether or not to halt on failure.]]></short-description>
-        <description><![CDATA[
-          Whether or not to halt on failure. Default: false.
-        ]]></description>
-      </attribute>
-      <attribute name="jvm" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[The command used to invoke a forked Java Virtual Machine.]]></short-description>
-        <description><![CDATA[
-          The command used to invoke a forked Java Virtual Machine.
-
- Default is <tt>java</tt>. Ignored if no JVM is forked.
-        ]]></description>
-      </attribute>
-      <attribute name="outputfile" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[The output file name.]]></short-description>
-        <description><![CDATA[
-          The output file name.
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-      <element name="classpath" type="org.apache.tools.ant.types.Path"
-               briefType="Path"
-               required="NOTDEFINED">
-        <short-description><![CDATA[Adds a path to the classpath.]]></short-description>
-        <description>
-          <![CDATA[Adds a path to the classpath.]]>
-        </description>
-      </element>
-
-      <element name="sourcespath" type="org.apache.tools.ant.types.Path"
-               briefType="Path"
-               required="NOTDEFINED">
-        <short-description><![CDATA[Adds a path to source code to analyze.]]></short-description>
-        <description>
-          <![CDATA[Adds a path to source code to analyze.]]>
-        </description>
-      </element>
-
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="jjtree" category="other"
-      classname="org.apache.tools.ant.taskdefs.optional.javacc.JJTree"
-      >
-
-  <short-description><![CDATA[Runs the JJTree compiler compiler.]]></short-description>
-  <description>
-    <![CDATA[Runs the JJTree compiler compiler.]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="buildnodefiles" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[BUILD_NODE_FILES grammar option.]]></short-description>
-        <description><![CDATA[
-          Sets the BUILD_NODE_FILES grammar option.
-        ]]></description>
-      </attribute>
-      <attribute name="javacchome" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[The directory containing the JavaCC distribution.]]></short-description>
-        <description><![CDATA[
-          The directory containing the JavaCC distribution.
-        ]]></description>
-      </attribute>
-      <attribute name="multi" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[MULTI grammar option.]]></short-description>
-        <description><![CDATA[
-          Sets the MULTI grammar option.
-        ]]></description>
-      </attribute>
-      <attribute name="nodedefaultvoid" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[NODE_DEFAULT_VOID grammar option.]]></short-description>
-        <description><![CDATA[
-          Sets the NODE_DEFAULT_VOID grammar option.
-        ]]></description>
-      </attribute>
-      <attribute name="nodefactory" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[NODE_FACTORY grammar option.]]></short-description>
-        <description><![CDATA[
-          Sets the NODE_FACTORY grammar option.
-        ]]></description>
-      </attribute>
-      <attribute name="nodepackage" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[NODE_PACKAGE grammar option.]]></short-description>
-        <description><![CDATA[
-          Sets the NODE_PACKAGE grammar option.
-        ]]></description>
-      </attribute>
-      <attribute name="nodeprefix" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[NODE_PREFIX grammar option.]]></short-description>
-        <description><![CDATA[
-          Sets the NODE_PREFIX grammar option.
-        ]]></description>
-      </attribute>
-      <attribute name="nodescopehook" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[NODE_SCOPE_HOOK grammar option.]]></short-description>
-        <description><![CDATA[
-          Sets the NODE_SCOPE_HOOK grammar option.
-        ]]></description>
-      </attribute>
-      <attribute name="nodeusesparser" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[NODE_USES_PARSER grammar option.]]></short-description>
-        <description><![CDATA[
-          Sets the NODE_USES_PARSER grammar option.
-        ]]></description>
-      </attribute>
-      <attribute name="outputdirectory" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[The directory to write the generated file to.]]></short-description>
-        <description><![CDATA[
-          The directory to write the generated file to.
- If not set, the files are written to the directory
- containing the grammar file.
-        ]]></description>
-      </attribute>
-      <attribute name="static" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[STATIC grammar option.]]></short-description>
-        <description><![CDATA[
-          Sets the STATIC grammar option.
-        ]]></description>
-      </attribute>
-      <attribute name="target" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[The jjtree grammar file to process.]]></short-description>
-        <description><![CDATA[
-          The jjtree grammar file to process.
-        ]]></description>
-      </attribute>
-      <attribute name="visitor" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[VISITOR grammar option.]]></short-description>
-        <description><![CDATA[
-          Sets the VISITOR grammar option.
-        ]]></description>
-      </attribute>
-      <attribute name="visitorexception" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[VISITOR_EXCEPTION grammar option.]]></short-description>
-        <description><![CDATA[
-          Sets the VISITOR_EXCEPTION grammar option.
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="jpcoverage" category="metrics"
-      classname="org.apache.tools.ant.taskdefs.optional.sitraka.Coverage"
-      >
-
-  <short-description><![CDATA[Runs Sitraka JProbe Coverage.]]></short-description>
-  <description>
-    <![CDATA[Runs Sitraka JProbe Coverage.
-
- Options are pretty numerous, you'd better check the manual for a full
- descriptions of options. (not that simple since they differ from the online
- help, from the usage command line and from the examples...)
- <p>
- For additional information, visit <a href="http://www.sitraka.com">www.sitraka.com</a>]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="applet" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[If true, run an applet.]]></short-description>
-        <description><![CDATA[
-          If true, run an applet.
-        ]]></description>
-      </attribute>
-      <attribute name="classname" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Classname to run as standalone or runner for filesets.]]></short-description>
-        <description><![CDATA[
-          classname to run as standalone or runner for filesets.
-        ]]></description>
-      </attribute>
-      <attribute name="exitprompt" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Toggles display of the console prompt: always, error, never.]]></short-description>
-        <description><![CDATA[
-          Toggles display of the console prompt: always, error, never
-        ]]></description>
-      </attribute>
-      <attribute name="finalsnapshot" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Type of snapshot to send at program termination: none, coverage, all.]]></short-description>
-        <description><![CDATA[
-          Type of snapshot to send at program termination: none, coverage, all.
- Can be null, default to none
-        ]]></description>
-      </attribute>
-      <attribute name="home" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[The directory where JProbe is installed.]]></short-description>
-        <description><![CDATA[
-          The directory where JProbe is installed.
-        ]]></description>
-      </attribute>
-      <attribute name="javaexe" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[Path to the java executable.]]></short-description>
-        <description><![CDATA[
-          Path to the java executable.
-        ]]></description>
-      </attribute>
-      <attribute name="recordfromstart" type="org.apache.tools.ant.taskdefs.optional.sitraka.Coverage.Recordfromstart"
-                 briefType="&quot;coverage&quot;, &quot;none&quot;, &quot;all&quot;" required="NOTDEFINED">
-        <short-description><![CDATA["all", "coverage",  or "none".]]></short-description>
-        <description><![CDATA[
-          "all", "coverage",  or "none".
-        ]]></description>
-      </attribute>
-      <attribute name="seedname" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Seed name for snapshot file.]]></short-description>
-        <description><![CDATA[
-          seed name for snapshot file. Can be null, default to snap
-        ]]></description>
-      </attribute>
-      <attribute name="snapshotdir" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[The path to the directory where snapshot files are stored.]]></short-description>
-        <description><![CDATA[
-          The path to the directory where snapshot files are stored.
- Choose a directory that is reachable by both the remote
- and local computers, and enter the same path on the command-line
- and in the viewer.
-        ]]></description>
-      </attribute>
-      <attribute name="tracknatives" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[If true, track native methods.]]></short-description>
-        <description><![CDATA[
-          If true, track native methods.
-        ]]></description>
-      </attribute>
-      <attribute name="vm" type="org.apache.tools.ant.taskdefs.optional.sitraka.Coverage.Javavm"
-                 briefType="&quot;java2&quot;, &quot;jdk118&quot;, &quot;jdk117&quot;" required="NOTDEFINED">
-        <short-description><![CDATA[Indicates which virtual machine to run: "jdk117", "jdk118" or "java2".]]></short-description>
-        <description><![CDATA[
-          Indicates which virtual machine to run: "jdk117", "jdk118" or "java2".
- Can be null, default to "java2".
-        ]]></description>
-      </attribute>
-      <attribute name="warnlevel" type="java.lang.Integer"
-                 briefType="int" required="NOTDEFINED">
-        <short-description><![CDATA[Set warning level (0-3, where 0 is the least amount of warnings).]]></short-description>
-        <description><![CDATA[
-          Set warning level (0-3, where 0 is the least amount of warnings).
-        ]]></description>
-      </attribute>
-      <attribute name="workingdir" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[The physical path to the working directory for the VM.]]></short-description>
-        <description><![CDATA[
-          The physical path to the working directory for the VM.
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-      <element name="fileset" type="org.apache.tools.ant.types.FileSet"
-               briefType="Fileset"
-               required="NOTDEFINED">
-        <short-description><![CDATA[The classnames to execute.]]></short-description>
-        <description>
-          <![CDATA[the classnames to execute.]]>
-        </description>
-      </element>
-
-      <element name="arg" type="org.apache.tools.ant.types.Commandline.Argument"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[Adds a command argument.]]></short-description>
-        <description>
-          <![CDATA[Adds a command argument.]]>
-        </description>
-      </element>
-
-      <element name="classpath" type="org.apache.tools.ant.types.Path"
-               briefType="Path"
-               required="NOTDEFINED">
-        <short-description><![CDATA[Classpath to run the files.]]></short-description>
-        <description>
-          <![CDATA[classpath to run the files.]]>
-        </description>
-      </element>
-
-      <element name="filters" type="org.apache.tools.ant.taskdefs.optional.sitraka.Filters"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[Defines class/method filters based on pattern matching.]]></short-description>
-        <description>
-          <![CDATA[Defines class/method filters based on pattern matching.
- The syntax is filters is similar to a fileset.]]>
-        </description>
-      </element>
-
-      <element name="jvmarg" type="org.apache.tools.ant.types.Commandline.Argument"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[Adds a JVM argument.]]></short-description>
-        <description>
-          <![CDATA[Adds a JVM argument.]]>
-        </description>
-      </element>
-
-      <element name="socket" type="org.apache.tools.ant.taskdefs.optional.sitraka.Socket"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[Define a host and port to connect to if you want to do
- remote viewing.]]></short-description>
-        <description>
-          <![CDATA[Define a host and port to connect to if you want to do
- remote viewing.]]>
-        </description>
-      </element>
-
-      <element name="triggers" type="org.apache.tools.ant.taskdefs.optional.sitraka.Triggers"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[Defines events to use for interacting with the
- collection of data performed during coverage.]]></short-description>
-        <description>
-          <![CDATA[Defines events to use for interacting with the
- collection of data performed during coverage.
-
- For example you may run a whole application but only decide
- to collect data once it reaches a certain method and once it
- exits another one.]]>
-        </description>
-      </element>
-
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="jpcovmerge" category="metrics"
-      classname="org.apache.tools.ant.taskdefs.optional.sitraka.CovMerge"
-      >
-
-  <short-description><![CDATA[Runs the snapshot merge utility for JProbe Coverage.]]></short-description>
-  <description>
-    <![CDATA[Runs the snapshot merge utility for JProbe Coverage.]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="home" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[The directory where JProbe is installed.]]></short-description>
-        <description><![CDATA[
-          The directory where JProbe is installed.
-        ]]></description>
-      </attribute>
-      <attribute name="tofile" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[Output snapshot file.]]></short-description>
-        <description><![CDATA[
-          Set the output snapshot file.
-        ]]></description>
-      </attribute>
-      <attribute name="verbose" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[If true, perform the merge in verbose mode giving details
- about the snapshot processing.]]></short-description>
-        <description><![CDATA[
-          If true, perform the merge in verbose mode giving details
- about the snapshot processing.
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-      <element name="fileset" type="org.apache.tools.ant.types.FileSet"
-               briefType="Fileset"
-               required="NOTDEFINED">
-        <short-description><![CDATA[Add a fileset containing the snapshots to include.]]></short-description>
-        <description>
-          <![CDATA[add a fileset containing the snapshots to include.]]>
-        </description>
-      </element>
-
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="jpcovreport" category="metrics"
-      classname="org.apache.tools.ant.taskdefs.optional.sitraka.CovReport"
-      >
-
-  <short-description><![CDATA[Runs the JProbe Coverage 3.0 snapshot merge utility.]]></short-description>
-  <description>
-    <![CDATA[Runs the JProbe Coverage 3.0 snapshot merge utility.]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="format" type="org.apache.tools.ant.taskdefs.optional.sitraka.CovReport.ReportFormat"
-                 briefType="&quot;html&quot;, &quot;text&quot;, &quot;xml&quot;" required="NOTDEFINED">
-        <short-description><![CDATA[Format of the report: "html", "text", or "xml".]]></short-description>
-        <description><![CDATA[
-          set the format of the report: "html", "text", or "xml"
-        ]]></description>
-      </attribute>
-      <attribute name="home" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[The directory where JProbe is installed.]]></short-description>
-        <description><![CDATA[
-          The directory where JProbe is installed.
-        ]]></description>
-      </attribute>
-      <attribute name="includesource" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[If true, include text of the source code lines.]]></short-description>
-        <description><![CDATA[
-          If true, include text of the source code lines.
- Only applies to format="xml" and type="verydetailed"
-        ]]></description>
-      </attribute>
-      <attribute name="percent" type="java.lang.Integer"
-                 briefType="int" required="NOTDEFINED">
-        <short-description><![CDATA[A numeric value for the threshold for printing methods.]]></short-description>
-        <description><![CDATA[
-          A numeric value for the threshold for printing methods.
- Must be between 0 and 100.
-        ]]></description>
-      </attribute>
-      <attribute name="snapshot" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[The name of the snapshot file that is the source to the report.]]></short-description>
-        <description><![CDATA[
-          The name of the snapshot file that is the source to the report.
-        ]]></description>
-      </attribute>
-      <attribute name="tofile" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[The name of the generated output file.]]></short-description>
-        <description><![CDATA[
-          The name of the generated output file.
-        ]]></description>
-      </attribute>
-      <attribute name="type" type="org.apache.tools.ant.taskdefs.optional.sitraka.CovReport.ReportType"
-                 briefType="&quot;executive&quot;, &quot;summary&quot;, &quot;detailed&quot;, &quot;verydetailed&quot;" required="NOTDEFINED">
-        <short-description><![CDATA[The type of report to be generated: "executive", "summary",
- "detailed" or "verydetailed".]]></short-description>
-        <description><![CDATA[
-          The type of report to be generated: "executive", "summary",
- "detailed" or "verydetailed".
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-      <element name="reference" type="org.apache.tools.ant.taskdefs.optional.sitraka.CovReport.Reference"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[Adds a set of classes whose coverage information will be
- checked against.]]></short-description>
-        <description>
-          <![CDATA[Adds a set of classes whose coverage information will be
- checked against.]]>
-        </description>
-      </element>
-
-      <element name="sourcepath" type="org.apache.tools.ant.types.Path"
-               briefType="Path"
-               required="NOTDEFINED">
-        <short-description><![CDATA[Adds a path to source files.]]></short-description>
-        <description>
-          <![CDATA[Adds a path to source files.]]>
-        </description>
-      </element>
-
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="jspc" category="other"
-      classname="org.apache.tools.ant.taskdefs.optional.jsp.JspC"
-      matchingTask="true">
-
-  <short-description><![CDATA[Runs a JSP compiler.]]></short-description>
-  <description>
-    <![CDATA[Runs a JSP compiler.
-
- <p> This task takes the given jsp files and compiles them into java
- files. It is then up to the user to compile the java files into classes.
-
- <p> The task requires the srcdir and destdir attributes to be
- set. This Task is a MatchingTask, so the files to be compiled can be
- specified using includes/excludes attributes or nested include/exclude
- elements. Optional attributes are verbose (set the verbosity level passed
- to jasper), package (name of the destination package for generated java
- classes and classpath (the classpath to use when running the jsp
- compiler).
- <p> This task supports the nested elements classpath (A Path) and
- classpathref (A Reference) which can be used in preference to the
- attribute classpath, if the jsp compiler is not already in the ant
- classpath.
-
- <p><h4>Usage</h4>
- <pre>
- &lt;jspc srcdir="${basedir}/src/war"
-       destdir="${basedir}/gensrc"
-       package="com.i3sp.jsp"
-       verbose="9"&gt;
-   &lt;include name="**\/*.jsp" /&gt;
- &lt;/jspc&gt;
- </pre>]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="classpath" type="org.apache.tools.ant.types.Path"
-                 briefType="Path" required="NOTDEFINED">
-        <short-description><![CDATA[Classpath to be used for this compilation.]]></short-description>
-        <description><![CDATA[
-          Set the classpath to be used for this compilation.
-        ]]></description>
-      </attribute>
-      <attribute name="classpathref" type="org.apache.tools.ant.types.Reference"
-                 briefType="Reference" required="NOTDEFINED">
-        <short-description><![CDATA[Adds a reference to a classpath defined elsewhere.]]></short-description>
-        <description><![CDATA[
-          Adds a reference to a classpath defined elsewhere
-        ]]></description>
-      </attribute>
-      <attribute name="compiler" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Class name of a JSP compiler adapter.]]></short-description>
-        <description><![CDATA[
-          Class name of a JSP compiler adapter.
-        ]]></description>
-      </attribute>
-      <attribute name="compilerclasspath" type="org.apache.tools.ant.types.Path"
-                 briefType="Path" required="NOTDEFINED">
-        <short-description><![CDATA[Classpath to be used to find this compiler adapter.]]></short-description>
-        <description><![CDATA[
-          Set the classpath to be used to find this compiler adapter
-        ]]></description>
-      </attribute>
-      <attribute name="destdir" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[Destination directory into which the JSP source
- files should be compiled.]]></short-description>
-        <description><![CDATA[
-          Set the destination directory into which the JSP source
- files should be compiled.
-        ]]></description>
-      </attribute>
-      <attribute name="failonerror" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Whether or not the build should halt if compilation fails.]]></short-description>
-        <description><![CDATA[
-          Whether or not the build should halt if compilation fails.
- Defaults to <code>true</code>.
-        ]]></description>
-      </attribute>
-      <attribute name="ieplugin" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Java Plugin CLASSID for Internet Explorer.]]></short-description>
-        <description><![CDATA[
-          Java Plugin CLASSID for Internet Explorer
-        ]]></description>
-      </attribute>
-      <attribute name="mapped" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[If true, generate separate write() calls for each HTML line
- in the JSP.]]></short-description>
-        <description><![CDATA[
-          If true, generate separate write() calls for each HTML line
- in the JSP.
-        ]]></description>
-      </attribute>
-      <attribute name="package" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Name of the package the compiled jsp files should be in.]]></short-description>
-        <description><![CDATA[
-          Set the name of the package the compiled jsp files should be in.
-        ]]></description>
-      </attribute>
-      <attribute name="srcdir" type="org.apache.tools.ant.types.Path"
-                 briefType="Path" required="NOTDEFINED">
-        <short-description><![CDATA[Path for source JSP files.]]></short-description>
-        <description><![CDATA[
-          Path for source JSP files.
-        ]]></description>
-      </attribute>
-      <attribute name="uribase" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[The URI context of relative URI references in the JSP pages.]]></short-description>
-        <description><![CDATA[
-          The URI context of relative URI references in the JSP pages.
- If it does not exist then it is derived from the location
- of the file relative to the declared or derived value of uriroot.
-        ]]></description>
-      </attribute>
-      <attribute name="uriroot" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[The root directory that uri files should be resolved
-  against.]]></short-description>
-        <description><![CDATA[
-          The root directory that uri files should be resolved
-  against. (Default is the directory jspc is invoked from)
-        ]]></description>
-      </attribute>
-      <attribute name="verbose" type="int"
-                 briefType="int" required="NOTDEFINED">
-        <short-description><![CDATA[Verbose level of the compiler.]]></short-description>
-        <description><![CDATA[
-          Set the verbose level of the compiler
-        ]]></description>
-      </attribute>
-      <attribute name="webinc" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[Output filename for the fraction of web.xml that lists
-  servlets.]]></short-description>
-        <description><![CDATA[
-          output filename for the fraction of web.xml that lists
-  servlets.
-        ]]></description>
-      </attribute>
-      <attribute name="webxml" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[Filename for web.xml.]]></short-description>
-        <description><![CDATA[
-          Filename for web.xml.
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-      <element name="webapp" type="org.apache.tools.ant.taskdefs.optional.jsp.JspC.WebAppParameter"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[Adds a single webapp.]]></short-description>
-        <description>
-          <![CDATA[Adds a single webapp.]]>
-        </description>
-      </element>
-
-      <element name="classpath" type="org.apache.tools.ant.types.Path"
-               briefType="Path"
-               required="NOTDEFINED">
-        <short-description><![CDATA[Adds a path to the classpath.]]></short-description>
-        <description>
-          <![CDATA[Adds a path to the classpath.]]>
-        </description>
-      </element>
-
-      <element name="compilerclasspath" type="org.apache.tools.ant.types.Path"
-               briefType="Path"
-               required="NOTDEFINED">
-        <short-description><![CDATA[Support nested compiler classpath, used to locate compiler adapter.]]></short-description>
-        <description>
-          <![CDATA[Support nested compiler classpath, used to locate compiler adapter]]>
-        </description>
-      </element>
-
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="junit" category="other"
-      classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTask"
-      >
-
-  <short-description><![CDATA[Runs JUnit tests.]]></short-description>
-  <description>
-    <![CDATA[Runs JUnit tests.
-
- <p> JUnit is a framework to create unit test. It has been initially
- created by Erich Gamma and Kent Beck.  JUnit can be found at <a
- href="http://www.junit.org">http://www.junit.org</a>.
-
- <p> <code>JUnitTask</code> can run a single specific
- <code>JUnitTest</code> using the <code>test</code> element.</p>
- For example, the following target <code><pre>
-   &lt;target name="test-int-chars" depends="jar-test"&gt;
-       &lt;echo message="testing international characters"/&gt;
-       &lt;junit printsummary="no" haltonfailure="yes" fork="false"&gt;
-           &lt;classpath refid="classpath"/&gt;
-           &lt;formatter type="plain" usefile="false" /&gt;
-           &lt;test name="org.apache.ecs.InternationalCharTest" /&gt;
-       &lt;/junit&gt;
-   &lt;/target&gt;
- </pre></code>
- <p>runs a single junit test
- (<code>org.apache.ecs.InternationalCharTest</code>) in the current
- VM using the path with id <code>classpath</code> as classpath and
- presents the results formatted using the standard
- <code>plain</code> formatter on the command line.</p>
-
- <p> This task can also run batches of tests.  The
- <code>batchtest</code> element creates a <code>BatchTest</code>
- based on a fileset.  This allows, for example, all classes found in
- directory to be run as testcases.</p>
-
- <p>For example,</p><code><pre>
- &lt;target name="run-tests" depends="dump-info,compile-tests" if="junit.present"&gt;
-   &lt;junit printsummary="no" haltonfailure="yes" fork="${junit.fork}"&gt;
-     &lt;jvmarg value="-classic"/&gt;
-     &lt;classpath refid="tests-classpath"/&gt;
-     &lt;sysproperty key="build.tests" value="${build.tests}"/&gt;
-     &lt;formatter type="brief" usefile="false" /&gt;
-     &lt;batchtest&gt;
-       &lt;fileset dir="${tests.dir}"&gt;
-         &lt;include name="**&#047;*Test*" /&gt;
-       &lt;/fileset&gt;
-     &lt;/batchtest&gt;
-   &lt;/junit&gt;
- &lt;/target&gt;
- </pre></code>
- <p>this target finds any classes with a <code>test</code> directory
- anywhere in their path (under the top <code>${tests.dir}</code>, of
- course) and creates <code>JUnitTest</code>'s for each one.</p>
-
- <p> Of course, <code>&lt;junit&gt;</code> and
- <code>&lt;batch&gt;</code> elements can be combined for more
- complex tests. For an example, see the ant <code>build.xml</code>
- target <code>run-tests</code> (the second example is an edited
- version).</p>
-
- <p> To spawn a new Java VM to prevent interferences between
- different testcases, you need to enable <code>fork</code>.  A
- number of attributes and elements allow you to set up how this JVM
- runs.]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="dir" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[The directory to invoke the VM in.]]></short-description>
-        <description><![CDATA[
-          The directory to invoke the VM in. Ignored if no JVM is forked.
-        ]]></description>
-      </attribute>
-      <attribute name="errorproperty" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Property to set to "true" if there is a error in a test.]]></short-description>
-        <description><![CDATA[
-          Property to set to "true" if there is a error in a test.
-
- <p>This property is applied on all BatchTest (batchtest) and
- JUnitTest (test), however, it can possibly be overriden by
- their own properties.</p>
-        ]]></description>
-      </attribute>
-      <attribute name="failureproperty" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Property to set to "true" if there is a failure in a test.]]></short-description>
-        <description><![CDATA[
-          Property to set to "true" if there is a failure in a test.
-
- <p>This property is applied on all BatchTest (batchtest) and
- JUnitTest (test), however, it can possibly be overriden by
- their own properties.</p>
-        ]]></description>
-      </attribute>
-      <attribute name="filtertrace" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[If true, smartly filter the stack frames of
- JUnit errors and failures before reporting them.]]></short-description>
-        <description><![CDATA[
-          If true, smartly filter the stack frames of
- JUnit errors and failures before reporting them.
-
- <p>This property is applied on all BatchTest (batchtest) and
- JUnitTest (test) however it can possibly be overridden by their
- own properties.</p>
-        ]]></description>
-      </attribute>
-      <attribute name="fork" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[If true, JVM should be forked for each test.]]></short-description>
-        <description><![CDATA[
-          If true, JVM should be forked for each test.
-
- <p>It avoids interference between testcases and possibly avoids
- hanging the build.  this property is applied on all BatchTest
- (batchtest) and JUnitTest (test) however it can possibly be
- overridden by their own properties.</p>
-        ]]></description>
-      </attribute>
-      <attribute name="haltonerror" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[If true, stop the build process when there is an error in a test.]]></short-description>
-        <description><![CDATA[
-          If true, stop the build process when there is an error in a test.
- This property is applied on all BatchTest (batchtest) and JUnitTest
- (test) however it can possibly be overridden by their own
- properties.
-        ]]></description>
-      </attribute>
-      <attribute name="haltonfailure" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[If true, stop the build process if a test fails
- (errors are considered failures as well).]]></short-description>
-        <description><![CDATA[
-          If true, stop the build process if a test fails
- (errors are considered failures as well).
- This property is applied on all BatchTest (batchtest) and
- JUnitTest (test) however it can possibly be overridden by their
- own properties.
-        ]]></description>
-      </attribute>
-      <attribute name="includeantruntime" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[If true, include ant.jar, optional.jar and junit.jar in the forked VM.]]></short-description>
-        <description><![CDATA[
-          If true, include ant.jar, optional.jar and junit.jar in the forked VM.
-        ]]></description>
-      </attribute>
-      <attribute name="jvm" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[The command used to invoke the Java Virtual Machine,
- default is 'java'.]]></short-description>
-        <description><![CDATA[
-          The command used to invoke the Java Virtual Machine,
- default is 'java'. The command is resolved by
- java.lang.Runtime.exec(). Ignored if fork is disabled.
-        ]]></description>
-      </attribute>
-      <attribute name="maxmemory" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Maximum memory to be used by all forked JVMs.]]></short-description>
-        <description><![CDATA[
-          Set the maximum memory to be used by all forked JVMs.
-        ]]></description>
-      </attribute>
-      <attribute name="newenvironment" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[If true, use a new environment when forked.]]></short-description>
-        <description><![CDATA[
-          If true, use a new environment when forked.
-
- <p>Will be ignored if we are not forking a new VM.</p>
-        ]]></description>
-      </attribute>
-      <attribute name="printsummary" type="org.apache.tools.ant.taskdefs.optional.junit.JUnitTask.SummaryAttribute"
-                 briefType="&quot;true&quot;, &quot;yes&quot;, &quot;false&quot;, &quot;no&quot;, &quot;on&quot;, &quot;off&quot;, &quot;withOutAndErr&quot;" required="NOTDEFINED">
-        <short-description><![CDATA[If true, print one-line statistics for each test, or "withOutAndErr"
- to also show standard output and error.]]></short-description>
-        <description><![CDATA[
-          If true, print one-line statistics for each test, or "withOutAndErr"
- to also show standard output and error.
-
- Can take the values on, off, and withOutAndErr.
-        ]]></description>
-      </attribute>
-      <attribute name="showoutput" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[If true, send any output generated by tests to Ant's logging system
- as well as to the formatters.]]></short-description>
-        <description><![CDATA[
-          If true, send any output generated by tests to Ant's logging system
- as well as to the formatters.
- By default only the formatters receive the output.
-
- <p>Output will always be passed to the formatters and not by
- shown by default.  This option should for example be set for
- tests that are interactive and prompt the user to do
- something.</p>
-        ]]></description>
-      </attribute>
-      <attribute name="timeout" type="java.lang.Integer"
-                 briefType="int" required="NOTDEFINED">
-        <short-description><![CDATA[Timeout value (in milliseconds).]]></short-description>
-        <description><![CDATA[
-          Set the timeout value (in milliseconds).
-
- <p>If the test is running for more than this value, the test
- will be canceled. (works only when in 'fork' mode).</p>
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-      <element name="env" type="org.apache.tools.ant.types.Environment.Variable"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[Adds an environment variable; used when forking.]]></short-description>
-        <description>
-          <![CDATA[Adds an environment variable; used when forking.
-
- <p>Will be ignored if we are not forking a new VM.</p>]]>
-        </description>
-      </element>
-
-      <element name="formatter" type="org.apache.tools.ant.taskdefs.optional.junit.FormatterElement"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[Add a new formatter to all tests of this task.]]></short-description>
-        <description>
-          <![CDATA[Add a new formatter to all tests of this task.]]>
-        </description>
-      </element>
-
-      <element name="sysproperty" type="org.apache.tools.ant.types.Environment.Variable"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[Adds a system property that tests can access.]]></short-description>
-        <description>
-          <![CDATA[Adds a system property that tests can access.
- This might be useful to tranfer Ant properties to the
- testcases when JVM forking is not enabled.]]>
-        </description>
-      </element>
-
-      <element name="test" type="org.apache.tools.ant.taskdefs.optional.junit.JUnitTest"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[Add a new single testcase.]]></short-description>
-        <description>
-          <![CDATA[Add a new single testcase.]]>
-        </description>
-      </element>
-
-      <element name="batchtest" type="org.apache.tools.ant.taskdefs.optional.junit.BatchTest"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[Adds a set of tests based on pattern matching.]]></short-description>
-        <description>
-          <![CDATA[Adds a set of tests based on pattern matching.]]>
-        </description>
-      </element>
-
-      <element name="classpath" type="org.apache.tools.ant.types.Path"
-               briefType="Path"
-               required="NOTDEFINED">
-        <short-description><![CDATA[Adds path to classpath used for tests.]]></short-description>
-        <description>
-          <![CDATA[Adds path to classpath used for tests.]]>
-        </description>
-      </element>
-
-      <element name="jvmarg" type="org.apache.tools.ant.types.Commandline.Argument"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[Adds a JVM argument; ignored if not forking.]]></short-description>
-        <description>
-          <![CDATA[Adds a JVM argument; ignored if not forking.]]>
-        </description>
-      </element>
-
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="junitreport" category="testing"
-      classname="org.apache.tools.ant.taskdefs.optional.junit.XMLResultAggregator"
-      >
-
-  <short-description><![CDATA[Aggregates all &lt;junit&gt; XML formatter testsuite data under a specific directory and transforms the results via XSLT.]]></short-description>
-  <description>
-    <![CDATA[Aggregates all &lt;junit&gt; XML formatter testsuite data under
- a specific directory and transforms the results via XSLT.
- It is not particulary clean but
- should be helpful while I am thinking about another technique.
-
- <p> The main problem is due to the fact that a JVM can be forked for a testcase
- thus making it impossible to aggregate all testcases since the listener is
- (obviously) in the forked JVM. A solution could be to write a
- TestListener that will receive events from the TestRunner via sockets. This
- is IMHO the simplest way to do it to avoid this file hacking thing.]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="todir" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[Destination directory where the results should be written.]]></short-description>
-        <description><![CDATA[
-          Set the destination directory where the results should be written. If not
- set if will use {@link #DEFAULT_DIR}. When given a relative directory
- it will resolve it from the project directory.
-        ]]></description>
-      </attribute>
-      <attribute name="tofile" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Name of the aggregegated results file.]]></short-description>
-        <description><![CDATA[
-          Set the name of the aggregegated results file. It must be relative
- from the <tt>todir</tt> attribute. If not set it will use {@link #DEFAULT_FILENAME}
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-      <element name="fileset" type="org.apache.tools.ant.types.FileSet"
-               briefType="Fileset"
-               required="NOTDEFINED">
-        <short-description><![CDATA[Add a new fileset containing the XML results to aggregate.]]></short-description>
-        <description>
-          <![CDATA[Add a new fileset containing the XML results to aggregate]]>
-        </description>
-      </element>
-
-      <element name="report" type="org.apache.tools.ant.taskdefs.optional.junit.AggregateTransformer"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[Generate a report based on the document created by the merge.]]></short-description>
-        <description>
-          <![CDATA[Generate a report based on the document created by the merge.]]>
-        </description>
-      </element>
-
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="keysubst" category="other"
-      classname="org.apache.tools.ant.taskdefs.KeySubst"
-      deprecated="true"
-      >
-
-  <short-description><![CDATA[Keyword substitution.]]></short-description>
-  <description>
-    <![CDATA[Keyword substitution. Input file is written to output file.
- Do not make input file same as output file.
- Keywords in input files look like this: @foo@. See the docs for the 
- setKeys method to understand how to do the substitutions.]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="dest" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[Destination file.]]></short-description>
-        <description><![CDATA[
-          Set the destination file.
-        ]]></description>
-      </attribute>
-      <attribute name="keys" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Keys.]]></short-description>
-        <description><![CDATA[
-          Sets the keys.
-Format string is like this:
-<p>
-name=value*name2=value
-<p>
-Names are case sensitive.
-<p>
-Use the setSep() method to change the * to something else
-if you need to use * as a name or value.
-        ]]></description>
-      </attribute>
-      <attribute name="sep" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Seperator between name=value arguments
-in setKeys().]]></short-description>
-        <description><![CDATA[
-          Sets the seperator between name=value arguments
-in setKeys(). By default it is "*".
-        ]]></description>
-      </attribute>
-      <attribute name="src" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[Source file.]]></short-description>
-        <description><![CDATA[
-          Set the source file.
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="loadfile" category="utility"
-      classname="org.apache.tools.ant.taskdefs.LoadFile"
-      >
-
-  <short-description><![CDATA[Load a file into a property]]></short-description>
-  <description>
-    <![CDATA[Load a file into a property]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="encoding" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Encoding to use for input, defaults to the platform's default
- encoding.]]></short-description>
-        <description><![CDATA[
-          Encoding to use for input, defaults to the platform's default
- encoding. <p>
-
- For a list of possible values see <a href="http://java.sun.com/products/jdk/1.2/docs/guide/internat/encoding.doc.html">
- http://java.sun.com/products/jdk/1.2/docs/guide/internat/encoding.doc.html
- </a>.</p>
-        ]]></description>
-      </attribute>
-      <attribute name="failonerror" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[If true, fail on load error.]]></short-description>
-        <description><![CDATA[
-          If true, fail on load error.
-        ]]></description>
-      </attribute>
-      <attribute name="property" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Property name to save to.]]></short-description>
-        <description><![CDATA[
-          Property name to save to.
-        ]]></description>
-      </attribute>
-      <attribute name="srcfile" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[File to load.]]></short-description>
-        <description><![CDATA[
-          Sets the file to load.
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-      <element name="filterchain" type="org.apache.tools.ant.types.FilterChain"
-               briefType="FilterChain"
-               required="NOTDEFINED">
-        <short-description><![CDATA[Add the FilterChain element.]]></short-description>
-        <description>
-          <![CDATA[Add the FilterChain element.]]>
-        </description>
-      </element>
-
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="loadproperties" category="utility"
-      classname="org.apache.tools.ant.taskdefs.LoadProperties"
-      >
-
-  <short-description><![CDATA[Load a file's contents as Ant properties.]]></short-description>
-  <description>
-    <![CDATA[Load a file's contents as Ant properties.]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="srcfile" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[File to load.]]></short-description>
-        <description><![CDATA[
-          Sets the file to load.
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-      <element name="filterchain" type="org.apache.tools.ant.types.FilterChain"
-               briefType="FilterChain"
-               required="NOTDEFINED">
-        <short-description><![CDATA[Adds a FilterChain.]]></short-description>
-        <description>
-          <![CDATA[Adds a FilterChain.]]>
-        </description>
-      </element>
-
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="mail" category="network"
-      classname="org.apache.tools.ant.taskdefs.email.EmailTask"
-      >
-
-  <short-description><![CDATA[A task to send SMTP email.]]></short-description>
-  <description>
-    <![CDATA[A task to send SMTP email. This is a refactoring of the SendMail and
- MimeMail tasks such that both are within a single task.]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="bcclist" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Adds "bcc" address elements.]]></short-description>
-        <description><![CDATA[
-          Adds "bcc" address elements
-        ]]></description>
-      </attribute>
-      <attribute name="cclist" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Adds "cc" address elements.]]></short-description>
-        <description><![CDATA[
-          Adds "cc" address elements
-        ]]></description>
-      </attribute>
-      <attribute name="encoding" type="org.apache.tools.ant.taskdefs.email.EmailTask.Encoding"
-                 briefType="&quot;auto&quot;, &quot;mime&quot;, &quot;uu&quot;, &quot;plain&quot;" required="NOTDEFINED">
-        <short-description><![CDATA[Allows the build writer to choose the preferred encoding method.]]></short-description>
-        <description><![CDATA[
-          Allows the build writer to choose the preferred encoding method
-        ]]></description>
-      </attribute>
-      <attribute name="failonerror" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Indicates whether BuildExceptions should be passed back to the core.]]></short-description>
-        <description><![CDATA[
-          Indicates whether BuildExceptions should be passed back to the core
-        ]]></description>
-      </attribute>
-      <attribute name="files" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Adds a list of files to be attached.]]></short-description>
-        <description><![CDATA[
-          Adds a list of files to be attached
-        ]]></description>
-      </attribute>
-      <attribute name="from" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Shorthand to set the from address element.]]></short-description>
-        <description><![CDATA[
-          Shorthand to set the from address element
-        ]]></description>
-      </attribute>
-      <attribute name="includefilenames" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Sets Includefilenames attribute.]]></short-description>
-        <description><![CDATA[
-          Sets Includefilenames attribute
-        ]]></description>
-      </attribute>
-      <attribute name="mailhost" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Host.]]></short-description>
-        <description><![CDATA[
-          Sets the host
-        ]]></description>
-      </attribute>
-      <attribute name="mailport" type="int"
-                 briefType="int" required="NOTDEFINED">
-        <short-description><![CDATA[Mail server port.]]></short-description>
-        <description><![CDATA[
-          Sets the mail server port
-        ]]></description>
-      </attribute>
-      <attribute name="message" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Shorthand method to set the message.]]></short-description>
-        <description><![CDATA[
-          Shorthand method to set the message
-        ]]></description>
-      </attribute>
-      <attribute name="messagefile" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[Shorthand method to set the message from a file.]]></short-description>
-        <description><![CDATA[
-          Shorthand method to set the message from a file
-        ]]></description>
-      </attribute>
-      <attribute name="messagemimetype" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Shorthand method to set type of the text message, text/plain by default
- but text/html or text/xml is quite feasible.]]></short-description>
-        <description><![CDATA[
-          Shorthand method to set type of the text message, text/plain by default
- but text/html or text/xml is quite feasible.
-        ]]></description>
-      </attribute>
-      <attribute name="subject" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Subject line of the email.]]></short-description>
-        <description><![CDATA[
-          Sets the subject line of the email
-        ]]></description>
-      </attribute>
-      <attribute name="tolist" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Adds "to" address elements.]]></short-description>
-        <description><![CDATA[
-          Adds "to" address elements
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-      <element name="bcc" type="org.apache.tools.ant.taskdefs.email.EmailAddress"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[Adds "bcc" address elements.]]></short-description>
-        <description>
-          <![CDATA[Adds "bcc" address elements]]>
-        </description>
-      </element>
-
-      <element name="cc" type="org.apache.tools.ant.taskdefs.email.EmailAddress"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[Adds "cc" address element.]]></short-description>
-        <description>
-          <![CDATA[Adds "cc" address element]]>
-        </description>
-      </element>
-
-      <element name="fileset" type="org.apache.tools.ant.types.FileSet"
-               briefType="Fileset"
-               required="NOTDEFINED">
-        <short-description><![CDATA[Adds a set of files (nested fileset attribute).]]></short-description>
-        <description>
-          <![CDATA[Adds a set of files (nested fileset attribute).]]>
-        </description>
-      </element>
-
-      <element name="from" type="org.apache.tools.ant.taskdefs.email.EmailAddress"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[Adds a from address element.]]></short-description>
-        <description>
-          <![CDATA[Adds a from address element]]>
-        </description>
-      </element>
-
-      <element name="message" type="org.apache.tools.ant.taskdefs.email.Message"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[Add a message elemnt.]]></short-description>
-        <description>
-          <![CDATA[Add a message elemnt]]>
-        </description>
-      </element>
-
-      <element name="to" type="org.apache.tools.ant.taskdefs.email.EmailAddress"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[Adds a to address element.]]></short-description>
-        <description>
-          <![CDATA[Adds a to address element]]>
-        </description>
-      </element>
-
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="manifest" category="java"
-      classname="org.apache.tools.ant.taskdefs.ManifestTask"
-      >
-
-  <short-description><![CDATA[Creates a manifest file for inclusion in a JAR, Ant task wrapper around]]></short-description>
-  <description>
-    <![CDATA[Creates a manifest file for inclusion in a JAR, Ant task wrapper
- around {@link Manifest Manifest}.  This task can be used to write a
- Manifest file, optionally replacing or updating an existing file.]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="file" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[The name of the manifest file to create/update.]]></short-description>
-        <description><![CDATA[
-          The name of the manifest file to create/update.
- Required if used as a task.
-        ]]></description>
-      </attribute>
-      <attribute name="mode" type="org.apache.tools.ant.taskdefs.ManifestTask.Mode"
-                 briefType="&quot;update&quot;, &quot;replace&quot;" required="NOTDEFINED">
-        <short-description><![CDATA[Update policy: either "update" or "replace"; default is "replace".]]></short-description>
-        <description><![CDATA[
-          Update policy: either "update" or "replace"; default is "replace".
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-      <element name="attribute" type="org.apache.tools.ant.taskdefs.Manifest.Attribute"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[Add an attribute to the manifest - it is added to the main section.]]></short-description>
-        <description>
-          <![CDATA[Add an attribute to the manifest - it is added to the main section.]]>
-        </description>
-      </element>
-
-      <element name="section" type="org.apache.tools.ant.taskdefs.Manifest.Section"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[Add a section to the manifest.]]></short-description>
-        <description>
-          <![CDATA[Add a section to the manifest]]>
-        </description>
-      </element>
-
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="maudit" category="other"
-      classname="org.apache.tools.ant.taskdefs.optional.metamata.MAudit"
-      >
-
-  <short-description><![CDATA[Invokes the Metamata Audit/ Webgain Quality Analyzer on a set of Java files.]]></short-description>
-  <description>
-    <![CDATA[Invokes the Metamata Audit/ Webgain Quality Analyzer on a set of Java files.
- <p>
- <i>maudit</i> performs static analysis of the Java source code and byte code files to find and report
- errors of style and potential problems related to performance, maintenance and robustness.
-  As a convenience, a stylesheet is given in <tt>etc</tt> directory, so that an HTML report 
- can be generated from the XML file.]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="fix" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Automatically fix certain errors 
- (those marked as fixable in the manual);
- optional, default=false.]]></short-description>
-        <description><![CDATA[
-          Automatically fix certain errors 
- (those marked as fixable in the manual);
- optional, default=false
-        ]]></description>
-      </attribute>
-      <attribute name="list" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Creates listing file for each audited file; optional, default false.]]></short-description>
-        <description><![CDATA[
-          Creates listing file for each audited file; optional, default false. 
- When set, a .maudit file will be generated in the
- same location as the source file.
-        ]]></description>
-      </attribute>
-      <attribute name="maxmemory" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Maximum memory for the JVM; optional.]]></short-description>
-        <description><![CDATA[
-          Set the maximum memory for the JVM; optional.
- -mx or -Xmx depending on VM version
-        ]]></description>
-      </attribute>
-      <attribute name="metamatahome" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[The home directory containing the Metamata distribution; required.]]></short-description>
-        <description><![CDATA[
-          The home directory containing the Metamata distribution; required
-        ]]></description>
-      </attribute>
-      <attribute name="tofile" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[The XML file to which the Audit result should be written to; required.]]></short-description>
-        <description><![CDATA[
-          The XML file to which the Audit result should be written to; required
-        ]]></description>
-      </attribute>
-      <attribute name="unused" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Finds declarations unused in search paths; optional, default false.]]></short-description>
-        <description><![CDATA[
-          Finds declarations unused in search paths; optional, default false. 
- It will look for unused global declarations
- in the source code within a use domain specified by the 
- <tt>searchpath</tt> element.
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-      <element name="fileset" type="org.apache.tools.ant.types.FileSet"
-               briefType="Fileset"
-               required="NOTDEFINED">
-        <short-description><![CDATA[The java files or directory to audit.]]></short-description>
-        <description>
-          <![CDATA[The java files or directory to audit.
- Whatever the filter is, only the files that end 
- with .java will be included for processing. 
- Note that the base directory used for the fileset 
- MUST be the root of the source files otherwise package names
- deduced from the file path will be incorrect.]]>
-        </description>
-      </element>
-
-      <element name="classpath" type="org.apache.tools.ant.types.Path"
-               briefType="Path"
-               required="NOTDEFINED">
-        <short-description><![CDATA[Class path (also source path unless one explicitly set).]]></short-description>
-        <description>
-          <![CDATA[Sets the class path (also source path unless one explicitly set).
- Overrides METAPATH/CLASSPATH environment variables.]]>
-        </description>
-      </element>
-
-      <element name="jvmarg" type="org.apache.tools.ant.types.Commandline.Argument"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[Additional optional parameters to pass to the JVM.]]></short-description>
-        <description>
-          <![CDATA[Additional optional parameters to pass to the JVM. 
- You can avoid using the  <code>&lt;jvmarg&gt;</code> by adding these empty 
- entries to <code>metamata.properties</code> located at <code>${metamata.home}/bin</code>
-
- <pre>metamata.classpath=
- metamata.sourcepath=
- metamata.baseclasspath=
- </pre>]]>
-        </description>
-      </element>
-
-      <element name="rulespath" type="org.apache.tools.ant.types.Path"
-               briefType="Path"
-               required="NOTDEFINED">
-        <short-description><![CDATA[Classpath for additional audit rules
- these must be placed before metamata.jar !!.]]></short-description>
-        <description>
-          <![CDATA[classpath for additional audit rules
- these must be placed before metamata.jar !!]]>
-        </description>
-      </element>
-
-      <element name="searchpath" type="org.apache.tools.ant.types.Path"
-               briefType="Path"
-               required="NOTDEFINED">
-        <short-description><![CDATA[Search path to use for unused global declarations; 
- required when <tt>unused</tt> is set.]]></short-description>
-        <description>
-          <![CDATA[search path to use for unused global declarations; 
- required when <tt>unused</tt> is set.]]>
-        </description>
-      </element>
-
-      <element name="sourcepath" type="org.apache.tools.ant.types.Path"
-               briefType="Path"
-               required="NOTDEFINED">
-        <short-description><![CDATA[Source path.]]></short-description>
-        <description>
-          <![CDATA[Sets the source path. 
- Overrides the SOURCEPATH environment variable.]]>
-        </description>
-      </element>
-
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="mimemail" category="other"
-      classname="org.apache.tools.ant.taskdefs.optional.net.MimeMail"
-      deprecated="true"
-      >
-
-  <short-description><![CDATA[A task to send SMTP email; Use <tt>mail</tt> instead]]></short-description>
-  <description>
-    <![CDATA[A task to send SMTP email; Use <tt>mail</tt> instead]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="bcclist" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Adds "bcc" address elements.]]></short-description>
-        <description><![CDATA[
-          Adds "bcc" address elements
-        ]]></description>
-      </attribute>
-      <attribute name="cclist" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Adds "cc" address elements.]]></short-description>
-        <description><![CDATA[
-          Adds "cc" address elements
-        ]]></description>
-      </attribute>
-      <attribute name="encoding" type="org.apache.tools.ant.taskdefs.email.EmailTask.Encoding"
-                 briefType="&quot;auto&quot;, &quot;mime&quot;, &quot;uu&quot;, &quot;plain&quot;" required="NOTDEFINED">
-        <short-description><![CDATA[Allows the build writer to choose the preferred encoding method.]]></short-description>
-        <description><![CDATA[
-          Allows the build writer to choose the preferred encoding method
-        ]]></description>
-      </attribute>
-      <attribute name="failonerror" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Indicates whether BuildExceptions should be passed back to the core.]]></short-description>
-        <description><![CDATA[
-          Indicates whether BuildExceptions should be passed back to the core
-        ]]></description>
-      </attribute>
-      <attribute name="files" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Adds a list of files to be attached.]]></short-description>
-        <description><![CDATA[
-          Adds a list of files to be attached
-        ]]></description>
-      </attribute>
-      <attribute name="from" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Shorthand to set the from address element.]]></short-description>
-        <description><![CDATA[
-          Shorthand to set the from address element
-        ]]></description>
-      </attribute>
-      <attribute name="includefilenames" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Sets Includefilenames attribute.]]></short-description>
-        <description><![CDATA[
-          Sets Includefilenames attribute
-        ]]></description>
-      </attribute>
-      <attribute name="mailhost" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Host.]]></short-description>
-        <description><![CDATA[
-          Sets the host
-        ]]></description>
-      </attribute>
-      <attribute name="mailport" type="int"
-                 briefType="int" required="NOTDEFINED">
-        <short-description><![CDATA[Mail server port.]]></short-description>
-        <description><![CDATA[
-          Sets the mail server port
-        ]]></description>
-      </attribute>
-      <attribute name="message" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Shorthand method to set the message.]]></short-description>
-        <description><![CDATA[
-          Shorthand method to set the message
-        ]]></description>
-      </attribute>
-      <attribute name="messagefile" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[Shorthand method to set the message from a file.]]></short-description>
-        <description><![CDATA[
-          Shorthand method to set the message from a file
-        ]]></description>
-      </attribute>
-      <attribute name="messagemimetype" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Shorthand method to set type of the text message, text/plain by default
- but text/html or text/xml is quite feasible.]]></short-description>
-        <description><![CDATA[
-          Shorthand method to set type of the text message, text/plain by default
- but text/html or text/xml is quite feasible.
-        ]]></description>
-      </attribute>
-      <attribute name="subject" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Subject line of the email.]]></short-description>
-        <description><![CDATA[
-          Sets the subject line of the email
-        ]]></description>
-      </attribute>
-      <attribute name="tolist" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Adds "to" address elements.]]></short-description>
-        <description><![CDATA[
-          Adds "to" address elements
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-      <element name="bcc" type="org.apache.tools.ant.taskdefs.email.EmailAddress"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[Adds "bcc" address elements.]]></short-description>
-        <description>
-          <![CDATA[Adds "bcc" address elements]]>
-        </description>
-      </element>
-
-      <element name="cc" type="org.apache.tools.ant.taskdefs.email.EmailAddress"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[Adds "cc" address element.]]></short-description>
-        <description>
-          <![CDATA[Adds "cc" address element]]>
-        </description>
-      </element>
-
-      <element name="fileset" type="org.apache.tools.ant.types.FileSet"
-               briefType="Fileset"
-               required="NOTDEFINED">
-        <short-description><![CDATA[Adds a set of files (nested fileset attribute).]]></short-description>
-        <description>
-          <![CDATA[Adds a set of files (nested fileset attribute).]]>
-        </description>
-      </element>
-
-      <element name="from" type="org.apache.tools.ant.taskdefs.email.EmailAddress"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[Adds a from address element.]]></short-description>
-        <description>
-          <![CDATA[Adds a from address element]]>
-        </description>
-      </element>
-
-      <element name="message" type="org.apache.tools.ant.taskdefs.email.Message"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[Add a message elemnt.]]></short-description>
-        <description>
-          <![CDATA[Add a message elemnt]]>
-        </description>
-      </element>
-
-      <element name="to" type="org.apache.tools.ant.taskdefs.email.EmailAddress"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[Adds a to address element.]]></short-description>
-        <description>
-          <![CDATA[Adds a to address element]]>
-        </description>
-      </element>
-
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="mkdir" category="filesystem"
-      classname="org.apache.tools.ant.taskdefs.Mkdir"
-      >
-
-  <short-description><![CDATA[Creates a given directory.]]></short-description>
-  <description>
-    <![CDATA[Creates a given directory.
- Creates a directory and any non-existent parent directories, when
- necessary]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="dir" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[The directory to create; required.]]></short-description>
-        <description><![CDATA[
-          the directory to create; required.
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="mmetrics" category="other"
-      classname="org.apache.tools.ant.taskdefs.optional.metamata.MMetrics"
-      >
-
-  <short-description><![CDATA[Computes the metrics of a set of Java files and write the results to an XML file.]]></short-description>
-  <description>
-    <![CDATA[Computes the metrics of a set of Java files and write the results to an XML
- file. As a convenience, a stylesheet is given in <tt>etc</tt> directory,
- so that an HTML report can be generated from the XML file.
- <p>
- You will not be able to use this task with the evaluation version since
- as of Metamata 2.0, Metrics does not support command line :-(]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="granularity" type="org.apache.tools.ant.taskdefs.optional.metamata.MMetrics.GranularityAttribute"
-                 briefType="&quot;compilation-units&quot;, &quot;files&quot;, &quot;methods&quot;, &quot;types&quot;, &quot;packages&quot;" required="NOTDEFINED">
-        <short-description><![CDATA[Granularity of the audit.]]></short-description>
-        <description><![CDATA[
-          set the granularity of the audit. Should be one of 'files', 'methods'
- or 'types'.
-        ]]></description>
-      </attribute>
-      <attribute name="maxmemory" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Maximum memory for the JVM; optional.]]></short-description>
-        <description><![CDATA[
-          Set the maximum memory for the JVM; optional.
- -mx or -Xmx depending on VM version
-        ]]></description>
-      </attribute>
-      <attribute name="metamatahome" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[The home directory containing the Metamata distribution; required.]]></short-description>
-        <description><![CDATA[
-          The home directory containing the Metamata distribution; required
-        ]]></description>
-      </attribute>
-      <attribute name="tofile" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[Output XML file.]]></short-description>
-        <description><![CDATA[
-          Set the output XML file
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-      <element name="fileset" type="org.apache.tools.ant.types.FileSet"
-               briefType="Fileset"
-               required="NOTDEFINED">
-        <short-description><![CDATA[The java files or directory to audit.]]></short-description>
-        <description>
-          <![CDATA[The java files or directory to audit.
- Whatever the filter is, only the files that end 
- with .java will be included for processing. 
- Note that the base directory used for the fileset 
- MUST be the root of the source files otherwise package names
- deduced from the file path will be incorrect.]]>
-        </description>
-      </element>
-
-      <element name="classpath" type="org.apache.tools.ant.types.Path"
-               briefType="Path"
-               required="NOTDEFINED">
-        <short-description><![CDATA[Class path (also source path unless one explicitly set).]]></short-description>
-        <description>
-          <![CDATA[Sets the class path (also source path unless one explicitly set).
- Overrides METAPATH/CLASSPATH environment variables.]]>
-        </description>
-      </element>
-
-      <element name="jvmarg" type="org.apache.tools.ant.types.Commandline.Argument"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[Additional optional parameters to pass to the JVM.]]></short-description>
-        <description>
-          <![CDATA[Additional optional parameters to pass to the JVM. 
- You can avoid using the  <code>&lt;jvmarg&gt;</code> by adding these empty 
- entries to <code>metamata.properties</code> located at <code>${metamata.home}/bin</code>
-
- <pre>metamata.classpath=
- metamata.sourcepath=
- metamata.baseclasspath=
- </pre>]]>
-        </description>
-      </element>
-
-      <element name="path" type="org.apache.tools.ant.types.Path"
-               briefType="Path"
-               required="NOTDEFINED">
-        <short-description><![CDATA[New path (directory) to measure metrics from.]]></short-description>
-        <description>
-          <![CDATA[Set a new path (directory) to measure metrics from.]]>
-        </description>
-      </element>
-
-      <element name="sourcepath" type="org.apache.tools.ant.types.Path"
-               briefType="Path"
-               required="NOTDEFINED">
-        <short-description><![CDATA[Source path.]]></short-description>
-        <description>
-          <![CDATA[Sets the source path. 
- Overrides the SOURCEPATH environment variable.]]>
-        </description>
-      </element>
-
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="move" category="filesystem"
-      classname="org.apache.tools.ant.taskdefs.Move"
-      >
-
-  <short-description><![CDATA[Moves a file or directory to a new file or directory.]]></short-description>
-  <description>
-    <![CDATA[Moves a file or directory to a new file or directory.
- By default, the
- destination file is overwritten if it already exists.
- When <i>overwrite</i> is
- turned off, then files are only moved if the source file is
- newer than the destination file, or when the destination file does
- not exist.
-
- <p>Source files and directories are only deleted when the file or
- directory has been copied to the destination successfully.  Filtering
- also works.</p>
-
- <p>This implementation is based on Arnout Kuiper's initial design
- document, the following mailing list discussions, and the
- copyfile/copydir tasks.</p>]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="encoding" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Character encoding.]]></short-description>
-        <description><![CDATA[
-          Sets the character encoding
-        ]]></description>
-      </attribute>
-      <attribute name="failonerror" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[If false, note errors to the output but keep going.]]></short-description>
-        <description><![CDATA[
-          If false, note errors to the output but keep going.
-        ]]></description>
-      </attribute>
-      <attribute name="file" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[Single source file to copy.]]></short-description>
-        <description><![CDATA[
-          Sets a single source file to copy.
-        ]]></description>
-      </attribute>
-      <attribute name="filtering" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[If true, enables filtering.]]></short-description>
-        <description><![CDATA[
-          If true, enables filtering.
-        ]]></description>
-      </attribute>
-      <attribute name="flatten" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[When copying directory trees, the files can be "flattened"
- into a single directory.]]></short-description>
-        <description><![CDATA[
-          When copying directory trees, the files can be "flattened"
- into a single directory.  If there are multiple files with
- the same name in the source directory tree, only the first
- file will be copied into the "flattened" directory, unless
- the forceoverwrite attribute is true.
-        ]]></description>
-      </attribute>
-      <attribute name="includeemptydirs" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Used to copy empty directories.]]></short-description>
-        <description><![CDATA[
-          Used to copy empty directories.
-        ]]></description>
-      </attribute>
-      <attribute name="overwrite" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Overwrite any existing destination file(s).]]></short-description>
-        <description><![CDATA[
-          Overwrite any existing destination file(s).
-        ]]></description>
-      </attribute>
-      <attribute name="preservelastmodified" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Give the copied files the same last modified time as the original files.]]></short-description>
-        <description><![CDATA[
-          Give the copied files the same last modified time as the original files.
-        ]]></description>
-      </attribute>
-      <attribute name="todir" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[Destination directory.]]></short-description>
-        <description><![CDATA[
-          Sets the destination directory.
-        ]]></description>
-      </attribute>
-      <attribute name="tofile" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[Destination file.]]></short-description>
-        <description><![CDATA[
-          Sets the destination file.
-        ]]></description>
-      </attribute>
-      <attribute name="verbose" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Used to force listing of all names of copied files.]]></short-description>
-        <description><![CDATA[
-          Used to force listing of all names of copied files.
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-      <element name="fileset" type="org.apache.tools.ant.types.FileSet"
-               briefType="Fileset"
-               required="NOTDEFINED">
-        <short-description><![CDATA[Adds a set of files to copy.]]></short-description>
-        <description>
-          <![CDATA[Adds a set of files to copy.]]>
-        </description>
-      </element>
-
-      <element name="filterchain" type="org.apache.tools.ant.types.FilterChain"
-               briefType="FilterChain"
-               required="NOTDEFINED">
-        <short-description><![CDATA[Adds a FilterChain.]]></short-description>
-        <description>
-          <![CDATA[Adds a FilterChain.]]>
-        </description>
-      </element>
-
-      <element name="filterset" type="org.apache.tools.ant.types.FilterSet"
-               briefType="Filterset"
-               required="NOTDEFINED">
-        <short-description><![CDATA[Adds a filterset.]]></short-description>
-        <description>
-          <![CDATA[Adds a filterset.]]>
-        </description>
-      </element>
-
-      <element name="mapper" type="org.apache.tools.ant.types.Mapper"
-               briefType="Mapper"
-               required="NOTDEFINED">
-        <short-description><![CDATA[Defines the mapper to map source to destination files.]]></short-description>
-        <description>
-          <![CDATA[Defines the mapper to map source to destination files.]]>
-        </description>
-      </element>
-
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="mparse" category="other"
-      classname="org.apache.tools.ant.taskdefs.optional.metamata.MParse"
-      >
-
-  <short-description><![CDATA[Simple Metamata MParse task.]]></short-description>
-  <description>
-    <![CDATA[Simple Metamata MParse task.
- Based on the original written by
- <a href="mailto:thomas.haas@softwired-inc.com">Thomas Haas</a>.
- This version was written for Metamata 2.0 available at
- <a href="http://www.metamata.com">http://www.metamata.com</a>]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="cleanup" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Remove the intermediate Sun JavaCC file 
- ; optional, default false.]]></short-description>
-        <description><![CDATA[
-          Remove the intermediate Sun JavaCC file 
- ; optional, default false.
-        ]]></description>
-      </attribute>
-      <attribute name="debugparser" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Set parser debug mode; optional, default false.]]></short-description>
-        <description><![CDATA[
-          set parser debug mode; optional, default false
-        ]]></description>
-      </attribute>
-      <attribute name="debugscanner" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Set scanner debug mode; optional, default false.]]></short-description>
-        <description><![CDATA[
-          set scanner debug mode; optional, default false
-        ]]></description>
-      </attribute>
-      <attribute name="maxmemory" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Maximum memory for the JVM; optional.]]></short-description>
-        <description><![CDATA[
-          Set the maximum memory for the JVM; optional.
- -mx or -Xmx depending on VM version
-        ]]></description>
-      </attribute>
-      <attribute name="metamatahome" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[The home directory containing the Metamata distribution; required.]]></short-description>
-        <description><![CDATA[
-          The home directory containing the Metamata distribution; required
-        ]]></description>
-      </attribute>
-      <attribute name="target" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[The .jj file to process; required.]]></short-description>
-        <description><![CDATA[
-          The .jj file to process; required.
-        ]]></description>
-      </attribute>
-      <attribute name="verbose" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Set verbose mode; optional, default false.]]></short-description>
-        <description><![CDATA[
-          set verbose mode; optional, default false
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-      <element name="classpath" type="org.apache.tools.ant.types.Path"
-               briefType="Path"
-               required="NOTDEFINED">
-        <short-description><![CDATA[Create a classpath entry.]]></short-description>
-        <description>
-          <![CDATA[create a classpath entry]]>
-        </description>
-      </element>
-
-      <element name="jvmarg" type="org.apache.tools.ant.types.Commandline.Argument"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[Additional optional parameters to pass to the JVM.]]></short-description>
-        <description>
-          <![CDATA[Additional optional parameters to pass to the JVM.]]>
-        </description>
-      </element>
-
-      <element name="sourcepath" type="org.apache.tools.ant.types.Path"
-               briefType="Path"
-               required="NOTDEFINED">
-        <short-description><![CDATA[Creates a sourcepath entry.]]></short-description>
-        <description>
-          <![CDATA[creates a sourcepath entry]]>
-        </description>
-      </element>
-
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="native2ascii" category="other"
-      classname="org.apache.tools.ant.taskdefs.optional.Native2Ascii"
-      matchingTask="true">
-
-  <short-description><![CDATA[Converts files from native encodings to ASCII.]]></short-description>
-  <description>
-    <![CDATA[Converts files from native encodings to ASCII.]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="dest" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[Destination directory to place converted files into.]]></short-description>
-        <description><![CDATA[
-          Set the destination directory to place converted files into.
-        ]]></description>
-      </attribute>
-      <attribute name="encoding" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Encoding to translate to/from.]]></short-description>
-        <description><![CDATA[
-          Set the encoding to translate to/from.
- If unset, the default encoding for the JVM is used.
-        ]]></description>
-      </attribute>
-      <attribute name="ext" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Extension which converted files should have.]]></short-description>
-        <description><![CDATA[
-          Set the extension which converted files should have.
- If unset, files will not be renamed.
-        ]]></description>
-      </attribute>
-      <attribute name="reverse" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Flag the conversion to run in the reverse sense,
- that is Ascii to Native encoding.]]></short-description>
-        <description><![CDATA[
-          Flag the conversion to run in the reverse sense,
- that is Ascii to Native encoding.
-        ]]></description>
-      </attribute>
-      <attribute name="src" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[Source directory in which to find files to convert.]]></short-description>
-        <description><![CDATA[
-          Set the source directory in which to find files to convert.
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-      <element name="mapper" type="org.apache.tools.ant.types.Mapper"
-               briefType="Mapper"
-               required="NOTDEFINED">
-        <short-description><![CDATA[Defines the FileNameMapper to use (nested mapper element).]]></short-description>
-        <description>
-          <![CDATA[Defines the FileNameMapper to use (nested mapper element).]]>
-        </description>
-      </element>
-
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="netrexxc" category="other"
-      classname="org.apache.tools.ant.taskdefs.optional.NetRexxC"
-      matchingTask="true">
-
-  <short-description><![CDATA[Compiles NetRexx source files.]]></short-description>
-  <description>
-    <![CDATA[Compiles NetRexx source files.
- This task can take the following
- arguments:
- <ul>
- <li>binary</li>
- <li>classpath</li>
- <li>comments</li>
- <li>compile</li>
- <li>console</li>
- <li>crossref</li>
- <li>decimal</li>
- <li>destdir</li>
- <li>diag</li>
- <li>explicit</li>
- <li>format</li>
- <li>keep</li>
- <li>logo</li>
- <li>replace</li>
- <li>savelog</li>
- <li>srcdir</li>
- <li>sourcedir</li>
- <li>strictargs</li>
- <li>strictassign</li>
- <li>strictcase</li>
- <li>strictimport</li>
- <li>symbols</li>
- <li>time</li>
- <li>trace</li>
- <li>utf8</li>
- <li>verbose</li>
- <li>suppressMethodArgumentNotUsed</li>
- <li>suppressPrivatePropertyNotUsed</li>
- <li>suppressVariableNotUsed</li>
- <li>suppressExceptionNotSignalled</li>
- <li>suppressDeprecation</li>
- </ul>
- Of these arguments, the <b>srcdir</b> argument is required.
-
- <p>When this task executes, it will recursively scan the srcdir
- looking for NetRexx source files to compile. This task makes its
- compile decision based on timestamp.
- <p>Before files are compiled they and any other file in the
- srcdir will be copied to the destdir allowing support files to be
- located properly in the classpath. The reason for copying the source files
- before the compile is that NetRexxC has only two destinations for classfiles:
- <ol>
- <li>The current directory, and,</li>
- <li>The directory the source is in (see sourcedir option)
- </ol>]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="binary" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Set whether literals are treated as binary, rather than NetRexx types.]]></short-description>
-        <description><![CDATA[
-          Set whether literals are treated as binary, rather than NetRexx types
-        ]]></description>
-      </attribute>
-      <attribute name="classpath" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Classpath used for NetRexx compilation.]]></short-description>
-        <description><![CDATA[
-          Set the classpath used for NetRexx compilation
-        ]]></description>
-      </attribute>
-      <attribute name="comments" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Set whether comments are passed through to the generated java source.]]></short-description>
-        <description><![CDATA[
-          Set whether comments are passed through to the generated java source.
- Valid true values are "on" or "true". Anything else sets the flag to
- false. The default value is false
-        ]]></description>
-      </attribute>
-      <attribute name="compact" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Set whether error messages come out in compact or verbose format.]]></short-description>
-        <description><![CDATA[
-          Set whether error messages come out in compact or verbose format. Valid
- true values are "on" or "true". Anything else sets the flag to false.
- The default value is false
-        ]]></description>
-      </attribute>
-      <attribute name="compile" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Set whether the NetRexx compiler should compile the generated java code
- Valid true values are "on" or "true".]]></short-description>
-        <description><![CDATA[
-          Set whether the NetRexx compiler should compile the generated java code
- Valid true values are "on" or "true". Anything else sets the flag to
- false. The default value is true. Setting this flag to false, will
- automatically set the keep flag to true.
-        ]]></description>
-      </attribute>
-      <attribute name="console" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Set whether or not messages should be displayed on the 'console' Valid
- true values are "on" or "true".]]></short-description>
-        <description><![CDATA[
-          Set whether or not messages should be displayed on the 'console' Valid
- true values are "on" or "true". Anything else sets the flag to false.
- The default value is true.
-        ]]></description>
-      </attribute>
-      <attribute name="crossref" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Whether variable cross references are generated.]]></short-description>
-        <description><![CDATA[
-          Whether variable cross references are generated
-        ]]></description>
-      </attribute>
-      <attribute name="decimal" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Set whether decimal arithmetic should be used for the netrexx code.]]></short-description>
-        <description><![CDATA[
-          Set whether decimal arithmetic should be used for the netrexx code.
- Binary arithmetic is used when this flag is turned off. Valid true
- values are "on" or "true". Anything else sets the flag to false. The
- default value is true.
-        ]]></description>
-      </attribute>
-      <attribute name="destdir" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[Destination directory into which the NetRexx source files
- should be copied and then compiled.]]></short-description>
-        <description><![CDATA[
-          Set the destination directory into which the NetRexx source files
- should be copied and then compiled.
-        ]]></description>
-      </attribute>
-      <attribute name="diag" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Whether diagnostic information about the compile is generated.]]></short-description>
-        <description><![CDATA[
-          Whether diagnostic information about the compile is generated
-        ]]></description>
-      </attribute>
-      <attribute name="explicit" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Sets whether variables must be declared explicitly before use.]]></short-description>
-        <description><![CDATA[
-          Sets whether variables must be declared explicitly before use. Valid
- true values are "on" or "true". Anything else sets the flag to false.
- The default value is false.
-        ]]></description>
-      </attribute>
-      <attribute name="format" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Whether the generated java code is formatted nicely or left to match
- NetRexx line numbers for call stack debugging.]]></short-description>
-        <description><![CDATA[
-          Whether the generated java code is formatted nicely or left to match
- NetRexx line numbers for call stack debugging
-        ]]></description>
-      </attribute>
-      <attribute name="java" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Whether the generated java code is produced Valid true values are "on"
- or "true".]]></short-description>
-        <description><![CDATA[
-          Whether the generated java code is produced Valid true values are "on"
- or "true". Anything else sets the flag to false. The default value is
- false.
-        ]]></description>
-      </attribute>
-      <attribute name="keep" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Sets whether the generated java source file should be kept after
- compilation.]]></short-description>
-        <description><![CDATA[
-          Sets whether the generated java source file should be kept after
- compilation. The generated files will have an extension of .java.keep,
- <b>not</b> .java Valid true values are "on" or "true". Anything else
- sets the flag to false. The default value is false.
-        ]]></description>
-      </attribute>
-      <attribute name="logo" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Whether the compiler text logo is displayed when compiling.]]></short-description>
-        <description><![CDATA[
-          Whether the compiler text logo is displayed when compiling
-        ]]></description>
-      </attribute>
-      <attribute name="replace" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Whether the generated .java file should be replaced when compiling
- Valid true values are "on" or "true".]]></short-description>
-        <description><![CDATA[
-          Whether the generated .java file should be replaced when compiling
- Valid true values are "on" or "true". Anything else sets the flag to
- false. The default value is false.
-        ]]></description>
-      </attribute>
-      <attribute name="savelog" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Sets whether the compiler messages will be written to NetRexxC.log as
- well as to the console Valid true values are "on" or "true".]]></short-description>
-        <description><![CDATA[
-          Sets whether the compiler messages will be written to NetRexxC.log as
- well as to the console Valid true values are "on" or "true". Anything
- else sets the flag to false. The default value is false.
-        ]]></description>
-      </attribute>
-      <attribute name="sourcedir" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Tells the NetRexx compiler to store the class files in the same
- directory as the source files.]]></short-description>
-        <description><![CDATA[
-          Tells the NetRexx compiler to store the class files in the same
- directory as the source files. The alternative is the working directory
- Valid true values are "on" or "true". Anything else sets the flag to
- false. The default value is true.
-        ]]></description>
-      </attribute>
-      <attribute name="srcdir" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[Source dir to find the source Java files.]]></short-description>
-        <description><![CDATA[
-          Set the source dir to find the source Java files.
-        ]]></description>
-      </attribute>
-      <attribute name="strictargs" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Tells the NetRexx compiler that method calls always need parentheses,
- even if no arguments are needed, e.g.]]></short-description>
-        <description><![CDATA[
-          Tells the NetRexx compiler that method calls always need parentheses,
- even if no arguments are needed, e.g. <code>aStringVar.getBytes</code>
- vs. <code>aStringVar.getBytes()</code> Valid true values are "on" or
- "true". Anything else sets the flag to false. The default value is
- false.
-        ]]></description>
-      </attribute>
-      <attribute name="strictassign" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Tells the NetRexx compile that assignments must match exactly on type.]]></short-description>
-        <description><![CDATA[
-          Tells the NetRexx compile that assignments must match exactly on type
-        ]]></description>
-      </attribute>
-      <attribute name="strictcase" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Specifies whether the NetRexx compiler should be case sensitive or not.]]></short-description>
-        <description><![CDATA[
-          Specifies whether the NetRexx compiler should be case sensitive or not
-        ]]></description>
-      </attribute>
-      <attribute name="strictimport" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Sets whether classes need to be imported explicitly using an <code>import</code>
- statement.]]></short-description>
-        <description><![CDATA[
-          Sets whether classes need to be imported explicitly using an <code>import</code>
- statement. By default the NetRexx compiler will import certain packages
- automatically Valid true values are "on" or "true". Anything else sets
- the flag to false. The default value is false.
-        ]]></description>
-      </attribute>
-      <attribute name="strictprops" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Sets whether local properties need to be qualified explicitly using
- <code>this</code> Valid true values are "on" or "true".]]></short-description>
-        <description><![CDATA[
-          Sets whether local properties need to be qualified explicitly using
- <code>this</code> Valid true values are "on" or "true". Anything else
- sets the flag to false. The default value is false.
-        ]]></description>
-      </attribute>
-      <attribute name="strictsignal" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Whether the compiler should force catching of exceptions by explicitly
- named types.]]></short-description>
-        <description><![CDATA[
-          Whether the compiler should force catching of exceptions by explicitly
- named types
-        ]]></description>
-      </attribute>
-      <attribute name="suppressdeprecation" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Tells whether we should filter out any deprecation-messages
- of the compiler out.]]></short-description>
-        <description><![CDATA[
-          Tells whether we should filter out any deprecation-messages
- of the compiler out.
-        ]]></description>
-      </attribute>
-      <attribute name="suppressexceptionnotsignalled" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Whether the task should suppress the "FooException is in SIGNALS list
- but is not signalled within the method", which is sometimes rather
- useless.]]></short-description>
-        <description><![CDATA[
-          Whether the task should suppress the "FooException is in SIGNALS list
- but is not signalled within the method", which is sometimes rather
- useless. The warning is logged as verbose message, though.
-        ]]></description>
-      </attribute>
-      <attribute name="suppressmethodargumentnotused" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Whether the task should suppress the "Method argument is not used" in
- strictargs-Mode, which can not be suppressed by the compiler itself.]]></short-description>
-        <description><![CDATA[
-          Whether the task should suppress the "Method argument is not used" in
- strictargs-Mode, which can not be suppressed by the compiler itself.
- The warning is logged as verbose message, though.
-        ]]></description>
-      </attribute>
-      <attribute name="suppressprivatepropertynotused" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Whether the task should suppress the "Private property is defined but
- not used" in strictargs-Mode, which can be quite annoying while
- developing.]]></short-description>
-        <description><![CDATA[
-          Whether the task should suppress the "Private property is defined but
- not used" in strictargs-Mode, which can be quite annoying while
- developing. The warning is logged as verbose message, though.
-        ]]></description>
-      </attribute>
-      <attribute name="suppressvariablenotused" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Whether the task should suppress the "Variable is set but not used" in
- strictargs-Mode.]]></short-description>
-        <description><![CDATA[
-          Whether the task should suppress the "Variable is set but not used" in
- strictargs-Mode. Be careful with this one! The warning is logged as
- verbose message, though.
-        ]]></description>
-      </attribute>
-      <attribute name="symbols" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Sets whether debug symbols should be generated into the class file
- Valid true values are "on" or "true".]]></short-description>
-        <description><![CDATA[
-          Sets whether debug symbols should be generated into the class file
- Valid true values are "on" or "true". Anything else sets the flag to
- false. The default value is false.
-        ]]></description>
-      </attribute>
-      <attribute name="time" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Asks the NetRexx compiler to print compilation times to the console
- Valid true values are "on" or "true".]]></short-description>
-        <description><![CDATA[
-          Asks the NetRexx compiler to print compilation times to the console
- Valid true values are "on" or "true". Anything else sets the flag to
- false. The default value is false.
-        ]]></description>
-      </attribute>
-      <attribute name="trace" type="org.apache.tools.ant.taskdefs.optional.NetRexxC.TraceAttr"
-                 briefType="&quot;trace&quot;, &quot;trace1&quot;, &quot;trace2&quot;, &quot;notrace&quot;" required="NOTDEFINED">
-        <short-description><![CDATA[No description.]]></short-description>
-        <description><![CDATA[
-        ]]></description>
-      </attribute>
-      <attribute name="utf8" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Tells the NetRexx compiler that the source is in UTF8 Valid true values
- are "on" or "true".]]></short-description>
-        <description><![CDATA[
-          Tells the NetRexx compiler that the source is in UTF8 Valid true values
- are "on" or "true". Anything else sets the flag to false. The default
- value is false.
-        ]]></description>
-      </attribute>
-      <attribute name="verbose" type="org.apache.tools.ant.taskdefs.optional.NetRexxC.VerboseAttr"
-                 briefType="&quot;verbose&quot;, &quot;verbose0&quot;, &quot;verbose1&quot;, &quot;verbose2&quot;, &quot;verbose3&quot;, &quot;verbose4&quot;, &quot;verbose5&quot;, &quot;noverbose&quot;" required="NOTDEFINED">
-        <short-description><![CDATA[Whether lots of warnings and error messages should be generated.]]></short-description>
-        <description><![CDATA[
-          Whether lots of warnings and error messages should be generated
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="p4add" category="other"
-      classname="org.apache.tools.ant.taskdefs.optional.perforce.P4Add"
-      >
-
-  <short-description><![CDATA[Adds specified files to Perforce.]]></short-description>
-  <description>
-    <![CDATA[Adds specified files to Perforce.
-
- <b>Example Usage:</b>
- <table border="1">
- <th>Function</th><th>Command</th>
- <tr><td>Add files using P4USER, P4PORT and P4CLIENT settings specified</td><td>&lt;P4add <br>P4view="//projects/foo/main/source/..." <br>P4User="fbloggs" <br>P4Port="km01:1666" <br>P4Client="fbloggsclient"&gt;<br>&lt;fileset basedir="dir" includes="**&#47;*.java"&gt;<br>&lt;/p4add&gt;</td></tr>
- <tr><td>Add files using P4USER, P4PORT and P4CLIENT settings defined in environment</td><td>&lt;P4add P4view="//projects/foo/main/source/..." /&gt;<br>&lt;fileset basedir="dir" includes="**&#47;*.java"&gt;<br>&lt;/p4add&gt;</td></tr>
- <tr><td>Specify the length of command line arguments to pass to each invocation of p4</td><td>&lt;p4add Commandlength="450"&gt;</td></tr>
- </table>]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="changelist" type="int"
-                 briefType="int" required="NOTDEFINED">
-        <short-description><![CDATA[If specified the open files are associated with the
- specified pending changelist number; otherwise the open files are
- associated with the default changelist.]]></short-description>
-        <description><![CDATA[
-          If specified the open files are associated with the
- specified pending changelist number; otherwise the open files are
- associated with the default changelist.
-        ]]></description>
-      </attribute>
-      <attribute name="client" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[The p4 client spec to use;
- optional, defaults to the current user.]]></short-description>
-        <description><![CDATA[
-          The p4 client spec to use;
- optional, defaults to the current user
-        ]]></description>
-      </attribute>
-      <attribute name="cmdopts" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Set extra command options; only used on some
- of the Perforce tasks.]]></short-description>
-        <description><![CDATA[
-          Set extra command options; only used on some
- of the Perforce tasks.
-        ]]></description>
-      </attribute>
-      <attribute name="commandlength" type="int"
-                 briefType="int" required="NOTDEFINED">
-        <short-description><![CDATA[Positive integer specifying the maximum length
-   of the commandline when calling Perforce to add the files.]]></short-description>
-        <description><![CDATA[
-          positive integer specifying the maximum length
-   of the commandline when calling Perforce to add the files. 
-   Defaults to 450, higher values mean faster execution,
-   but also possible failures.
-        ]]></description>
-      </attribute>
-      <attribute name="failonerror" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Whether to stop the build (true, default) 
- or keep going if an error is returned from the p4 command.]]></short-description>
-        <description><![CDATA[
-          whether to stop the build (true, default) 
- or keep going if an error is returned from the p4 command
-        ]]></description>
-      </attribute>
-      <attribute name="port" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[The p4d server and port to connect to;
- optional, default "perforce:1666".]]></short-description>
-        <description><![CDATA[
-          The p4d server and port to connect to;
- optional, default "perforce:1666"
-        ]]></description>
-      </attribute>
-      <attribute name="user" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[The p4 username;
- optional, defaults to the current user.]]></short-description>
-        <description><![CDATA[
-          The p4 username;
- optional, defaults to the current user
-        ]]></description>
-      </attribute>
-      <attribute name="view" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[The client, branch or label view to operate upon;
- optional default "//...".]]></short-description>
-        <description><![CDATA[
-          The client, branch or label view to operate upon;
- optional default "//..."
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-      <element name="fileset" type="org.apache.tools.ant.types.FileSet"
-               briefType="Fileset"
-               required="NOTDEFINED">
-        <short-description><![CDATA[Files to add.]]></short-description>
-        <description>
-          <![CDATA[files to add]]>
-        </description>
-      </element>
-
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="p4change" category="other"
-      classname="org.apache.tools.ant.taskdefs.optional.perforce.P4Change"
-      >
-
-  <short-description><![CDATA[Requests a new changelist from the Perforce server.]]></short-description>
-  <description>
-    <![CDATA[Requests a new changelist from the Perforce server.
- P4Change creates a new changelist in perforce. P4Change sets the property
- ${p4.change} with the new changelist number. This should then be passed into
- p4edit and p4submit.]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="client" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[The p4 client spec to use;
- optional, defaults to the current user.]]></short-description>
-        <description><![CDATA[
-          The p4 client spec to use;
- optional, defaults to the current user
-        ]]></description>
-      </attribute>
-      <attribute name="cmdopts" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Set extra command options; only used on some
- of the Perforce tasks.]]></short-description>
-        <description><![CDATA[
-          Set extra command options; only used on some
- of the Perforce tasks.
-        ]]></description>
-      </attribute>
-      <attribute name="description" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Description for ChangeList;optional.]]></short-description>
-        <description><![CDATA[
-          Description for ChangeList;optional.
- If none is specified, it will default to "AutoSubmit By Ant"
-        ]]></description>
-      </attribute>
-      <attribute name="failonerror" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Whether to stop the build (true, default) 
- or keep going if an error is returned from the p4 command.]]></short-description>
-        <description><![CDATA[
-          whether to stop the build (true, default) 
- or keep going if an error is returned from the p4 command
-        ]]></description>
-      </attribute>
-      <attribute name="port" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[The p4d server and port to connect to;
- optional, default "perforce:1666".]]></short-description>
-        <description><![CDATA[
-          The p4d server and port to connect to;
- optional, default "perforce:1666"
-        ]]></description>
-      </attribute>
-      <attribute name="user" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[The p4 username;
- optional, defaults to the current user.]]></short-description>
-        <description><![CDATA[
-          The p4 username;
- optional, defaults to the current user
-        ]]></description>
-      </attribute>
-      <attribute name="view" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[The client, branch or label view to operate upon;
- optional default "//...".]]></short-description>
-        <description><![CDATA[
-          The client, branch or label view to operate upon;
- optional default "//..."
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="p4counter" category="other"
-      classname="org.apache.tools.ant.taskdefs.optional.perforce.P4Counter"
-      >
-
-  <short-description><![CDATA[Obtains or sets the value of a counter.]]></short-description>
-  <description>
-    <![CDATA[Obtains or sets the value of a counter.
-
- <p> When used in its base form
- (where only the counter name is provided), the counter value will be
- printed to the output stream. When the value is provided, the counter
- will be set to the value provided. When a property name is provided,
- the property will be filled with the value of the counter. You may
- not specify to both get and set the value of the counter in the same
- Task.
- </p>
- <P>
- The user performing this task must have Perforce &quot;review&quot; permissions
- as defined by Perforce protections in order for this task to succeed.
-</P>
-
- Example Usage:<br>
- &lt;p4counter name="${p4.counter}" property=${p4.change}"/&gt;]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="client" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[The p4 client spec to use;
- optional, defaults to the current user.]]></short-description>
-        <description><![CDATA[
-          The p4 client spec to use;
- optional, defaults to the current user
-        ]]></description>
-      </attribute>
-      <attribute name="cmdopts" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Set extra command options; only used on some
- of the Perforce tasks.]]></short-description>
-        <description><![CDATA[
-          Set extra command options; only used on some
- of the Perforce tasks.
-        ]]></description>
-      </attribute>
-      <attribute name="failonerror" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Whether to stop the build (true, default) 
- or keep going if an error is returned from the p4 command.]]></short-description>
-        <description><![CDATA[
-          whether to stop the build (true, default) 
- or keep going if an error is returned from the p4 command
-        ]]></description>
-      </attribute>
-      <attribute name="name" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[The name of the counter; required.]]></short-description>
-        <description><![CDATA[
-          The name of the counter; required
-        ]]></description>
-      </attribute>
-      <attribute name="port" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[The p4d server and port to connect to;
- optional, default "perforce:1666".]]></short-description>
-        <description><![CDATA[
-          The p4d server and port to connect to;
- optional, default "perforce:1666"
-        ]]></description>
-      </attribute>
-      <attribute name="property" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[A property to be set with the value of the counter.]]></short-description>
-        <description><![CDATA[
-          A property to be set with the value of the counter
-        ]]></description>
-      </attribute>
-      <attribute name="user" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[The p4 username;
- optional, defaults to the current user.]]></short-description>
-        <description><![CDATA[
-          The p4 username;
- optional, defaults to the current user
-        ]]></description>
-      </attribute>
-      <attribute name="value" type="int"
-                 briefType="int" required="NOTDEFINED">
-        <short-description><![CDATA[The new value for the counter; optional.]]></short-description>
-        <description><![CDATA[
-          The new value for the counter; optional.
-        ]]></description>
-      </attribute>
-      <attribute name="view" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[The client, branch or label view to operate upon;
- optional default "//...".]]></short-description>
-        <description><![CDATA[
-          The client, branch or label view to operate upon;
- optional default "//..."
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="p4delete" category="other"
-      classname="org.apache.tools.ant.taskdefs.optional.perforce.P4Delete"
-      >
-
-  <short-description><![CDATA[Checkout files for deletion.]]></short-description>
-  <description>
-    <![CDATA[Checkout files for deletion.
-
- Example Usage:<br>
- &lt;p4delete change="${p4.change}" view="//depot/project/foo.txt" /&gt;<br>
-
- Simple re-write of P4Edit changing 'edit' to 'delete'.<br>]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="change" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[An existing changelist number for the deletion; optional
- but strongly recommended.]]></short-description>
-        <description><![CDATA[
-          An existing changelist number for the deletion; optional
- but strongly recommended.
-        ]]></description>
-      </attribute>
-      <attribute name="client" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[The p4 client spec to use;
- optional, defaults to the current user.]]></short-description>
-        <description><![CDATA[
-          The p4 client spec to use;
- optional, defaults to the current user
-        ]]></description>
-      </attribute>
-      <attribute name="cmdopts" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Set extra command options; only used on some
- of the Perforce tasks.]]></short-description>
-        <description><![CDATA[
-          Set extra command options; only used on some
- of the Perforce tasks.
-        ]]></description>
-      </attribute>
-      <attribute name="failonerror" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Whether to stop the build (true, default) 
- or keep going if an error is returned from the p4 command.]]></short-description>
-        <description><![CDATA[
-          whether to stop the build (true, default) 
- or keep going if an error is returned from the p4 command
-        ]]></description>
-      </attribute>
-      <attribute name="port" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[The p4d server and port to connect to;
- optional, default "perforce:1666".]]></short-description>
-        <description><![CDATA[
-          The p4d server and port to connect to;
- optional, default "perforce:1666"
-        ]]></description>
-      </attribute>
-      <attribute name="user" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[The p4 username;
- optional, defaults to the current user.]]></short-description>
-        <description><![CDATA[
-          The p4 username;
- optional, defaults to the current user
-        ]]></description>
-      </attribute>
-      <attribute name="view" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[The client, branch or label view to operate upon;
- optional default "//...".]]></short-description>
-        <description><![CDATA[
-          The client, branch or label view to operate upon;
- optional default "//..."
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="p4edit" category="other"
-      classname="org.apache.tools.ant.taskdefs.optional.perforce.P4Edit"
-      >
-
-  <short-description><![CDATA[Open file(s) for edit.]]></short-description>
-  <description>
-    <![CDATA[Open file(s) for edit. 
- P4Change should be used to obtain a new changelist for P4Edit as,
- although P4Edit can open files to the default change,  
- P4Submit cannot yet submit to it.
- Example Usage:<br>
- &lt;p4edit change="${p4.change}" view="//depot/project/foo.txt" /&gt;]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="change" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[An existing changelist number to assign files to; optional
- but strongly recommended.]]></short-description>
-        <description><![CDATA[
-          An existing changelist number to assign files to; optional
- but strongly recommended.
-        ]]></description>
-      </attribute>
-      <attribute name="client" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[The p4 client spec to use;
- optional, defaults to the current user.]]></short-description>
-        <description><![CDATA[
-          The p4 client spec to use;
- optional, defaults to the current user
-        ]]></description>
-      </attribute>
-      <attribute name="cmdopts" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Set extra command options; only used on some
- of the Perforce tasks.]]></short-description>
-        <description><![CDATA[
-          Set extra command options; only used on some
- of the Perforce tasks.
-        ]]></description>
-      </attribute>
-      <attribute name="failonerror" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Whether to stop the build (true, default) 
- or keep going if an error is returned from the p4 command.]]></short-description>
-        <description><![CDATA[
-          whether to stop the build (true, default) 
- or keep going if an error is returned from the p4 command
-        ]]></description>
-      </attribute>
-      <attribute name="port" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[The p4d server and port to connect to;
- optional, default "perforce:1666".]]></short-description>
-        <description><![CDATA[
-          The p4d server and port to connect to;
- optional, default "perforce:1666"
-        ]]></description>
-      </attribute>
-      <attribute name="user" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[The p4 username;
- optional, defaults to the current user.]]></short-description>
-        <description><![CDATA[
-          The p4 username;
- optional, defaults to the current user
-        ]]></description>
-      </attribute>
-      <attribute name="view" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[The client, branch or label view to operate upon;
- optional default "//...".]]></short-description>
-        <description><![CDATA[
-          The client, branch or label view to operate upon;
- optional default "//..."
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="p4have" category="other"
-      classname="org.apache.tools.ant.taskdefs.optional.perforce.P4Have"
-      >
-
-  <short-description><![CDATA[Lists Perforce files currently on client.]]></short-description>
-  <description>
-    <![CDATA[Lists Perforce files currently on client.
-
- P4Have simply dumps the current file version info into
- the Ant log (or stdout).]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="client" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[The p4 client spec to use;
- optional, defaults to the current user.]]></short-description>
-        <description><![CDATA[
-          The p4 client spec to use;
- optional, defaults to the current user
-        ]]></description>
-      </attribute>
-      <attribute name="cmdopts" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Set extra command options; only used on some
- of the Perforce tasks.]]></short-description>
-        <description><![CDATA[
-          Set extra command options; only used on some
- of the Perforce tasks.
-        ]]></description>
-      </attribute>
-      <attribute name="failonerror" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Whether to stop the build (true, default) 
- or keep going if an error is returned from the p4 command.]]></short-description>
-        <description><![CDATA[
-          whether to stop the build (true, default) 
- or keep going if an error is returned from the p4 command
-        ]]></description>
-      </attribute>
-      <attribute name="port" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[The p4d server and port to connect to;
- optional, default "perforce:1666".]]></short-description>
-        <description><![CDATA[
-          The p4d server and port to connect to;
- optional, default "perforce:1666"
-        ]]></description>
-      </attribute>
-      <attribute name="user" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[The p4 username;
- optional, defaults to the current user.]]></short-description>
-        <description><![CDATA[
-          The p4 username;
- optional, defaults to the current user
-        ]]></description>
-      </attribute>
-      <attribute name="view" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[The client, branch or label view to operate upon;
- optional default "//...".]]></short-description>
-        <description><![CDATA[
-          The client, branch or label view to operate upon;
- optional default "//..."
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="p4label" category="other"
-      classname="org.apache.tools.ant.taskdefs.optional.perforce.P4Label"
-      >
-
-  <short-description><![CDATA[Creates a new Perforce label and set contents to reflect current client file revisions.]]></short-description>
-  <description>
-    <![CDATA[Creates a new Perforce label and set contents to reflect current
-  client file revisions.
-
-  Label name defaults to AntLabel if none set.
-
- Example Usage:
- <pre>
-   &lt;P4Label name="MyLabel-${TSTAMP}-${DSTAMP}" desc="Auto Build Label" /&gt;
- </pre>]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="client" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[The p4 client spec to use;
- optional, defaults to the current user.]]></short-description>
-        <description><![CDATA[
-          The p4 client spec to use;
- optional, defaults to the current user
-        ]]></description>
-      </attribute>
-      <attribute name="cmdopts" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Set extra command options; only used on some
- of the Perforce tasks.]]></short-description>
-        <description><![CDATA[
-          Set extra command options; only used on some
- of the Perforce tasks.
-        ]]></description>
-      </attribute>
-      <attribute name="desc" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Label Description; optional.]]></short-description>
-        <description><![CDATA[
-          Label Description; optional
-        ]]></description>
-      </attribute>
-      <attribute name="failonerror" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Whether to stop the build (true, default) 
- or keep going if an error is returned from the p4 command.]]></short-description>
-        <description><![CDATA[
-          whether to stop the build (true, default) 
- or keep going if an error is returned from the p4 command
-        ]]></description>
-      </attribute>
-      <attribute name="lock" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[When set to "locked", Perforce will lock the label once created; optional.]]></short-description>
-        <description><![CDATA[
-          when set to "locked", Perforce will lock the label once created; optional.
-        ]]></description>
-      </attribute>
-      <attribute name="name" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[The name of the label; optional, default "AntLabel".]]></short-description>
-        <description><![CDATA[
-          The name of the label; optional, default "AntLabel"
-        ]]></description>
-      </attribute>
-      <attribute name="port" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[The p4d server and port to connect to;
- optional, default "perforce:1666".]]></short-description>
-        <description><![CDATA[
-          The p4d server and port to connect to;
- optional, default "perforce:1666"
-        ]]></description>
-      </attribute>
-      <attribute name="user" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[The p4 username;
- optional, defaults to the current user.]]></short-description>
-        <description><![CDATA[
-          The p4 username;
- optional, defaults to the current user
-        ]]></description>
-      </attribute>
-      <attribute name="view" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[The client, branch or label view to operate upon;
- optional default "//...".]]></short-description>
-        <description><![CDATA[
-          The client, branch or label view to operate upon;
- optional default "//..."
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="p4reopen" category="other"
-      classname="org.apache.tools.ant.taskdefs.optional.perforce.P4Reopen"
-      >
-
-  <short-description><![CDATA[No Description.]]></short-description>
-  <description>
-    <![CDATA[]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="client" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[The p4 client spec to use;
- optional, defaults to the current user.]]></short-description>
-        <description><![CDATA[
-          The p4 client spec to use;
- optional, defaults to the current user
-        ]]></description>
-      </attribute>
-      <attribute name="cmdopts" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Set extra command options; only used on some
- of the Perforce tasks.]]></short-description>
-        <description><![CDATA[
-          Set extra command options; only used on some
- of the Perforce tasks.
-        ]]></description>
-      </attribute>
-      <attribute name="failonerror" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Whether to stop the build (true, default) 
- or keep going if an error is returned from the p4 command.]]></short-description>
-        <description><![CDATA[
-          whether to stop the build (true, default) 
- or keep going if an error is returned from the p4 command
-        ]]></description>
-      </attribute>
-      <attribute name="port" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[The p4d server and port to connect to;
- optional, default "perforce:1666".]]></short-description>
-        <description><![CDATA[
-          The p4d server and port to connect to;
- optional, default "perforce:1666"
-        ]]></description>
-      </attribute>
-      <attribute name="tochange" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[The changelist to move files to; required.]]></short-description>
-        <description><![CDATA[
-          The changelist to move files to; required.
-        ]]></description>
-      </attribute>
-      <attribute name="user" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[The p4 username;
- optional, defaults to the current user.]]></short-description>
-        <description><![CDATA[
-          The p4 username;
- optional, defaults to the current user
-        ]]></description>
-      </attribute>
-      <attribute name="view" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[The client, branch or label view to operate upon;
- optional default "//...".]]></short-description>
-        <description><![CDATA[
-          The client, branch or label view to operate upon;
- optional default "//..."
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="p4revert" category="other"
-      classname="org.apache.tools.ant.taskdefs.optional.perforce.P4Revert"
-      >
-
-  <short-description><![CDATA[Revert Perforce open files or files in a changelist]]></short-description>
-  <description>
-    <![CDATA[Revert Perforce open files or files in a changelist]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="change" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[The changelist to revert; optional.]]></short-description>
-        <description><![CDATA[
-          The changelist to revert; optional.
-        ]]></description>
-      </attribute>
-      <attribute name="client" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[The p4 client spec to use;
- optional, defaults to the current user.]]></short-description>
-        <description><![CDATA[
-          The p4 client spec to use;
- optional, defaults to the current user
-        ]]></description>
-      </attribute>
-      <attribute name="cmdopts" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Set extra command options; only used on some
- of the Perforce tasks.]]></short-description>
-        <description><![CDATA[
-          Set extra command options; only used on some
- of the Perforce tasks.
-        ]]></description>
-      </attribute>
-      <attribute name="failonerror" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Whether to stop the build (true, default) 
- or keep going if an error is returned from the p4 command.]]></short-description>
-        <description><![CDATA[
-          whether to stop the build (true, default) 
- or keep going if an error is returned from the p4 command
-        ]]></description>
-      </attribute>
-      <attribute name="port" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[The p4d server and port to connect to;
- optional, default "perforce:1666".]]></short-description>
-        <description><![CDATA[
-          The p4d server and port to connect to;
- optional, default "perforce:1666"
-        ]]></description>
-      </attribute>
-      <attribute name="revertonlyunchanged" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Flag to revert only unchanged files (p4 revert -a); optional, default false.]]></short-description>
-        <description><![CDATA[
-          flag to revert only unchanged files (p4 revert -a); optional, default false.
-        ]]></description>
-      </attribute>
-      <attribute name="user" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[The p4 username;
- optional, defaults to the current user.]]></short-description>
-        <description><![CDATA[
-          The p4 username;
- optional, defaults to the current user
-        ]]></description>
-      </attribute>
-      <attribute name="view" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[The client, branch or label view to operate upon;
- optional default "//...".]]></short-description>
-        <description><![CDATA[
-          The client, branch or label view to operate upon;
- optional default "//..."
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="p4submit" category="other"
-      classname="org.apache.tools.ant.taskdefs.optional.perforce.P4Submit"
-      >
-
-  <short-description><![CDATA[Submits a numbered changelist to Perforce.]]></short-description>
-  <description>
-    <![CDATA[Submits a numbered changelist to Perforce.
-
- <B>Note:</B> P4Submit cannot (yet) submit the default changelist.
- This shouldn't be a problem with the ANT task as the usual flow is
- P4Change to create a new numbered change followed by P4Edit then P4Submit.
-
- Example Usage:-<br>
- &lt;p4submit change="${p4.change}" /&gt;]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="change" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[The changelist number to submit; required.]]></short-description>
-        <description><![CDATA[
-          The changelist number to submit; required.
-        ]]></description>
-      </attribute>
-      <attribute name="client" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[The p4 client spec to use;
- optional, defaults to the current user.]]></short-description>
-        <description><![CDATA[
-          The p4 client spec to use;
- optional, defaults to the current user
-        ]]></description>
-      </attribute>
-      <attribute name="cmdopts" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Set extra command options; only used on some
- of the Perforce tasks.]]></short-description>
-        <description><![CDATA[
-          Set extra command options; only used on some
- of the Perforce tasks.
-        ]]></description>
-      </attribute>
-      <attribute name="failonerror" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Whether to stop the build (true, default) 
- or keep going if an error is returned from the p4 command.]]></short-description>
-        <description><![CDATA[
-          whether to stop the build (true, default) 
- or keep going if an error is returned from the p4 command
-        ]]></description>
-      </attribute>
-      <attribute name="port" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[The p4d server and port to connect to;
- optional, default "perforce:1666".]]></short-description>
-        <description><![CDATA[
-          The p4d server and port to connect to;
- optional, default "perforce:1666"
-        ]]></description>
-      </attribute>
-      <attribute name="user" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[The p4 username;
- optional, defaults to the current user.]]></short-description>
-        <description><![CDATA[
-          The p4 username;
- optional, defaults to the current user
-        ]]></description>
-      </attribute>
-      <attribute name="view" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[The client, branch or label view to operate upon;
- optional default "//...".]]></short-description>
-        <description><![CDATA[
-          The client, branch or label view to operate upon;
- optional default "//..."
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="p4sync" category="other"
-      classname="org.apache.tools.ant.taskdefs.optional.perforce.P4Sync"
-      >
-
-  <short-description><![CDATA[Synchronize client space to a Perforce depot view.]]></short-description>
-  <description>
-    <![CDATA[Synchronize client space to a Perforce depot view.
-
-  The API allows additional functionality of the "p4 sync" command
- (such as "p4 sync -f //...#have" or other exotic invocations).</P>
-
- <b>Example Usage:</b>
- <table border="1">
- <th>Function</th><th>Command</th>
- <tr><td>Sync to head using P4USER, P4PORT and P4CLIENT settings specified</td><td>&lt;P4Sync <br>P4view="//projects/foo/main/source/..." <br>P4User="fbloggs" <br>P4Port="km01:1666" <br>P4Client="fbloggsclient" /&gt;</td></tr>
- <tr><td>Sync to head using P4USER, P4PORT and P4CLIENT settings defined in environment</td><td>&lt;P4Sync P4view="//projects/foo/main/source/..." /&gt;</td></tr>
- <tr><td>Force a re-sync to head, refreshing all files</td><td>&lt;P4Sync force="yes" P4view="//projects/foo/main/source/..." /&gt;</td></tr>
- <tr><td>Sync to a label</td><td>&lt;P4Sync label="myPerforceLabel" /&gt;</td></tr>
- </table>]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="client" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[The p4 client spec to use;
- optional, defaults to the current user.]]></short-description>
-        <description><![CDATA[
-          The p4 client spec to use;
- optional, defaults to the current user
-        ]]></description>
-      </attribute>
-      <attribute name="cmdopts" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Set extra command options; only used on some
- of the Perforce tasks.]]></short-description>
-        <description><![CDATA[
-          Set extra command options; only used on some
- of the Perforce tasks.
-        ]]></description>
-      </attribute>
-      <attribute name="failonerror" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Whether to stop the build (true, default) 
- or keep going if an error is returned from the p4 command.]]></short-description>
-        <description><![CDATA[
-          whether to stop the build (true, default) 
- or keep going if an error is returned from the p4 command
-        ]]></description>
-      </attribute>
-      <attribute name="force" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Force a refresh of files, if this attribute is set; false by default.]]></short-description>
-        <description><![CDATA[
-          force a refresh of files, if this attribute is set; false by default.
-        ]]></description>
-      </attribute>
-      <attribute name="label" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Label to sync client to; optional.]]></short-description>
-        <description><![CDATA[
-          Label to sync client to; optional.
-        ]]></description>
-      </attribute>
-      <attribute name="port" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[The p4d server and port to connect to;
- optional, default "perforce:1666".]]></short-description>
-        <description><![CDATA[
-          The p4d server and port to connect to;
- optional, default "perforce:1666"
-        ]]></description>
-      </attribute>
-      <attribute name="user" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[The p4 username;
- optional, defaults to the current user.]]></short-description>
-        <description><![CDATA[
-          The p4 username;
- optional, defaults to the current user
-        ]]></description>
-      </attribute>
-      <attribute name="view" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[The client, branch or label view to operate upon;
- optional default "//...".]]></short-description>
-        <description><![CDATA[
-          The client, branch or label view to operate upon;
- optional default "//..."
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="parallel" category="control"
-      classname="org.apache.tools.ant.taskdefs.Parallel"
-      >
-
-  <short-description><![CDATA[Executes the contained tasks in separate threads, continuing once all are completed.]]></short-description>
-  <description>
-    <![CDATA[Executes the contained tasks in separate threads, continuing
- once all are completed.
- <p>]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-    </attributes>
-
-    <elements>
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="patch" category="utility"
-      classname="org.apache.tools.ant.taskdefs.Patch"
-      >
-
-  <short-description><![CDATA[Patches a file by applying a 'diff' file to it; requires "patch" to be on the execution path.]]></short-description>
-  <description>
-    <![CDATA[Patches a file by applying a 'diff' file to it; requires "patch" to be
- on the execution path.]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="backups" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Flag to create backups; optional, default=false.]]></short-description>
-        <description><![CDATA[
-          flag to create backups; optional, default=false
-        ]]></description>
-      </attribute>
-      <attribute name="dir" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[The directory to run the patch command in, defaults to the
- project's base directory.]]></short-description>
-        <description><![CDATA[
-          The directory to run the patch command in, defaults to the
- project's base directory.
-        ]]></description>
-      </attribute>
-      <attribute name="ignorewhitespace" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Flag to ignore whitespace differences; default=false.]]></short-description>
-        <description><![CDATA[
-          flag to ignore whitespace differences; default=false
-        ]]></description>
-      </attribute>
-      <attribute name="originalfile" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[The file to patch; optional if it can be inferred from
- the diff file.]]></short-description>
-        <description><![CDATA[
-          The file to patch; optional if it can be inferred from
- the diff file
-        ]]></description>
-      </attribute>
-      <attribute name="patchfile" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[The file containing the diff output; required.]]></short-description>
-        <description><![CDATA[
-          The file containing the diff output; required.
-        ]]></description>
-      </attribute>
-      <attribute name="quiet" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Work silently unless an error occurs; optional, default=false.]]></short-description>
-        <description><![CDATA[
-          Work silently unless an error occurs; optional, default=false
-        ]]></description>
-      </attribute>
-      <attribute name="reverse" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Assume patch was created with old and new files swapped; optional,
- default=false.]]></short-description>
-        <description><![CDATA[
-          Assume patch was created with old and new files swapped; optional,
- default=false
-        ]]></description>
-      </attribute>
-      <attribute name="strip" type="int"
-                 briefType="int" required="NOTDEFINED">
-        <short-description><![CDATA[Strip the smallest prefix containing <i>num</i> leading slashes
- from filenames.]]></short-description>
-        <description><![CDATA[
-          Strip the smallest prefix containing <i>num</i> leading slashes
- from filenames.
-
- <p>patch's <i>-p</i> option.
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="pathconvert" category="utility"
-      classname="org.apache.tools.ant.taskdefs.PathConvert"
-      >
-
-  <short-description><![CDATA[Converts path and classpath information to a specific target OS format.]]></short-description>
-  <description>
-    <![CDATA[Converts path and classpath information to a specific target OS
- format. The resulting formatted path is placed into the specified property.]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="dirsep" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Default directory separator string;
- defaults to current JVM.]]></short-description>
-        <description><![CDATA[
-          Set the default directory separator string;
- defaults to current JVM {@link java.io.File#separator File.separator}
-        ]]></description>
-      </attribute>
-      <attribute name="pathsep" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Default path separator string;
- defaults to current JVM.]]></short-description>
-        <description><![CDATA[
-          Set the default path separator string;
- defaults to current JVM
- {@link java.io.File#pathSeparator File.pathSeparator}
-        ]]></description>
-      </attribute>
-      <attribute name="property" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[The property into which the converted path will be placed.]]></short-description>
-        <description><![CDATA[
-          The property into which the converted path will be placed.
-        ]]></description>
-      </attribute>
-      <attribute name="refid" type="org.apache.tools.ant.types.Reference"
-                 briefType="Reference" required="NOTDEFINED">
-        <short-description><![CDATA[Adds a reference to a Path, FileSet, DirSet, or FileList defined
- elsewhere.]]></short-description>
-        <description><![CDATA[
-          Adds a reference to a Path, FileSet, DirSet, or FileList defined
- elsewhere.
-        ]]></description>
-      </attribute>
-      <attribute name="setonempty" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Set setonempty
-
- If false, don't set the new property if the result is the empty string.]]></short-description>
-        <description><![CDATA[
-          Set setonempty
-
- If false, don't set the new property if the result is the empty string.
-        ]]></description>
-      </attribute>
-      <attribute name="targetos" type="org.apache.tools.ant.taskdefs.PathConvert.TargetOs"
-                 briefType="&quot;windows&quot;, &quot;unix&quot;, &quot;netware&quot;, &quot;os/2&quot;" required="NOTDEFINED">
-        <short-description><![CDATA[Set targetos to a platform to one of
- "windows", "unix", "netware", or "os/2"; required unless
- unless pathsep and/or dirsep are specified.]]></short-description>
-        <description><![CDATA[
-          Set targetos to a platform to one of
- "windows", "unix", "netware", or "os/2"; required unless
- unless pathsep and/or dirsep are specified.
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-      <element name="map" type="org.apache.tools.ant.taskdefs.PathConvert.MapEntry"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[Create a nested MAP element.]]></short-description>
-        <description>
-          <![CDATA[Create a nested MAP element]]>
-        </description>
-      </element>
-
-      <element name="path" type="org.apache.tools.ant.types.Path"
-               briefType="Path"
-               required="NOTDEFINED">
-        <short-description><![CDATA[Create a nested PATH element.]]></short-description>
-        <description>
-          <![CDATA[Create a nested PATH element]]>
-        </description>
-      </element>
-
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="property" category="other"
-      classname="org.apache.tools.ant.taskdefs.Property"
-      >
-
-  <short-description><![CDATA[Sets a property by name, or set of properties (from file or resource) in the project.]]></short-description>
-  <description>
-    <![CDATA[Sets a property by name, or set of properties (from file or
- resource) in the project.  </p>
- Properties are immutable: whoever sets a property first freezes it for the
- rest of the build; they are most definately not variable. 
- <p>There are five ways to set properties:</p>
- <ul>
-   <li>By supplying both the <i>name</i> and <i>value</i> attribute.</li>
-   <li>By supplying both the <i>name</i> and <i>refid</i> attribute.</li>
-   <li>By setting the <i>file</i> attribute with the filename of the property
-     file to load. This property file has the format as defined by the file used
-     in the class java.util.Properties.</li>
-   <li>By setting the <i>resource</i> attribute with the resource name of the
-     property file to load. This property file has the format as defined by the
-     file used in the class java.util.Properties.</li>
-   <li>By setting the <i>environment</i> attribute with a prefix to use.
-     Properties will be defined for every environment variable by
-     prefixing the supplied name and a period to the name of the variable.</li>
- </ul>
- <p>Although combinations of these ways are possible, only one should be used
- at a time. Problems might occur with the order in which properties are set, for
- instance.</p>
- <p>The value part of the properties being set, might contain references to other
- properties. These references are resolved at the time these properties are set.
- This also holds for properties loaded from a property file.</p>
- Properties are case sensitive.]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="classpath" type="org.apache.tools.ant.types.Path"
-                 briefType="Path" required="NOTDEFINED">
-        <short-description><![CDATA[The classpath to use when looking up a resource.]]></short-description>
-        <description><![CDATA[
-          The classpath to use when looking up a resource.
-        ]]></description>
-      </attribute>
-      <attribute name="classpathref" type="org.apache.tools.ant.types.Reference"
-                 briefType="Reference" required="NOTDEFINED">
-        <short-description><![CDATA[The classpath to use when looking up a resource,
- given as reference to a &lt;path&gt; defined elsewhere.]]></short-description>
-        <description><![CDATA[
-          the classpath to use when looking up a resource,
- given as reference to a &lt;path&gt; defined elsewhere
-        ]]></description>
-      </attribute>
-      <attribute name="environment" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[The prefix to use when retrieving environment variables.]]></short-description>
-        <description><![CDATA[
-          the prefix to use when retrieving environment variables. 
- Thus if you specify environment=&quot;myenv&quot; 
- you will be able to access OS-specific 
- environment variables via property names &quot;myenv.PATH&quot; or 
- &quot;myenv.TERM&quot;. 
- <p>
- Note that if you supply a property name with a final 
- &quot;.&quot; it will not be doubled. ie environment=&quot;myenv.&quot; will still 
- allow access of environment variables through &quot;myenv.PATH&quot; and 
- &quot;myenv.TERM&quot;. This functionality is currently only implemented 
- on select platforms. Feel free to send patches to increase the number of platforms
- this functionality is supported on ;).<br>
- Note also that properties are case sensitive, even if the
- environment variables on your operating system are not, e.g. it
- will be ${env.Path} not ${env.PATH} on Windows 2000.
-        ]]></description>
-      </attribute>
-      <attribute name="file" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[The filename of a property file to load.]]></short-description>
-        <description><![CDATA[
-          the filename of a property file to load.
-        ]]></description>
-      </attribute>
-      <attribute name="location" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[Property to the absolute filename of the
- given file.]]></short-description>
-        <description><![CDATA[
-          Sets the property to the absolute filename of the
- given file. If the value of this attribute is an absolute path, it
- is left unchanged (with / and \ characters converted to the
- current platforms conventions). Otherwise it is taken as a path
- relative to the project's basedir and expanded.
-        ]]></description>
-      </attribute>
-      <attribute name="name" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Name of the property to set.]]></short-description>
-        <description><![CDATA[
-          sets the name of the property to set.
-        ]]></description>
-      </attribute>
-      <attribute name="prefix" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Prefix to apply to properties loaded using <code>file</code>
- or <code>resource</code>.]]></short-description>
-        <description><![CDATA[
-          Prefix to apply to properties loaded using <code>file</code>
- or <code>resource</code>. 
- A "." is appended to the prefix if not specified.
-        ]]></description>
-      </attribute>
-      <attribute name="refid" type="org.apache.tools.ant.types.Reference"
-                 briefType="Reference" required="NOTDEFINED">
-        <short-description><![CDATA[Reference to an Ant datatype
- declared elsewhere.]]></short-description>
-        <description><![CDATA[
-          Sets a reference to an Ant datatype
- declared elsewhere. 
- Only yields reasonable results for references
- PATH like structures or properties.
-        ]]></description>
-      </attribute>
-      <attribute name="resource" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[The resource name of a property file to load.]]></short-description>
-        <description><![CDATA[
-          the resource name of a property file to load
-        ]]></description>
-      </attribute>
-      <attribute name="value" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Value of the property.]]></short-description>
-        <description><![CDATA[
-          Sets the value of the property.
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-      <element name="classpath" type="org.apache.tools.ant.types.Path"
-               briefType="Path"
-               required="NOTDEFINED">
-        <short-description><![CDATA[The classpath to use when looking up a resource.]]></short-description>
-        <description>
-          <![CDATA[The classpath to use when looking up a resource.]]>
-        </description>
-      </element>
-
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="propertyfile" category="other"
-      classname="org.apache.tools.ant.taskdefs.optional.PropertyFile"
-      >
-
-  <short-description><![CDATA[Modifies settings in a property file.]]></short-description>
-  <description>
-    <![CDATA[Modifies settings in a property file.
-
- <p>
-The following is an example of its usage:
-    <ul>&lt;target name="setState"&gt;<br>
-    <ul>&lt;property<br>
-        <ul>name="header"<br>
-        value="##Generated file - do not modify!"/&gt;<br>
-      &lt;propertyfile file="apropfile.properties" comment="${header}"&gt;<br>
-        &lt;entry key="product.version.major" type="int"  value="5"/&gt;<br>
-        &lt;entry key="product.version.minor" type="int"  value="0"/&gt;<br>
-        &lt;entry key="product.build.major"   type="int"  value="0" /&gt;<br>
-        &lt;entry key="product.build.minor"   type="int"  operation="+" /&gt;<br>
-        &lt;entry key="product.build.date"    type="date" value="now" /&gt;<br>
-        &lt;entry key="intSet" type="int" operation="=" value="681"/&gt;<br>
-        &lt;entry key="intDec" type="int" operation="-"/&gt;<br>
-        &lt;entry key="StringEquals" type="string" value="testValue"/&gt;<br>
-     &lt;/propertyfile&gt;<br></ul>
-   &lt;/target&gt;</ul><p>
-
-The &lt;propertyfile&gt; task must have:<br>
-    <ul><li>file</li></ul>
-Other parameters are:<br>
-    <ul><li>comment, key, operation, type and value (the final four being eliminated shortly)</li></ul>
-
-The &lt;entry&gt; task must have:<br>
-    <ul><li>key</li></ul>
-Other parameters are:<br>
-    <ul><li>operation</li>
-        <li>type</li>
-        <li>value</li>
-        <li>default</li>
-        <li>unit</li>
-    </ul>
-
-If type is unspecified, it defaults to string
-
-Parameter values:<br>
-    <ul><li>operation:</li>
-        <ul><li>"=" (set -- default)</li>
-        <li>"-" (dec)</li>
-        <li>"+" (inc)</li>
-
-    <li>type:</li>
-        <ul><li>"int"</li>
-        <li>"date"</li>
-        <li>"string"</li></ul></ul>
-
-    <li>value:</li>
-      <ul><li>holds the default value, if the property
-              was not found in property file</li>
-          <li>"now" In case of type "date", the
-              value "now" will be replaced by the current
-              date/time and used even if a valid date was
-              found in the property file.</li></ul>
-
-String property types can only use the "=" operation.
-Int property types can only use the "=", "-" or "+" operations.<p>
-
-The message property is used for the property file header, with "\\" being
-a newline delimiter character.]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="comment" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Optional header comment for the file.]]></short-description>
-        <description><![CDATA[
-          optional header comment for the file
-        ]]></description>
-      </attribute>
-      <attribute name="file" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[Location of the property file to be edited; required.]]></short-description>
-        <description><![CDATA[
-          Location of the property file to be edited; required.
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-      <element name="entry" type="org.apache.tools.ant.taskdefs.optional.PropertyFile.Entry"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[No description.]]></short-description>
-        <description>
-          <![CDATA[]]>
-        </description>
-      </element>
-
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="pvcs" category="other"
-      classname="org.apache.tools.ant.taskdefs.optional.pvcs.Pvcs"
-      >
-
-  <short-description><![CDATA[Extracts the latest edition of the source code from a PVCS repository.]]></short-description>
-  <description>
-    <![CDATA[Extracts the latest edition of the source code from a PVCS repository.
- PVCS is a version control system
- developed by <a href="http://www.merant.com/products/pvcs">Merant</a>.
- <br>
- Before using this tag, the user running ant must have access to the commands 
- of PVCS (get and pcli) and must have access to the repository. Note that the way to specify
- the repository is platform dependent so use property to specify location of repository.
- <br>
- This version has been tested agains PVCS version 6.5 and 6.6 under Windows and Solaris.
-
- <b>19-04-2001</b> <p>The task now has a more robust
- parser. It allows for platform independant file paths
- and supports file names with <i>()</i>. Thanks to Erik Husby for
- bringing the bug to my attention.
-
- <b>27-04-2001</b> <p>UNC paths are now handled properly.
- Fix provided by Don Jeffery. He also added an <i>UpdateOnly</i> flag
- that, when true, conditions the PVCS get using the -U option to only
- update those files that have a modification time (in PVCS) that is newer
- than the existing workfile.]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="filenameformat" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[The format of the folder names; optional.]]></short-description>
-        <description><![CDATA[
-          The format of the folder names; optional.
- This must be in a format suitable for 
- <code>java.text.MessageFormat</code>.
-  Index 1 of the format will be used as the file name.
-  Defaults to <code>{0}-arc({1})</code>
-        ]]></description>
-      </attribute>
-      <attribute name="force" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Specifies the value of the force argument; optional.]]></short-description>
-        <description><![CDATA[
-          Specifies the value of the force argument; optional.
- If set to <i>yes</i> all files that exists and are 
- writable are overwritten. Default <i>no</i> causes the files 
- that are writable to be ignored. This stops the PVCS command 
- <i>get</i> to stop asking questions!
-        ]]></description>
-      </attribute>
-      <attribute name="ignorereturncode" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[If set to true the return value from executing the pvcs
- commands are ignored; optional, default false.]]></short-description>
-        <description><![CDATA[
-          If set to true the return value from executing the pvcs
- commands are ignored; optional, default false.
-        ]]></description>
-      </attribute>
-      <attribute name="label" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Only files marked with this label are extracted; optional.]]></short-description>
-        <description><![CDATA[
-          Only files marked with this label are extracted; optional.
-        ]]></description>
-      </attribute>
-      <attribute name="linestart" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[What a valid return value from PVCS looks like
-  when it describes a file.]]></short-description>
-        <description><![CDATA[
-          What a valid return value from PVCS looks like
-  when it describes a file.  Defaults to <code>&quot;P:</code>.
- If you are not using an UNC name for your repository and the
- drive letter <code>P</code> is incorrect for your setup, you may
- need to change this value, UNC names will always be
- accepted.
-        ]]></description>
-      </attribute>
-      <attribute name="promotiongroup" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Specifies the name of the promotiongroup argument.]]></short-description>
-        <description><![CDATA[
-          Specifies the name of the promotiongroup argument
-        ]]></description>
-      </attribute>
-      <attribute name="pvcsbin" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Specifies the location of the PVCS bin directory; optional if on the PATH.]]></short-description>
-        <description><![CDATA[
-          Specifies the location of the PVCS bin directory; optional if on the PATH.
- On some systems the PVCS executables <i>pcli</i>
- and <i>get</i> are not found in the PATH. In such cases this attribute
- should be set to the bin directory of the PVCS installation containing
- the executables mentioned before. If this attribute isn't specified the
- tag expects the executables to be found using the PATH environment variable.
-        ]]></description>
-      </attribute>
-      <attribute name="pvcsproject" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[The project within the PVCS repository to extract files from;
- optional, default &quot;/&quot;.]]></short-description>
-        <description><![CDATA[
-          The project within the PVCS repository to extract files from;
- optional, default &quot;/&quot;
-        ]]></description>
-      </attribute>
-      <attribute name="repository" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[The network name of the PVCS repository; required.]]></short-description>
-        <description><![CDATA[
-          The network name of the PVCS repository; required.
-        ]]></description>
-      </attribute>
-      <attribute name="updateonly" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[If set to <i>true</i> files are fetched only if 
- newer than existing local files; optional, default false.]]></short-description>
-        <description><![CDATA[
-          If set to <i>true</i> files are fetched only if 
- newer than existing local files; optional, default false.
-        ]]></description>
-      </attribute>
-      <attribute name="workspace" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Workspace to use; optional.]]></short-description>
-        <description><![CDATA[
-          Workspace to use; optional.  
- By specifying a workspace, the files are extracted to that location.
- A PVCS workspace is a name for a location of the workfiles and 
- isn't as such the location itself. 
- You define the location for a workspace using the PVCS GUI clients.
- If this isn't specified the default workspace for the current user is used.
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-      <element name="pvcsproject" type="org.apache.tools.ant.taskdefs.optional.pvcs.PvcsProject"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[Specify a project within the PVCS repository to extract files from.]]></short-description>
-        <description>
-          <![CDATA[Specify a project within the PVCS repository to extract files from.]]>
-        </description>
-      </element>
-
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="record" category="utility"
-      classname="org.apache.tools.ant.taskdefs.Recorder"
-      >
-
-  <short-description><![CDATA[Adds a listener to the current build process that records the output to a file.]]></short-description>
-  <description>
-    <![CDATA[Adds a listener to the current build process that records the
- output to a file.
- <p>Several recorders can exist at the same time.  Each recorder is
- associated with a file.  The filename is used as a unique identifier for
- the recorders.  The first call to the recorder task with an unused filename
- will create a recorder (using the parameters provided) and add it to the
- listeners of the build.  All subsequent calls to the recorder task using
- this filename will modify that recorders state (recording or not) or other
- properties (like logging level).</p>
- <p>Some technical issues: the file's print stream is flushed for &quot;finished&quot;
- events (buildFinished, targetFinished and taskFinished), and is closed on
- a buildFinished event.</p>]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="action" type="org.apache.tools.ant.taskdefs.Recorder.ActionChoices"
-                 briefType="&quot;start&quot;, &quot;stop&quot;" required="NOTDEFINED">
-        <short-description><![CDATA[Action for the associated recorder entry.]]></short-description>
-        <description><![CDATA[
-          Sets the action for the associated recorder entry.
-        ]]></description>
-      </attribute>
-      <attribute name="append" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Whether or not the logger should append to a previous file.]]></short-description>
-        <description><![CDATA[
-          Whether or not the logger should append to a previous file.
-        ]]></description>
-      </attribute>
-      <attribute name="emacsmode" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[No description.]]></short-description>
-        <description><![CDATA[
-        ]]></description>
-      </attribute>
-      <attribute name="loglevel" type="org.apache.tools.ant.taskdefs.Recorder.VerbosityLevelChoices"
-                 briefType="&quot;error&quot;, &quot;warn&quot;, &quot;info&quot;, &quot;verbose&quot;, &quot;debug&quot;" required="NOTDEFINED">
-        <short-description><![CDATA[Level to which this recorder entry should log to.]]></short-description>
-        <description><![CDATA[
-          Sets the level to which this recorder entry should log to.
-        ]]></description>
-      </attribute>
-      <attribute name="name" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Name of the file to log to, and the name of the recorder
- entry.]]></short-description>
-        <description><![CDATA[
-          Sets the name of the file to log to, and the name of the recorder
- entry.
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="rename" category="other"
-      classname="org.apache.tools.ant.taskdefs.Rename"
-      deprecated="true"
-      >
-
-  <short-description><![CDATA[Renames a file.]]></short-description>
-  <description>
-    <![CDATA[Renames a file.]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="dest" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[New name of the file.]]></short-description>
-        <description><![CDATA[
-          Sets the new name of the file.
-        ]]></description>
-      </attribute>
-      <attribute name="replace" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Sets whether an existing file should be replaced.]]></short-description>
-        <description><![CDATA[
-          Sets whether an existing file should be replaced.
-        ]]></description>
-      </attribute>
-      <attribute name="src" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[File to be renamed.]]></short-description>
-        <description><![CDATA[
-          Sets the file to be renamed.
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="renameextensions" category="other"
-      classname="org.apache.tools.ant.taskdefs.optional.RenameExtensions"
-      deprecated="true"
-      matchingTask="true">
-
-  <short-description><![CDATA[No Description.]]></short-description>
-  <description>
-    <![CDATA[]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="fromextension" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[The string that files must end in to be renamed.]]></short-description>
-        <description><![CDATA[
-          The string that files must end in to be renamed
-        ]]></description>
-      </attribute>
-      <attribute name="replace" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Store replace attribute - this determines whether the target file
- should be overwritten if present.]]></short-description>
-        <description><![CDATA[
-          store replace attribute - this determines whether the target file
- should be overwritten if present
-        ]]></description>
-      </attribute>
-      <attribute name="srcdir" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[Source dir to find the files to be renamed.]]></short-description>
-        <description><![CDATA[
-          Set the source dir to find the files to be renamed.
-        ]]></description>
-      </attribute>
-      <attribute name="toextension" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[The string that renamed files will end with on
- completion.]]></short-description>
-        <description><![CDATA[
-          The string that renamed files will end with on
- completion
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="replace" category="filesystem"
-      classname="org.apache.tools.ant.taskdefs.Replace"
-      matchingTask="true">
-
-  <short-description><![CDATA[Replaces all occurrences of one or more string tokens with given values in the indicated files.]]></short-description>
-  <description>
-    <![CDATA[Replaces all occurrences of one or more string tokens with given
- values in the indicated files. Each value can be either a string 
- or the value of a property available in a designated property file.
- If you want to replace a text that crosses line boundaries, you
- must use a nested <code>&lt;replacetoken&gt;</code> element.]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="dir" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[The base directory to use when replacing a token in multiple files;
- required if <code>file</code> is not defined.]]></short-description>
-        <description><![CDATA[
-          The base directory to use when replacing a token in multiple files;
- required if <code>file</code> is not defined.
-        ]]></description>
-      </attribute>
-      <attribute name="encoding" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[File encoding to use on the files read and written by the task;
- optional, defaults to default JVM encoding.]]></short-description>
-        <description><![CDATA[
-          Set the file encoding to use on the files read and written by the task;
- optional, defaults to default JVM encoding
-        ]]></description>
-      </attribute>
-      <attribute name="file" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[Source file; required unless <code>dir</code> is set.]]></short-description>
-        <description><![CDATA[
-          Set the source file; required unless <code>dir</code> is set.
-        ]]></description>
-      </attribute>
-      <attribute name="propertyfile" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[The name of a property file from which properties specified using
- nested <code>&lt;replacefilter&gt;</code> elements are drawn;
- Required only if <i>property</i> attribute of
- <code>&lt;replacefilter&gt;</code> is used.]]></short-description>
-        <description><![CDATA[
-          The name of a property file from which properties specified using
- nested <code>&lt;replacefilter&gt;</code> elements are drawn;
- Required only if <i>property</i> attribute of
- <code>&lt;replacefilter&gt;</code> is used.
-        ]]></description>
-      </attribute>
-      <attribute name="replacefilterfile" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[Name of a property file containing filters; optional.]]></short-description>
-        <description><![CDATA[
-          Sets the name of a property file containing filters; optional.
- Each property will be treated as a
- replacefilter where token is the name of the property and value
- is the value of the property.
-        ]]></description>
-      </attribute>
-      <attribute name="summary" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Indicates whether a summary of the replace operation should be
- produced, detailing how many token occurrences and files were
- processed; optional, default=false.]]></short-description>
-        <description><![CDATA[
-          Indicates whether a summary of the replace operation should be
- produced, detailing how many token occurrences and files were
- processed; optional, default=false
-        ]]></description>
-      </attribute>
-      <attribute name="token" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[String token to replace;
- required unless a nested
- <code>replacetoken</code> element or the <code>replacefilterfile</code>
- attribute is used.]]></short-description>
-        <description><![CDATA[
-          Set the string token to replace;
- required unless a nested
- <code>replacetoken</code> element or the <code>replacefilterfile</code>
- attribute is used.
-        ]]></description>
-      </attribute>
-      <attribute name="value" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[String value to use as token replacement;
- optional, default is the empty string "".]]></short-description>
-        <description><![CDATA[
-          Set the string value to use as token replacement;
- optional, default is the empty string ""
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-      <element name="replacetoken" type="org.apache.tools.ant.taskdefs.Replace.NestedString"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[The token to filter as the text of a nested element.]]></short-description>
-        <description>
-          <![CDATA[the token to filter as the text of a nested element]]>
-        </description>
-      </element>
-
-      <element name="replacevalue" type="org.apache.tools.ant.taskdefs.Replace.NestedString"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[The string to replace the token as the text of a nested element.]]></short-description>
-        <description>
-          <![CDATA[the string to replace the token as the text of a nested element]]>
-        </description>
-      </element>
-
-      <element name="replacefilter" type="org.apache.tools.ant.taskdefs.Replace.Replacefilter"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[Add a nested &lt;replacefilter&gt; element.]]></short-description>
-        <description>
-          <![CDATA[Add a nested &lt;replacefilter&gt; element.]]>
-        </description>
-      </element>
-
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="replaceregexp" category="other"
-      classname="org.apache.tools.ant.taskdefs.optional.ReplaceRegExp"
-      >
-
-  <short-description><![CDATA[Performs regular expression string replacements in a text file.]]></short-description>
-  <description>
-    <![CDATA[Performs regular expression string replacements in a text
- file.  The input file(s) must be able to be properly processed by
- a Reader instance.  That is, they must be text only, no binary.
-
- The syntax of the regular expression depends on the implemtation that
- you choose to use. The system property <code>ant.regexp.regexpimpl</code>
- will be the classname of the implementation that will be used (the default
- is <code>org.apache.tools.ant.util.regexp.JakartaOroRegexp</code> and
- requires the Jakarta Oro Package).
-
- <pre>
- For jdk  &lt;= 1.3, there are two available implementations:
-   org.apache.tools.ant.util.regexp.JakartaOroRegexp (the default)
-        Requires  the jakarta-oro package
-
-   org.apache.tools.ant.util.regexp.JakartaRegexpRegexp
-        Requires the jakarta-regexp package
-
- For jdk &gt;= 1.4 an additional implementation is available:
-   org.apache.tools.ant.util.regexp.Jdk14RegexpRegexp
-        Requires the jdk 1.4 built in regular expression package.
-
- Usage:
-
-   Call Syntax:
-
-     &lt;replaceregexp file="file"
-                    match="pattern" 
-                    replace="pattern" 
-                    flags="options"?
-                    byline="true|false"? &gt;
-       regexp?
-       substitution?
-       fileset*
-     &lt;/replaceregexp&gt;
-
-    NOTE: You must have either the file attribute specified, or at least one fileset subelement
-    to operation on.  You may not have the file attribute specified if you nest fileset elements
-    inside this task.  Also, you cannot specify both match and a regular expression subelement at
-    the same time, nor can you specify the replace attribute and the substitution subelement at
-    the same time.
-
-   Attributes:
-
-     file    --&gt; A single file to operation on (mutually exclusive with the fileset subelements)
-     match   --&gt; The Regular expression to match 
-     replace --&gt; The Expression replacement string 
-     flags   --&gt; The options to give to the replacement 
-                 g = Substitute all occurrences. default is to replace only the first one
-                 i = Case insensitive match
-
-     byline  --&gt; Should this file be processed a single line at a time (default is false)
-                 "true" indicates to perform replacement on a line by line basis
-                 "false" indicates to perform replacement on the whole file at once.
-
-  Example:
-
-     The following call could be used to replace an old property name in a ".properties"
-     file with a new name.  In the replace attribute, you can refer to any part of the
-     match expression in parenthesis using backslash followed by a number like '\1'.
-
-     &lt;replaceregexp file="test.properties"
-                    match="MyProperty=(.*)"
-                    replace="NewProperty=\1"
-                    byline="true" /&gt;
-
- </pre>]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="byline" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Process the file(s) one line at a time, executing the replacement
- on one line at a time.]]></short-description>
-        <description><![CDATA[
-          Process the file(s) one line at a time, executing the replacement
- on one line at a time.  This is useful if you
- want to only replace the first occurence of a regular expression on
- each line, which is not easy to do when processing the file as a whole.
- Defaults to <i>false</i>.</td>
-        ]]></description>
-      </attribute>
-      <attribute name="file" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[File for which the regular expression should be replaced;
- required unless a nested fileset is supplied.]]></short-description>
-        <description><![CDATA[
-          file for which the regular expression should be replaced;
- required unless a nested fileset is supplied.
-        ]]></description>
-      </attribute>
-      <attribute name="flags" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[The flags to use when matching the regular expression.]]></short-description>
-        <description><![CDATA[
-          The flags to use when matching the regular expression.  For more
- information, consult the Perl5 syntax.
- <ul>
-  <li>g : Global replacement.  Replace all occurences found
-  <li>i : Case Insensitive.  Do not consider case in the match
-  <li>m : Multiline.  Treat the string as multiple lines of input, 
-         using "^" and "$" as the start or end of any line, respectively, rather than start or end of string.
-  <li> s : Singleline.  Treat the string as a single line of input, using
-        "." to match any character, including a newline, which normally, it would not match.
-</ul>
-        ]]></description>
-      </attribute>
-      <attribute name="match" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[The regular expression pattern to match in the file(s);
- required if no nested &lt;regexp&gt; is used.]]></short-description>
-        <description><![CDATA[
-          the regular expression pattern to match in the file(s);
- required if no nested &lt;regexp&gt; is used
-        ]]></description>
-      </attribute>
-      <attribute name="replace" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[The substitution pattern to place in the file(s) in place
- of the regular expression.]]></short-description>
-        <description><![CDATA[
-          The substitution pattern to place in the file(s) in place
- of the regular expression.
- Required if no nested &lt;substitution&gt; is used
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-      <element name="fileset" type="org.apache.tools.ant.types.FileSet"
-               briefType="Fileset"
-               required="NOTDEFINED">
-        <short-description><![CDATA[List files to apply the replacement to.]]></short-description>
-        <description>
-          <![CDATA[list files to apply the replacement to]]>
-        </description>
-      </element>
-
-      <element name="regexp" type="org.apache.tools.ant.types.RegularExpression"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[A regular expression.]]></short-description>
-        <description>
-          <![CDATA[A regular expression.
- You can use this element to refer to a previously
- defined regular expression datatype instance]]>
-        </description>
-      </element>
-
-      <element name="substitution" type="org.apache.tools.ant.types.Substitution"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[A substitution pattern.]]></short-description>
-        <description>
-          <![CDATA[A substitution pattern.  You can use this element to refer to a previously
- defined substitution pattern datatype instance.]]>
-        </description>
-      </element>
-
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="rmic" category="java"
-      classname="org.apache.tools.ant.taskdefs.Rmic"
-      matchingTask="true">
-
-  <short-description><![CDATA[Runs the rmic compiler against classes.</p> <p>Rmic can be run on a single class (as specified with the classname attribute) or a number of classes at once (all classes below base that are neither _Stub nor _Skel classes).]]></short-description>
-  <description>
-    <![CDATA[Runs the rmic compiler against classes.</p>
- <p>Rmic can be run on a single class (as specified with the classname
- attribute) or a number of classes at once (all classes below base that
- are neither _Stub nor _Skel classes).  If you want to rmic a single
- class and this class is a class nested into another class, you have to
- specify the classname in the form <code>Outer$$Inner</code> instead of
- <code>Outer.Inner</code>.</p>
- <p>It is possible to refine the set of files that are being rmiced. This can be
- done with the <i>includes</i>, <i>includesfile</i>, <i>excludes</i>, 
- <i>excludesfile</i> and <i>defaultexcludes</i>
- attributes. With the <i>includes</i> or <i>includesfile</i> attribute you specify the files you want to
- have included by using patterns. The <i>exclude</i> or <i>excludesfile</i> attribute is used to specify
- the files you want to have excluded. This is also done with patterns. And
- finally with the <i>defaultexcludes</i> attribute, you can specify whether you
- want to use default exclusions or not. See the section on 
- directory based tasks</a>, on how the
- inclusion/exclusion of files works, and how to write patterns.</p>
- <p>This task forms an implicit FileSet and
- supports all attributes of <code>&lt;fileset&gt;</code>
- (<code>dir</code> becomes <code>base</code>) as well as the nested
- <code>&lt;include&gt;</code>, <code>&lt;exclude&gt;</code> and
- <code>&lt;patternset&gt;</code> elements.</p>
- <p>It is possible to use different compilers. This can be selected
- with the &quot;build.rmic&quot; property or the <code>compiler</code>
- attribute. <a name="compilervalues">There are three choices</a>:</p>
- <ul>
-   <li>sun (the standard compiler of the JDK)</li>
-   <li>kaffe (the standard compiler of 
-       {@link <a href="http://www.kaffe.org">Kaffe</a>})</li>
-   <li>weblogic</li>
- </ul>
- <p> The <a href="http://dione.zcu.cz/~toman40/miniRMI/">miniRMI</a>
- project contains a compiler implementation for this task as well,
- please consult miniRMI's documentation to learn how to use it.</p>]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="base" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[Location to store the compiled files; required.]]></short-description>
-        <description><![CDATA[
-          Sets the location to store the compiled files; required
-        ]]></description>
-      </attribute>
-      <attribute name="classname" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[The class to run <code>rmic</code> against;
- optional.]]></short-description>
-        <description><![CDATA[
-          Sets the the class to run <code>rmic</code> against;
- optional
-        ]]></description>
-      </attribute>
-      <attribute name="classpath" type="org.apache.tools.ant.types.Path"
-                 briefType="Path" required="NOTDEFINED">
-        <short-description><![CDATA[Classpath to be used for this compilation.]]></short-description>
-        <description><![CDATA[
-          Set the classpath to be used for this compilation.
-        ]]></description>
-      </attribute>
-      <attribute name="classpathref" type="org.apache.tools.ant.types.Reference"
-                 briefType="Reference" required="NOTDEFINED">
-        <short-description><![CDATA[Adds to the classpath a reference to 
- a &lt;path&gt; defined elsewhere.]]></short-description>
-        <description><![CDATA[
-          Adds to the classpath a reference to 
- a &lt;path&gt; defined elsewhere.
-        ]]></description>
-      </attribute>
-      <attribute name="compiler" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Compiler implementation to use; optional,
- defaults to the value of the <code>build.rmic</code> property,
- or failing that, default compiler for the current VM.]]></short-description>
-        <description><![CDATA[
-          Sets the compiler implementation to use; optional,
- defaults to the value of the <code>build.rmic</code> property,
- or failing that, default compiler for the current VM
-        ]]></description>
-      </attribute>
-      <attribute name="debug" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Generate debug info (passes -g to rmic);
- optional, defaults to false.]]></short-description>
-        <description><![CDATA[
-          generate debug info (passes -g to rmic);
- optional, defaults to false
-        ]]></description>
-      </attribute>
-      <attribute name="extdirs" type="org.apache.tools.ant.types.Path"
-                 briefType="Path" required="NOTDEFINED">
-        <short-description><![CDATA[Extension directories that will be used during the
- compilation; optional.]]></short-description>
-        <description><![CDATA[
-          Sets the extension directories that will be used during the
- compilation; optional.
-        ]]></description>
-      </attribute>
-      <attribute name="filtering" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Indicates whether token filtering should take place;
- optional, default=false.]]></short-description>
-        <description><![CDATA[
-          indicates whether token filtering should take place;
- optional, default=false
-        ]]></description>
-      </attribute>
-      <attribute name="idl" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Indicates that IDL output should be 
- generated.]]></short-description>
-        <description><![CDATA[
-          Indicates that IDL output should be 
- generated.  This defaults to false 
- if not set.
-        ]]></description>
-      </attribute>
-      <attribute name="idlopts" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Pass additional arguments for idl compile.]]></short-description>
-        <description><![CDATA[
-          pass additional arguments for idl compile
-        ]]></description>
-      </attribute>
-      <attribute name="iiop" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Indicates that IIOP compatible stubs should
- be generated; optional, defaults to false 
- if not set.]]></short-description>
-        <description><![CDATA[
-          Indicates that IIOP compatible stubs should
- be generated; optional, defaults to false 
- if not set.
-        ]]></description>
-      </attribute>
-      <attribute name="iiopopts" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Set additional arguments for iiop.]]></short-description>
-        <description><![CDATA[
-          Set additional arguments for iiop
-        ]]></description>
-      </attribute>
-      <attribute name="includeantruntime" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Sets whether or not to include ant's own classpath in this task's 
- classpath.]]></short-description>
-        <description><![CDATA[
-          Sets whether or not to include ant's own classpath in this task's 
- classpath.
- Optional; default is <code>true</code>.
-        ]]></description>
-      </attribute>
-      <attribute name="includejavaruntime" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Task's classpath.]]></short-description>
-        <description><![CDATA[
-          task's classpath.
- Enables or disables including the default run-time
- libraries from the executing VM; optional,
- defaults to false
-        ]]></description>
-      </attribute>
-      <attribute name="sourcebase" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[Optional directory to save generated source files to.]]></short-description>
-        <description><![CDATA[
-          optional directory to save generated source files to.
-        ]]></description>
-      </attribute>
-      <attribute name="stubversion" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Specify the JDK version for the generated stub code.]]></short-description>
-        <description><![CDATA[
-          Specify the JDK version for the generated stub code.
- Specify &quot;1.1&quot; to pass the &quot;-v1.1&quot; option to rmic.</td>
-        ]]></description>
-      </attribute>
-      <attribute name="verify" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Flag to enable verification so that the classes 
- found by the directory match are
- checked to see if they implement java.rmi.Remote.]]></short-description>
-        <description><![CDATA[
-          Flag to enable verification so that the classes 
- found by the directory match are
- checked to see if they implement java.rmi.Remote.
- Optional; his defaults to false if not set.
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-      <element name="classpath" type="org.apache.tools.ant.types.Path"
-               briefType="Path"
-               required="NOTDEFINED">
-        <short-description><![CDATA[Creates a nested classpath element.]]></short-description>
-        <description>
-          <![CDATA[Creates a nested classpath element.]]>
-        </description>
-      </element>
-
-      <element name="compilerarg" type="org.apache.tools.ant.taskdefs.Rmic.ImplementationSpecificArgument"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[Adds an implementation specific command line argument.]]></short-description>
-        <description>
-          <![CDATA[Adds an implementation specific command line argument.]]>
-        </description>
-      </element>
-
-      <element name="extdirs" type="org.apache.tools.ant.types.Path"
-               briefType="Path"
-               required="NOTDEFINED">
-        <short-description><![CDATA[Maybe creates a nested extdirs element.]]></short-description>
-        <description>
-          <![CDATA[Maybe creates a nested extdirs element.]]>
-        </description>
-      </element>
-
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="rpm" category="other"
-      classname="org.apache.tools.ant.taskdefs.optional.Rpm"
-      >
-
-  <short-description><![CDATA[Invokes the rpm tool to build a Linux installation file.]]></short-description>
-  <description>
-    <![CDATA[Invokes the rpm tool to build a Linux installation file.]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="cleanbuilddir" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Flag (optional, default=false) to remove 
- the generated files in the BUILD directory.]]></short-description>
-        <description><![CDATA[
-          Flag (optional, default=false) to remove 
- the generated files in the BUILD directory
-        ]]></description>
-      </attribute>
-      <attribute name="command" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[What command to issue to the rpm tool; optional.]]></short-description>
-        <description><![CDATA[
-          What command to issue to the rpm tool; optional.
- The default is "-bb"
-        ]]></description>
-      </attribute>
-      <attribute name="error" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[Optional file to save stderr to.]]></short-description>
-        <description><![CDATA[
-          Optional file to save stderr to
-        ]]></description>
-      </attribute>
-      <attribute name="output" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[Optional file to save stdout to.]]></short-description>
-        <description><![CDATA[
-          Optional file to save stdout to.
-        ]]></description>
-      </attribute>
-      <attribute name="removesource" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Flag (optional, default=false) 
- to remove the sources after the build.]]></short-description>
-        <description><![CDATA[
-          Flag (optional, default=false) 
- to remove the sources after the build.
- See the the <tt>--rmsource</tt>  option of rpmbuild.
-        ]]></description>
-      </attribute>
-      <attribute name="removespec" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Flag (optional, default=false) to remove the spec file from SPECS.]]></short-description>
-        <description><![CDATA[
-          Flag (optional, default=false) to remove the spec file from SPECS
-        ]]></description>
-      </attribute>
-      <attribute name="specfile" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[The name of the spec File to use; required.]]></short-description>
-        <description><![CDATA[
-          The name of the spec File to use; required.
-        ]]></description>
-      </attribute>
-      <attribute name="topdir" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[The directory which will have the expected
- subdirectories, SPECS, SOURCES, BUILD, SRPMS ; optional.]]></short-description>
-        <description><![CDATA[
-          The directory which will have the expected
- subdirectories, SPECS, SOURCES, BUILD, SRPMS ; optional. 
- If this isn't specified,
- the <tt>baseDir</tt> value is used
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="script" category="other"
-      classname="org.apache.tools.ant.taskdefs.optional.Script"
-      >
-
-  <short-description><![CDATA[Executes a script.]]></short-description>
-  <description>
-    <![CDATA[Executes a script.]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="language" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Defines the language (required).]]></short-description>
-        <description><![CDATA[
-          Defines the language (required).
-        ]]></description>
-      </attribute>
-      <attribute name="src" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Load the script from an external file ; optional.]]></short-description>
-        <description><![CDATA[
-          Load the script from an external file ; optional.
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-    </elements>
-
-      <body >
-        <description><![CDATA[
-          The script text.
-        ]]></description>
-      </body>
-
-  </structure>
-
-</task>
-
-
-<task name="sequential" category="control"
-      classname="org.apache.tools.ant.taskdefs.Sequential"
-      >
-
-  <short-description><![CDATA[Sequential is a container task - it can contain other Ant tasks.]]></short-description>
-  <description>
-    <![CDATA[Sequential is a container task - it can contain other Ant tasks. The nested 
- tasks are simply executed in sequence. Sequential's primary use is to support 
- the sequential execution of a subset of tasks within the
-{@link Parallel Parallel Task} 
-
- <p>
- The sequential task has no attributes and does not support any nested 
- elements apart from Ant tasks. Any valid Ant task may be embedded within the 
- sequential task.</p>]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-    </attributes>
-
-    <elements>
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="serverdeploy" category="other"
-      classname="org.apache.tools.ant.taskdefs.optional.j2ee.ServerDeploy"
-      >
-
-  <short-description><![CDATA[Controls hot deployment tools for J2EE servers.]]></short-description>
-  <description>
-    <![CDATA[Controls hot deployment tools for J2EE servers.
-
-  This class is used as a framework for the creation of vendor specific
-  hot deployment tools.]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="action" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[The action to be performed, usually "deploy"; required.]]></short-description>
-        <description><![CDATA[
-          The action to be performed, usually "deploy"; required.
-   Some tools support additional actions, such as "delete", "list", "undeploy", "update"...
-        ]]></description>
-      </attribute>
-      <attribute name="source" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[The filename of the component to be deployed; optional
-  depending upon the tool and the action.]]></short-description>
-        <description><![CDATA[
-          The filename of the component to be deployed; optional
-  depending upon the tool and the action.
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-      <element name="generic" type="org.apache.tools.ant.taskdefs.optional.j2ee.GenericHotDeploymentTool"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[Creates a generic deployment tool.]]></short-description>
-        <description>
-          <![CDATA[Creates a generic deployment tool.
-  <p>Ant calls this method on creation to handle embedded "generic" elements
-  in the ServerDeploy task.]]>
-        </description>
-      </element>
-
-      <element name="jonas" type="org.apache.tools.ant.taskdefs.optional.j2ee.JonasHotDeploymentTool"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[Creates a JOnAS deployment tool, for deployment to JOnAS servers.]]></short-description>
-        <description>
-          <![CDATA[Creates a JOnAS deployment tool, for deployment to JOnAS servers.
-  <p>Ant calls this method on creation to handle embedded "jonas" elements
-  in the ServerDeploy task.]]>
-        </description>
-      </element>
-
-      <element name="weblogic" type="org.apache.tools.ant.taskdefs.optional.j2ee.WebLogicHotDeploymentTool"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[Creates a WebLogic deployment tool, for deployment to WebLogic servers.]]></short-description>
-        <description>
-          <![CDATA[Creates a WebLogic deployment tool, for deployment to WebLogic servers.
-  <p>Ant calls this method on creation to handle embedded "weblogic" elements
-  in the ServerDeploy task.]]>
-        </description>
-      </element>
-
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="setproxy" category="other"
-      classname="org.apache.tools.ant.taskdefs.optional.net.SetProxy"
-      >
-
-  <short-description><![CDATA[Sets Java's web proxy properties, so that tasks and code run in the same JVM can have through-the-firewall access to remote web sites, and remote ftp sites.]]></short-description>
-  <description>
-    <![CDATA[Sets Java's web proxy properties, so that tasks and code run in
- the same JVM can have through-the-firewall access to remote web sites,
- and remote ftp sites.
- You can nominate an http and ftp proxy, or a socks server, reset the server 
- settings, or do nothing at all.
- <p> 
- Examples
- <pre>&lt;setproxy/&gt;</pre>
- do nothing
- <pre>&lt;setproxy proxyhost="firewall"/&gt;</pre>
- set the proxy to firewall:80
- <pre>&lt;setproxy proxyhost="firewall" proxyport="81"/&gt;</pre>
- set the proxy to firewall:81
- <pre>&lt;setproxy proxyhost=""/&gt;</pre>
- stop using the http proxy; don't change the socks settings
- <pre>&lt;setproxy socksproxyhost="socksy"/&gt;</pre>
- use socks via socksy:1080
- <pre>&lt;setproxy socksproxyhost=""/&gt;</pre>
- stop using the socks server]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="nonproxyhosts" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[A list of hosts to bypass the proxy on.]]></short-description>
-        <description><![CDATA[
-          A list of hosts to bypass the proxy on. These should be separated
- with the vertical bar character '|'. Only in Java 1.4 does ftp use
- this list.
- e.g. fozbot.corp.sun.com|*.eng.sun.com
-        ]]></description>
-      </attribute>
-      <attribute name="proxyhost" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[The HTTP/ftp proxy host.]]></short-description>
-        <description><![CDATA[
-          the HTTP/ftp proxy host. Set this to "" for the http proxy
- option to be disabled
-        ]]></description>
-      </attribute>
-      <attribute name="proxyport" type="int"
-                 briefType="int" required="NOTDEFINED">
-        <short-description><![CDATA[The HTTP/ftp proxy port number; default is 80.]]></short-description>
-        <description><![CDATA[
-          the HTTP/ftp proxy port number; default is 80
-        ]]></description>
-      </attribute>
-      <attribute name="socksproxyhost" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[The name of a Socks server.]]></short-description>
-        <description><![CDATA[
-          The name of a Socks server. Set to "" to turn socks
- proxying off.
-        ]]></description>
-      </attribute>
-      <attribute name="socksproxyport" type="int"
-                 briefType="int" required="NOTDEFINED">
-        <short-description><![CDATA[ProxyPort for socks connections.]]></short-description>
-        <description><![CDATA[
-          Set the ProxyPort for socks connections. The default value is 1080
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="signjar" category="java"
-      classname="org.apache.tools.ant.taskdefs.SignJar"
-      >
-
-  <short-description><![CDATA[Signs jar or zip files with the javasign command line tool.]]></short-description>
-  <description>
-    <![CDATA[Signs jar or zip files with the javasign command line tool. The
- tool detailed dependency checking: files are only signed if they
- are not signed. The <tt>signjar</tt> attribute can point to the file to
- generate; if this file exists then
- its modification date is used as a cue as to whether to resign any JAR file.
- <br>  
- <strong>Note:</strong> Requires Java 1.2 or later. </p>]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="alias" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[The alias to sign under; required.]]></short-description>
-        <description><![CDATA[
-          the alias to sign under; required
-        ]]></description>
-      </attribute>
-      <attribute name="internalsf" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Flag to include the .SF file inside the signature;
- optional; default false.]]></short-description>
-        <description><![CDATA[
-          Flag to include the .SF file inside the signature;
- optional; default false
-        ]]></description>
-      </attribute>
-      <attribute name="jar" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[The jar file to sign; required.]]></short-description>
-        <description><![CDATA[
-          the jar file to sign; required
-        ]]></description>
-      </attribute>
-      <attribute name="keypass" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Password for private key (if different); optional.]]></short-description>
-        <description><![CDATA[
-          password for private key (if different); optional
-        ]]></description>
-      </attribute>
-      <attribute name="keystore" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[Keystore location; required.]]></short-description>
-        <description><![CDATA[
-          keystore location; required
-        ]]></description>
-      </attribute>
-      <attribute name="lazy" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Flag to control whether the presence of a signature
- file means a JAR is signed;
- optional, default false.]]></short-description>
-        <description><![CDATA[
-          flag to control whether the presence of a signature
- file means a JAR is signed;
- optional, default false
-        ]]></description>
-      </attribute>
-      <attribute name="sectionsonly" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Flag to compute hash of entire manifest;
- optional, default false.]]></short-description>
-        <description><![CDATA[
-          flag to compute hash of entire manifest;
- optional, default false
-        ]]></description>
-      </attribute>
-      <attribute name="sigfile" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[Name of .SF/.DSA file; optional.]]></short-description>
-        <description><![CDATA[
-          name of .SF/.DSA file; optional
-        ]]></description>
-      </attribute>
-      <attribute name="signedjar" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[Name of signed JAR file; optional.]]></short-description>
-        <description><![CDATA[
-          name of signed JAR file; optional
-        ]]></description>
-      </attribute>
-      <attribute name="storepass" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Password for keystore integrity; required.]]></short-description>
-        <description><![CDATA[
-          password for keystore integrity; required
-        ]]></description>
-      </attribute>
-      <attribute name="storetype" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Keystore type; optional.]]></short-description>
-        <description><![CDATA[
-          keystore type; optional
-        ]]></description>
-      </attribute>
-      <attribute name="verbose" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Enable verbose output when signing
- ; optional: default false.]]></short-description>
-        <description><![CDATA[
-          Enable verbose output when signing
- ; optional: default false
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-      <element name="fileset" type="org.apache.tools.ant.types.FileSet"
-               briefType="Fileset"
-               required="NOTDEFINED">
-        <short-description><![CDATA[Adds a set of files to sign.]]></short-description>
-        <description>
-          <![CDATA[Adds a set of files to sign]]>
-        </description>
-      </element>
-
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="sleep" category="utility"
-      classname="org.apache.tools.ant.taskdefs.Sleep"
-      >
-
-  <short-description><![CDATA[Sleep, or pause, for a period of time.]]></short-description>
-  <description>
-    <![CDATA[Sleep, or pause, for a period of time.
-
- A task for sleeping a short period of time, useful when a
- build or deployment process requires an interval between tasks.
-<p>
- A negative value can be supplied to any of attributes provided the total sleep time 
- is positive, pending fundamental changes in physics and JVM
- execution tims</p>
- Note that sleep times are always hints to be interpred by the OS how it feels 
- small times may either be ignored or rounded up to a minimum timeslice. Note 
- also that the system clocks often have a fairly low granularity too, which complicates 
- measuring how long a sleep actually took.</p>]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="failonerror" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Flag controlling whether to break the build on an error.]]></short-description>
-        <description><![CDATA[
-          flag controlling whether to break the build on an error.
-        ]]></description>
-      </attribute>
-      <attribute name="hours" type="int"
-                 briefType="int" required="NOTDEFINED">
-        <short-description><![CDATA[Hours to add to the sleep time.]]></short-description>
-        <description><![CDATA[
-          hours to add to the sleep time.
-        ]]></description>
-      </attribute>
-      <attribute name="milliseconds" type="int"
-                 briefType="int" required="NOTDEFINED">
-        <short-description><![CDATA[Milliseconds to add to the sleep time.]]></short-description>
-        <description><![CDATA[
-          milliseconds to add to the sleep time
-        ]]></description>
-      </attribute>
-      <attribute name="minutes" type="int"
-                 briefType="int" required="NOTDEFINED">
-        <short-description><![CDATA[Minutes to add to the sleep time.]]></short-description>
-        <description><![CDATA[
-          minutes to add to the sleep time
-        ]]></description>
-      </attribute>
-      <attribute name="seconds" type="int"
-                 briefType="int" required="NOTDEFINED">
-        <short-description><![CDATA[Seconds to add to the sleep time.]]></short-description>
-        <description><![CDATA[
-          seconds to add to the sleep time
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="soscheckin" category="other"
-      classname="org.apache.tools.ant.taskdefs.optional.sos.SOSCheckin"
-      >
-
-  <short-description><![CDATA[Commits and unlocks files in Visual SourceSafe via a SourceOffSite server.]]></short-description>
-  <description>
-    <![CDATA[Commits and unlocks files in Visual SourceSafe via a SourceOffSite server.
-
- <p>
- The following attributes are interpretted:
- <table border="1">
-   <tr>
-     <th>Attribute</th>
-     <th>Values</th>
-     <th>Required</th>
-   </tr>
-   <tr>
-     <td>soscmddir</td>
-     <td>Directory which contains soscmd(.exe) <br>
-     soscmd(.exe) must be in the path if this is not specified</td>
-     <td>No</td>
-   </tr>
-   <tr>
-      <td>vssserverpath</td>
-      <td>path to the srcsafe.ini  - eg. \\server\vss\srcsafe.ini</td>
-      <td>Yes</td>
-   </tr>
-   <tr>
-      <td>sosserverpath</td>
-      <td>address and port of the SOS server  - eg. 192.168.0.1:8888</td>
-      <td>Yes</td>
-   </tr>
-   <tr>
-      <td>projectpath</td>
-      <td>SourceSafe project path without the "$"</td>
-      <td>Yes</td>
-   </tr>
-   <tr>
-      <td>file</td>
-      <td>Filename to act upon<br> If no file is specified then act upon the project</td>
-      <td>No</td>
-   </tr>
-   <tr>
-      <td>username</td>
-      <td>SourceSafe username</td>
-      <td>Yes</td>
-   </tr>
-   <tr>
-      <td>password</td>
-      <td>SourceSafe password</td>
-      <td>No</td>
-   </tr>
-   <tr>
-      <td>localpath</td>
-      <td>Override the working directory and get to the specified path</td>
-      <td>No</td>
-   </tr>
-   <tr>
-      <td>soshome</td>
-      <td>The path to the SourceOffSite home directory</td>
-      <td>No</td>
-   </tr>
-   <tr>
-      <td>nocompression</td>
-      <td>true or false - disable compression</td>
-      <td>No</td>
-   </tr>
-   <tr>
-      <td>recursive</td>
-      <td>true or false - Only works with the CheckOutProject command</td>
-      <td>No</td>
-   </tr>
-   <tr>
-      <td>nocache</td>
-      <td>true or false - Only needed if SOSHOME is set as an enviroment variable</td>
-      <td>No</td>
-   </tr>
-   <tr>
-      <td>verbose</td>
-      <td>true or false - Status messages are displayed</td>
-      <td>No</td>
-   </tr>
-   <td>comment</td>
-      <td>A comment to be applied to all files being checked in</td>
-      <td>No</td>
-   </tr>
- </table>]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="comment" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Comment to apply to all files being labelled;
- optional, only valid in SOSLabel.]]></short-description>
-        <description><![CDATA[
-          Set the comment to apply to all files being labelled;
- optional, only valid in SOSLabel
-        ]]></description>
-      </attribute>
-      <attribute name="file" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Filename to act upon; optional.]]></short-description>
-        <description><![CDATA[
-          Set the Filename to act upon; optional.
- If no file is specified then the tasks 
- act upon the project
-        ]]></description>
-      </attribute>
-      <attribute name="label" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Labeled version to operate on in SourceSafe.]]></short-description>
-        <description><![CDATA[
-          Set the labeled version to operate on in SourceSafe
-        ]]></description>
-      </attribute>
-      <attribute name="localpath" type="org.apache.tools.ant.types.Path"
-                 briefType="Path" required="NOTDEFINED">
-        <short-description><![CDATA[Override the working directory and get to the specified path; optional.]]></short-description>
-        <description><![CDATA[
-          Override the working directory and get to the specified path; optional.
-        ]]></description>
-      </attribute>
-      <attribute name="nocache" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Flag to disable the cache when set;
- optional needed if SOSHOME is set as an environment variable.]]></short-description>
-        <description><![CDATA[
-          flag to disable the cache when set;
- optional needed if SOSHOME is set as an environment variable.
-        ]]></description>
-      </attribute>
-      <attribute name="nocompress" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Flag that disables compression when set; optional, default.]]></short-description>
-        <description><![CDATA[
-          Flag that disables compression when set; optional, default
-        ]]></description>
-      </attribute>
-      <attribute name="password" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[SourceSafe password; optional.]]></short-description>
-        <description><![CDATA[
-          Set the SourceSafe password; optional.
-        ]]></description>
-      </attribute>
-      <attribute name="projectpath" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[SourceSafe project path without the "$" prefix; required.]]></short-description>
-        <description><![CDATA[
-          Set the SourceSafe project path without the "$" prefix; required
-        ]]></description>
-      </attribute>
-      <attribute name="recursive" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Flag to recursively apply the action (not valid
- on all SOS tasks ); optional, default false.]]></short-description>
-        <description><![CDATA[
-          Flag to recursively apply the action (not valid
- on all SOS tasks ); optional, default false
-        ]]></description>
-      </attribute>
-      <attribute name="soscmd" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Directory where soscmd(.exe) is located;
- optional, soscmd must be on the path if omitted.]]></short-description>
-        <description><![CDATA[
-          Set the directory where soscmd(.exe) is located;
- optional, soscmd must be on the path if omitted.
-        ]]></description>
-      </attribute>
-      <attribute name="soshome" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[The path to the SourceOffSite home directory.]]></short-description>
-        <description><![CDATA[
-          The path to the SourceOffSite home directory
-        ]]></description>
-      </attribute>
-      <attribute name="sosserverpath" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Address and port of SourceOffSite Server,
- eg. 192.168.0.1:8888 ; required.]]></short-description>
-        <description><![CDATA[
-          Set the address and port of SourceOffSite Server,
- eg. 192.168.0.1:8888 ; required.
-        ]]></description>
-      </attribute>
-      <attribute name="username" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[SourceSafe username; required.]]></short-description>
-        <description><![CDATA[
-          Set the SourceSafe username; required.
-        ]]></description>
-      </attribute>
-      <attribute name="verbose" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Enable verbose output; optional, default false.]]></short-description>
-        <description><![CDATA[
-          Enable verbose output; optional, default false
-        ]]></description>
-      </attribute>
-      <attribute name="version" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[A version number to get - 
- only works with the SOSGet on a file; optional.]]></short-description>
-        <description><![CDATA[
-          Set the a version number to get - 
- only works with the SOSGet on a file; optional.
-        ]]></description>
-      </attribute>
-      <attribute name="vssserverpath" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Path to the location of the ss.ini file; 
- required.]]></short-description>
-        <description><![CDATA[
-          Set the path to the location of the ss.ini file; 
- required.
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="soscheckout" category="other"
-      classname="org.apache.tools.ant.taskdefs.optional.sos.SOSCheckout"
-      >
-
-  <short-description><![CDATA[Retrieves and locks files in Visual SourceSafe via a SourceOffSite server.]]></short-description>
-  <description>
-    <![CDATA[Retrieves and locks files in Visual SourceSafe via a SourceOffSite server.
-
- <p>
- The following attributes are interpretted:
- <table border="1">
-   <tr>
-     <th>Attribute</th>
-     <th>Values</th>
-     <th>Required</th>
-   </tr>
-   <tr>
-     <td>soscmddir</td>
-     <td>Directory which contains soscmd(.exe) <br>
-     soscmd(.exe) must be in the path if this is not specified</td>
-     <td>No</td>
-   </tr>
-   <tr>
-      <td>vssserverpath</td>
-      <td>path to the srcsafe.ini  - eg. \\server\vss\srcsafe.ini</td>
-      <td>Yes</td>
-   </tr>
-   <tr>
-      <td>sosserverpath</td>
-      <td>address and port of the SOS server  - eg. 192.168.0.1:8888</td>
-      <td>Yes</td>
-   </tr>
-   <tr>
-      <td>projectpath</td>
-      <td>SourceSafe project path without the "$"</td>
-      <td>Yes</td>
-   </tr>
-   <tr>
-      <td>file</td>
-      <td>Filename to act upon<br> If no file is specified then act upon the project</td>
-      <td>No</td>
-   </tr>
-   <tr>
-      <td>username</td>
-      <td>SourceSafe username</td>
-      <td>Yes</td>
-   </tr>
-   <tr>
-      <td>password</td>
-      <td>SourceSafe password</td>
-      <td>No</td>
-   </tr>
-   <tr>
-      <td>localpath</td>
-      <td>Override the working directory and get to the specified path</td>
-      <td>No</td>
-   </tr>
-   <tr>
-      <td>soshome</td>
-      <td>The path to the SourceOffSite home directory</td>
-      <td>No</td>
-   </tr>
-   <tr>
-      <td>nocompression</td>
-      <td>true or false - disable compression</td>
-      <td>No</td>
-   </tr>
-   <tr>
-      <td>recursive</td>
-      <td>true or false - Only works with the CheckOutProject command</td>
-      <td>No</td>
-   </tr>
-   <tr>
-      <td>nocache</td>
-      <td>true or false - Only needed if SOSHOME is set as an enviroment variable</td>
-      <td>No</td>
-   </tr>
-   <tr>
-      <td>verbose</td>
-      <td>true or false - Status messages are displayed</td>
-      <td>No</td>
-   </tr>
- </table>]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="comment" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Comment to apply to all files being labelled;
- optional, only valid in SOSLabel.]]></short-description>
-        <description><![CDATA[
-          Set the comment to apply to all files being labelled;
- optional, only valid in SOSLabel
-        ]]></description>
-      </attribute>
-      <attribute name="file" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Filename to act upon; optional.]]></short-description>
-        <description><![CDATA[
-          Set the Filename to act upon; optional.
- If no file is specified then the tasks 
- act upon the project
-        ]]></description>
-      </attribute>
-      <attribute name="label" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Labeled version to operate on in SourceSafe.]]></short-description>
-        <description><![CDATA[
-          Set the labeled version to operate on in SourceSafe
-        ]]></description>
-      </attribute>
-      <attribute name="localpath" type="org.apache.tools.ant.types.Path"
-                 briefType="Path" required="NOTDEFINED">
-        <short-description><![CDATA[Override the working directory and get to the specified path; optional.]]></short-description>
-        <description><![CDATA[
-          Override the working directory and get to the specified path; optional.
-        ]]></description>
-      </attribute>
-      <attribute name="nocache" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Flag to disable the cache when set;
- optional needed if SOSHOME is set as an environment variable.]]></short-description>
-        <description><![CDATA[
-          flag to disable the cache when set;
- optional needed if SOSHOME is set as an environment variable.
-        ]]></description>
-      </attribute>
-      <attribute name="nocompress" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Flag that disables compression when set; optional, default.]]></short-description>
-        <description><![CDATA[
-          Flag that disables compression when set; optional, default
-        ]]></description>
-      </attribute>
-      <attribute name="password" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[SourceSafe password; optional.]]></short-description>
-        <description><![CDATA[
-          Set the SourceSafe password; optional.
-        ]]></description>
-      </attribute>
-      <attribute name="projectpath" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[SourceSafe project path without the "$" prefix; required.]]></short-description>
-        <description><![CDATA[
-          Set the SourceSafe project path without the "$" prefix; required
-        ]]></description>
-      </attribute>
-      <attribute name="recursive" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Flag to recursively apply the action (not valid
- on all SOS tasks ); optional, default false.]]></short-description>
-        <description><![CDATA[
-          Flag to recursively apply the action (not valid
- on all SOS tasks ); optional, default false
-        ]]></description>
-      </attribute>
-      <attribute name="soscmd" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Directory where soscmd(.exe) is located;
- optional, soscmd must be on the path if omitted.]]></short-description>
-        <description><![CDATA[
-          Set the directory where soscmd(.exe) is located;
- optional, soscmd must be on the path if omitted.
-        ]]></description>
-      </attribute>
-      <attribute name="soshome" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[The path to the SourceOffSite home directory.]]></short-description>
-        <description><![CDATA[
-          The path to the SourceOffSite home directory
-        ]]></description>
-      </attribute>
-      <attribute name="sosserverpath" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Address and port of SourceOffSite Server,
- eg. 192.168.0.1:8888 ; required.]]></short-description>
-        <description><![CDATA[
-          Set the address and port of SourceOffSite Server,
- eg. 192.168.0.1:8888 ; required.
-        ]]></description>
-      </attribute>
-      <attribute name="username" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[SourceSafe username; required.]]></short-description>
-        <description><![CDATA[
-          Set the SourceSafe username; required.
-        ]]></description>
-      </attribute>
-      <attribute name="verbose" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Enable verbose output; optional, default false.]]></short-description>
-        <description><![CDATA[
-          Enable verbose output; optional, default false
-        ]]></description>
-      </attribute>
-      <attribute name="version" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[A version number to get - 
- only works with the SOSGet on a file; optional.]]></short-description>
-        <description><![CDATA[
-          Set the a version number to get - 
- only works with the SOSGet on a file; optional.
-        ]]></description>
-      </attribute>
-      <attribute name="vssserverpath" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Path to the location of the ss.ini file; 
- required.]]></short-description>
-        <description><![CDATA[
-          Set the path to the location of the ss.ini file; 
- required.
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="sosget" category="other"
-      classname="org.apache.tools.ant.taskdefs.optional.sos.SOSGet"
-      >
-
-  <short-description><![CDATA[Retrieves a read-only copy of the specified project or file from Visual SourceSafe via a SourceOffSite server.]]></short-description>
-  <description>
-    <![CDATA[Retrieves a read-only copy of the specified project or file
- from Visual SourceSafe via a SourceOffSite server.
- <p>
- The following attributes are interpretted:
- <table border="1">
-    <tbody>
-      <tr>
-         <th>Attribute</th>
-         <th>Values</th>
-         <th>Required</th>
-       </tr>
-       <tr>
-         <td>soscmddir</td>
-         <td>Directory which contains soscmd(.exe) <br>
-         soscmd(.exe) must be in the path if this is not specified</td>
-         <td>No</td>
-       </tr>
-       <tr>
-          <td>vssserverpath</td>
-          <td>path to the srcsafe.ini  - eg. \\server\vss\srcsafe.ini</td>
-          <td>Yes</td>
-       </tr>
-       <tr>
-          <td>sosserverpath</td>
-          <td>address and port of the SOS server  - eg. 192.168.0.1:8888</td>
-          <td>Yes</td>
-       </tr>
-       <tr>
-          <td>projectpath</td>
-          <td>SourceSafe project path without the "$"</td>
-          <td>Yes</td>
-       </tr>
-       <tr>
-          <td>file</td>
-          <td>Filename to act upon<br>
-              If no file is specified then act upon the project</td>
-          <td>No</td>
-       </tr>
-       <tr>
-          <td>username</td>
-          <td>SourceSafe username</td>
-          <td>Yes</td>
-       </tr>
-       <tr>
-          <td>password</td>
-          <td>SourceSafe password</td>
-          <td>No</td>
-       </tr>
-       <tr>
-          <td>localpath</td>
-          <td>Override the working directory and get to the specified path</td>
-          <td>No</td>
-       </tr>
-       <tr>
-          <td>soshome</td>
-          <td>The path to the SourceOffSite home directory</td>
-          <td>No</td>
-       </tr>
-       <tr>
-          <td>nocompression</td>
-          <td>true or false - disable compression</td>
-          <td>No</td>
-       </tr>
-       <tr>
-          <td>recursive</td>
-          <td>true or false - Only works with the GetProject command</td>
-          <td>No</td>
-       </tr>
-       <tr>
-          <td>version</td>
-          <td>a version number to get - Only works with the GetFile command</td>
-          <td>No</td>
-       </tr>
-       <tr>
-          <td>label</td>
-          <td>a label version to get - Only works with the GetProject command</td>
-          <td>No</td>
-       </tr>
-       <tr>
-          <td>nocache</td>
-          <td>true or false - Only needed if SOSHOME is set as an enviroment variable</td>
-          <td>No</td>
-       </tr>
-       <tr>
-          <td>verbose</td>
-         <td>true or false - Status messages are displayed</td>
-        <td>No</td>
-      </tr>]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="comment" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Comment to apply to all files being labelled;
- optional, only valid in SOSLabel.]]></short-description>
-        <description><![CDATA[
-          Set the comment to apply to all files being labelled;
- optional, only valid in SOSLabel
-        ]]></description>
-      </attribute>
-      <attribute name="file" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Filename to act upon; optional.]]></short-description>
-        <description><![CDATA[
-          Set the Filename to act upon; optional.
- If no file is specified then the tasks 
- act upon the project
-        ]]></description>
-      </attribute>
-      <attribute name="label" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Labeled version to operate on in SourceSafe.]]></short-description>
-        <description><![CDATA[
-          Set the labeled version to operate on in SourceSafe
-        ]]></description>
-      </attribute>
-      <attribute name="localpath" type="org.apache.tools.ant.types.Path"
-                 briefType="Path" required="NOTDEFINED">
-        <short-description><![CDATA[Override the working directory and get to the specified path; optional.]]></short-description>
-        <description><![CDATA[
-          Override the working directory and get to the specified path; optional.
-        ]]></description>
-      </attribute>
-      <attribute name="nocache" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Flag to disable the cache when set;
- optional needed if SOSHOME is set as an environment variable.]]></short-description>
-        <description><![CDATA[
-          flag to disable the cache when set;
- optional needed if SOSHOME is set as an environment variable.
-        ]]></description>
-      </attribute>
-      <attribute name="nocompress" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Flag that disables compression when set; optional, default.]]></short-description>
-        <description><![CDATA[
-          Flag that disables compression when set; optional, default
-        ]]></description>
-      </attribute>
-      <attribute name="password" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[SourceSafe password; optional.]]></short-description>
-        <description><![CDATA[
-          Set the SourceSafe password; optional.
-        ]]></description>
-      </attribute>
-      <attribute name="projectpath" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[SourceSafe project path without the "$" prefix; required.]]></short-description>
-        <description><![CDATA[
-          Set the SourceSafe project path without the "$" prefix; required
-        ]]></description>
-      </attribute>
-      <attribute name="recursive" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Flag to recursively apply the action (not valid
- on all SOS tasks ); optional, default false.]]></short-description>
-        <description><![CDATA[
-          Flag to recursively apply the action (not valid
- on all SOS tasks ); optional, default false
-        ]]></description>
-      </attribute>
-      <attribute name="soscmd" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Directory where soscmd(.exe) is located;
- optional, soscmd must be on the path if omitted.]]></short-description>
-        <description><![CDATA[
-          Set the directory where soscmd(.exe) is located;
- optional, soscmd must be on the path if omitted.
-        ]]></description>
-      </attribute>
-      <attribute name="soshome" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[The path to the SourceOffSite home directory.]]></short-description>
-        <description><![CDATA[
-          The path to the SourceOffSite home directory
-        ]]></description>
-      </attribute>
-      <attribute name="sosserverpath" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Address and port of SourceOffSite Server,
- eg. 192.168.0.1:8888 ; required.]]></short-description>
-        <description><![CDATA[
-          Set the address and port of SourceOffSite Server,
- eg. 192.168.0.1:8888 ; required.
-        ]]></description>
-      </attribute>
-      <attribute name="username" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[SourceSafe username; required.]]></short-description>
-        <description><![CDATA[
-          Set the SourceSafe username; required.
-        ]]></description>
-      </attribute>
-      <attribute name="verbose" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Enable verbose output; optional, default false.]]></short-description>
-        <description><![CDATA[
-          Enable verbose output; optional, default false
-        ]]></description>
-      </attribute>
-      <attribute name="version" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[A version number to get - 
- only works with the SOSGet on a file; optional.]]></short-description>
-        <description><![CDATA[
-          Set the a version number to get - 
- only works with the SOSGet on a file; optional.
-        ]]></description>
-      </attribute>
-      <attribute name="vssserverpath" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Path to the location of the ss.ini file; 
- required.]]></short-description>
-        <description><![CDATA[
-          Set the path to the location of the ss.ini file; 
- required.
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="soslabel" category="other"
-      classname="org.apache.tools.ant.taskdefs.optional.sos.SOSLabel"
-      >
-
-  <short-description><![CDATA[Labels Visual SourceSafe files via a SourceOffSite server.]]></short-description>
-  <description>
-    <![CDATA[Labels Visual SourceSafe files via a SourceOffSite server.
- <p>
- The following attributes are interpreted:
- <table border="1">
-   <tr>
-     <th>Attribute</th>
-     <th>Values</th>
-     <th>Required</th>
-   </tr>
-   <tr>
-     <td>soscmddir</td>
-     <td>Directory which contains soscmd(.exe) <br>
-     soscmd(.exe) must be in the path if this is not specified</td>
-     <td>No</td>
-   </tr>
-   <tr>
-      <td>vssserverpath</td>
-      <td>path to the srcsafe.ini  - eg. \\server\vss\srcsafe.ini</td>
-      <td>Yes</td>
-   </tr>
-   <tr>
-      <td>sosserverpath</td>
-      <td>address and port of the SOS server  - eg. 192.168.0.1:8888</td>
-      <td>Yes</td>
-   </tr>
-   <tr>
-      <td>projectpath</td>
-      <td>SourceSafe project path without the "$"</td>
-      <td>Yes</td>
-   </tr>
-   <tr>
-      <td>username</td>
-      <td>SourceSafe username</td>
-      <td>Yes</td>
-   </tr>
-   <tr>
-      <td>password</td>
-      <td>SourceSafe password</td>
-      <td>No</td>
-   </tr>
-   <tr>
-      <td>label</td>
-      <td>The label to apply to a project</td>
-      <td>Yes</td>
-   </tr>
-   <tr>
-      <td>comment</td>
-      <td>A comment to be applied to all files being labeled</td>
-      <td>No</td>
-   </tr>
-   <tr>
-      <td>verbose</td>
-      <td>true or false - Status messages are displayed</td>
-      <td>No</td>
-   </tr>
- </table>]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="comment" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Comment to apply to all files being labelled;
- optional, only valid in SOSLabel.]]></short-description>
-        <description><![CDATA[
-          Set the comment to apply to all files being labelled;
- optional, only valid in SOSLabel
-        ]]></description>
-      </attribute>
-      <attribute name="file" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Filename to act upon; optional.]]></short-description>
-        <description><![CDATA[
-          Set the Filename to act upon; optional.
- If no file is specified then the tasks 
- act upon the project
-        ]]></description>
-      </attribute>
-      <attribute name="label" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Labeled version to operate on in SourceSafe.]]></short-description>
-        <description><![CDATA[
-          Set the labeled version to operate on in SourceSafe
-        ]]></description>
-      </attribute>
-      <attribute name="localpath" type="org.apache.tools.ant.types.Path"
-                 briefType="Path" required="NOTDEFINED">
-        <short-description><![CDATA[Override the working directory and get to the specified path; optional.]]></short-description>
-        <description><![CDATA[
-          Override the working directory and get to the specified path; optional.
-        ]]></description>
-      </attribute>
-      <attribute name="nocache" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Flag to disable the cache when set;
- optional needed if SOSHOME is set as an environment variable.]]></short-description>
-        <description><![CDATA[
-          flag to disable the cache when set;
- optional needed if SOSHOME is set as an environment variable.
-        ]]></description>
-      </attribute>
-      <attribute name="nocompress" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Flag that disables compression when set; optional, default.]]></short-description>
-        <description><![CDATA[
-          Flag that disables compression when set; optional, default
-        ]]></description>
-      </attribute>
-      <attribute name="password" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[SourceSafe password; optional.]]></short-description>
-        <description><![CDATA[
-          Set the SourceSafe password; optional.
-        ]]></description>
-      </attribute>
-      <attribute name="projectpath" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[SourceSafe project path without the "$" prefix; required.]]></short-description>
-        <description><![CDATA[
-          Set the SourceSafe project path without the "$" prefix; required
-        ]]></description>
-      </attribute>
-      <attribute name="recursive" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Flag to recursively apply the action (not valid
- on all SOS tasks ); optional, default false.]]></short-description>
-        <description><![CDATA[
-          Flag to recursively apply the action (not valid
- on all SOS tasks ); optional, default false
-        ]]></description>
-      </attribute>
-      <attribute name="soscmd" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Directory where soscmd(.exe) is located;
- optional, soscmd must be on the path if omitted.]]></short-description>
-        <description><![CDATA[
-          Set the directory where soscmd(.exe) is located;
- optional, soscmd must be on the path if omitted.
-        ]]></description>
-      </attribute>
-      <attribute name="soshome" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[The path to the SourceOffSite home directory.]]></short-description>
-        <description><![CDATA[
-          The path to the SourceOffSite home directory
-        ]]></description>
-      </attribute>
-      <attribute name="sosserverpath" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Address and port of SourceOffSite Server,
- eg. 192.168.0.1:8888 ; required.]]></short-description>
-        <description><![CDATA[
-          Set the address and port of SourceOffSite Server,
- eg. 192.168.0.1:8888 ; required.
-        ]]></description>
-      </attribute>
-      <attribute name="username" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[SourceSafe username; required.]]></short-description>
-        <description><![CDATA[
-          Set the SourceSafe username; required.
-        ]]></description>
-      </attribute>
-      <attribute name="verbose" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Enable verbose output; optional, default false.]]></short-description>
-        <description><![CDATA[
-          Enable verbose output; optional, default false
-        ]]></description>
-      </attribute>
-      <attribute name="version" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[A version number to get - 
- only works with the SOSGet on a file; optional.]]></short-description>
-        <description><![CDATA[
-          Set the a version number to get - 
- only works with the SOSGet on a file; optional.
-        ]]></description>
-      </attribute>
-      <attribute name="vssserverpath" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Path to the location of the ss.ini file; 
- required.]]></short-description>
-        <description><![CDATA[
-          Set the path to the location of the ss.ini file; 
- required.
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="sound" category="other"
-      classname="org.apache.tools.ant.taskdefs.optional.sound.SoundTask"
-      >
-
-  <short-description><![CDATA[Plays a sound file at the end of the build, according to whether the build failed or succeeded.]]></short-description>
-  <description>
-    <![CDATA[Plays a sound file at the end of the build, according to whether the build failed or succeeded.
-
- There are three attributes to be set:
-
- <code>source</code>: the location of the audio file to be played
- <code>duration</code>: play the sound file continuously until "duration" milliseconds has expired
- <code>loops</code>: the number of times the sound file should be played until stopped
-
- I have only tested this with .WAV and .AIFF sound file formats. Both seem
- to work fine.
-
- plans for the future:
- - use the midi api to define sounds (or drum beat etc) in xml and have
-   Ant play them back]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-    </attributes>
-
-    <elements>
-      <element name="fail" type="org.apache.tools.ant.taskdefs.optional.sound.SoundTask.BuildAlert"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[Add a sound when the build fails.]]></short-description>
-        <description>
-          <![CDATA[add a sound when the build fails]]>
-        </description>
-      </element>
-
-      <element name="success" type="org.apache.tools.ant.taskdefs.optional.sound.SoundTask.BuildAlert"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[Add a sound when the build succeeds.]]></short-description>
-        <description>
-          <![CDATA[add a sound when the build succeeds]]>
-        </description>
-      </element>
-
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="splash" category="other"
-      classname="org.apache.tools.ant.taskdefs.optional.splash.SplashTask"
-      >
-
-  <short-description><![CDATA[Creates a splash screen.]]></short-description>
-  <description>
-    <![CDATA[Creates a splash screen. The splash screen is displayed
- for the duration of the build and includes a handy progress bar as
- well. Use in conjunction with the sound task to provide interest
- whilst waiting for your builds to complete...]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="imageurl" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[A URL pointing to an image to display; optional, default antlogo.gif
- from the classpath.]]></short-description>
-        <description><![CDATA[
-          A URL pointing to an image to display; optional, default antlogo.gif
- from the classpath.
-        ]]></description>
-      </attribute>
-      <attribute name="password" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Proxy password; required if <tt>user</tt> is set.]]></short-description>
-        <description><![CDATA[
-          Proxy password; required if <tt>user</tt> is set.
-        ]]></description>
-      </attribute>
-      <attribute name="port" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Proxy port; optional, default 80.]]></short-description>
-        <description><![CDATA[
-          Proxy port; optional, default 80.
-        ]]></description>
-      </attribute>
-      <attribute name="proxy" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Name of proxy; optional.]]></short-description>
-        <description><![CDATA[
-          name of proxy; optional.
-        ]]></description>
-      </attribute>
-      <attribute name="showduration" type="int"
-                 briefType="int" required="NOTDEFINED">
-        <short-description><![CDATA[How long to show the splash screen in milliseconds,
- optional; default 5000 ms.]]></short-description>
-        <description><![CDATA[
-          how long to show the splash screen in milliseconds,
- optional; default 5000 ms.
-        ]]></description>
-      </attribute>
-      <attribute name="user" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Proxy user; optional, default =none.]]></short-description>
-        <description><![CDATA[
-          Proxy user; optional, default =none.
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="sql" category="database"
-      classname="org.apache.tools.ant.taskdefs.SQLExec"
-      >
-
-  <short-description><![CDATA[Executes a series of SQL statements on a database using JDBC.]]></short-description>
-  <description>
-    <![CDATA[Executes a series of SQL statements on a database using JDBC.
-
- <p>Statements can
- either be read in from a text file using the <i>src</i> attribute or from 
- between the enclosing SQL tags.</p>
- <p>Multiple statements can be provided, separated by semicolons (or the 
- defined <i>delimiter</i>). Individual lines within the statements can be 
- commented using either --, // or REM at the start of the line.</p>
- <p>The <i>autocommit</i> attribute specifies whether auto-commit should be 
- turned on or off whilst executing the statements. If auto-commit is turned 
- on each statement will be executed and committed. If it is turned off the 
- statements will all be executed as one transaction.</p>
- <p>The <i>onerror</i> attribute specifies how to proceed when an error occurs 
- during the execution of one of the statements. 
- The possible values are: <b>continue</b> execution, only show the error;
- <b>stop</b> execution and commit transaction;
- and <b>abort</b> execution and transaction and fail task.</p>]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="append" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Whether output should be appended to or overwrite
- an existing file.]]></short-description>
-        <description><![CDATA[
-          whether output should be appended to or overwrite
- an existing file.  Defaults to false.
-        ]]></description>
-      </attribute>
-      <attribute name="autocommit" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Auto commit flag for database connection;
- optional, default false.]]></short-description>
-        <description><![CDATA[
-          Auto commit flag for database connection;
- optional, default false.
-        ]]></description>
-      </attribute>
-      <attribute name="caching" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Caching loaders / driver.]]></short-description>
-        <description><![CDATA[
-          Caching loaders / driver. This is to avoid
- getting an OutOfMemoryError when calling this task
- multiple times in a row; default: true
-        ]]></description>
-      </attribute>
-      <attribute name="classpath" type="org.apache.tools.ant.types.Path"
-                 briefType="Path" required="NOTDEFINED">
-        <short-description><![CDATA[Classpath for loading the driver.]]></short-description>
-        <description><![CDATA[
-          Sets the classpath for loading the driver.
-        ]]></description>
-      </attribute>
-      <attribute name="classpathref" type="org.apache.tools.ant.types.Reference"
-                 briefType="Reference" required="NOTDEFINED">
-        <short-description><![CDATA[Classpath for loading the driver 
- using the classpath reference.]]></short-description>
-        <description><![CDATA[
-          Set the classpath for loading the driver 
- using the classpath reference.
-        ]]></description>
-      </attribute>
-      <attribute name="delimiter" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Delimiter that separates SQL statements; 
- optional, default &quot;;&quot;
-
- <p>For example, set this to "go" and delimitertype to "ROW" for
- Sybase ASE or MS SQL Server.</p>.]]></short-description>
-        <description><![CDATA[
-          Set the delimiter that separates SQL statements; 
- optional, default &quot;;&quot;
-
- <p>For example, set this to "go" and delimitertype to "ROW" for
- Sybase ASE or MS SQL Server.</p>
-        ]]></description>
-      </attribute>
-      <attribute name="delimitertype" type="org.apache.tools.ant.taskdefs.SQLExec.DelimiterType"
-                 briefType="&quot;normal&quot;, &quot;row&quot;" required="NOTDEFINED">
-        <short-description><![CDATA[Delimiter type: "normal" or "row" (default "normal").]]></short-description>
-        <description><![CDATA[
-          Set the delimiter type: "normal" or "row" (default "normal").
-
- <p>The delimiter type takes two values - normal and row. Normal
- means that any occurence of the delimiter terminate the SQL
- command whereas with row, only a line containing just the
- delimiter is recognized as the end of the command.</p>
-        ]]></description>
-      </attribute>
-      <attribute name="driver" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Class name of the JDBC driver; required.]]></short-description>
-        <description><![CDATA[
-          Class name of the JDBC driver; required.
-        ]]></description>
-      </attribute>
-      <attribute name="encoding" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[File encoding to use on the SQL files read in.]]></short-description>
-        <description><![CDATA[
-          Set the file encoding to use on the SQL files read in
-        ]]></description>
-      </attribute>
-      <attribute name="onerror" type="org.apache.tools.ant.taskdefs.SQLExec.OnError"
-                 briefType="&quot;continue&quot;, &quot;stop&quot;, &quot;abort&quot;" required="NOTDEFINED">
-        <short-description><![CDATA[Action to perform when statement fails: continue, stop, or abort
- optional; default &quot;abort&quot;.]]></short-description>
-        <description><![CDATA[
-          Action to perform when statement fails: continue, stop, or abort
- optional; default &quot;abort&quot;
-        ]]></description>
-      </attribute>
-      <attribute name="output" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[Output file; 
- optional, defaults to the Ant log.]]></short-description>
-        <description><![CDATA[
-          Set the output file; 
- optional, defaults to the Ant log.
-        ]]></description>
-      </attribute>
-      <attribute name="password" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Password; required.]]></short-description>
-        <description><![CDATA[
-          Sets the password; required.
-        ]]></description>
-      </attribute>
-      <attribute name="print" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Print result sets from the statements;
- optional, default false.]]></short-description>
-        <description><![CDATA[
-          Print result sets from the statements;
- optional, default false
-        ]]></description>
-      </attribute>
-      <attribute name="rdbms" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Execute task only if the lower case product name 
- of the DB matches this.]]></short-description>
-        <description><![CDATA[
-          Execute task only if the lower case product name 
- of the DB matches this
-        ]]></description>
-      </attribute>
-      <attribute name="showheaders" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Print headers for result sets from the 
- statements; optional, default true.]]></short-description>
-        <description><![CDATA[
-          Print headers for result sets from the 
- statements; optional, default true.
-        ]]></description>
-      </attribute>
-      <attribute name="src" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[Name of the SQL file to be run.]]></short-description>
-        <description><![CDATA[
-          Set the name of the SQL file to be run.
- Required unless statements are enclosed in the buildfile
-        ]]></description>
-      </attribute>
-      <attribute name="url" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Database connection URL; required.]]></short-description>
-        <description><![CDATA[
-          Sets the database connection URL; required.
-        ]]></description>
-      </attribute>
-      <attribute name="userid" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[User name for the connection; required.]]></short-description>
-        <description><![CDATA[
-          Set the user name for the connection; required.
-        ]]></description>
-      </attribute>
-      <attribute name="version" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Version string, execute task only if 
- rdbms version match; optional.]]></short-description>
-        <description><![CDATA[
-          Sets the version string, execute task only if 
- rdbms version match; optional.
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-      <element name="fileset" type="org.apache.tools.ant.types.FileSet"
-               briefType="Fileset"
-               required="NOTDEFINED">
-        <short-description><![CDATA[Adds a set of files (nested fileset attribute).]]></short-description>
-        <description>
-          <![CDATA[Adds a set of files (nested fileset attribute).]]>
-        </description>
-      </element>
-
-      <element name="classpath" type="org.apache.tools.ant.types.Path"
-               briefType="Path"
-               required="NOTDEFINED">
-        <short-description><![CDATA[Add a path to the classpath for loading the driver.]]></short-description>
-        <description>
-          <![CDATA[Add a path to the classpath for loading the driver.]]>
-        </description>
-      </element>
-
-      <element name="transaction" type="org.apache.tools.ant.taskdefs.SQLExec.Transaction"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[Add a SQL transaction to execute.]]></short-description>
-        <description>
-          <![CDATA[Add a SQL transaction to execute]]>
-        </description>
-      </element>
-
-    </elements>
-
-      <body >
-        <description><![CDATA[
-          Set an inline SQL command to execute. 
- NB: Properties are not expanded in this text.
-        ]]></description>
-      </body>
-
-  </structure>
-
-</task>
-
-
-<task name="stylebook" category="other"
-      classname="org.apache.tools.ant.taskdefs.optional.StyleBook"
-      >
-
-  <short-description><![CDATA[Executes the Apache Stylebook documentation generator.]]></short-description>
-  <description>
-    <![CDATA[Executes the Apache Stylebook documentation generator.
- Unlike the commandline version of this tool, all three arguments
- are required to run stylebook.
- <p>
- Being extended from &lt;Java&gt;, all the parent's attributes
- and options are available. Do not set any apart from the <tt>classpath</tt>
- as they are not guaranteed to be there in future.]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="append" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[If true, append output to existing file.]]></short-description>
-        <description><![CDATA[
-          If true, append output to existing file.
-        ]]></description>
-      </attribute>
-      <attribute name="book" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[The book xml file that the documentation generation starts from; 
- required.]]></short-description>
-        <description><![CDATA[
-          The book xml file that the documentation generation starts from; 
- required.
-        ]]></description>
-      </attribute>
-      <attribute name="classname" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Java class to execute.]]></short-description>
-        <description><![CDATA[
-          Sets the Java class to execute.
-        ]]></description>
-      </attribute>
-      <attribute name="classpath" type="org.apache.tools.ant.types.Path"
-                 briefType="Path" required="NOTDEFINED">
-        <short-description><![CDATA[Classpath to be used when running the Java class.]]></short-description>
-        <description><![CDATA[
-          Set the classpath to be used when running the Java class
-        ]]></description>
-      </attribute>
-      <attribute name="classpathref" type="org.apache.tools.ant.types.Reference"
-                 briefType="Reference" required="NOTDEFINED">
-        <short-description><![CDATA[Classpath to use, by reference.]]></short-description>
-        <description><![CDATA[
-          Classpath to use, by reference.
-        ]]></description>
-      </attribute>
-      <attribute name="dir" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[The working directory of the process.]]></short-description>
-        <description><![CDATA[
-          The working directory of the process
-        ]]></description>
-      </attribute>
-      <attribute name="failonerror" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[If true, then fail if the command exits with a
- returncode other than 0.]]></short-description>
-        <description><![CDATA[
-          If true, then fail if the command exits with a
- returncode other than 0
-        ]]></description>
-      </attribute>
-      <attribute name="fork" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[If true, execute in a new VM.]]></short-description>
-        <description><![CDATA[
-          If true, execute in a new VM.
-        ]]></description>
-      </attribute>
-      <attribute name="jvmversion" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[JVM version.]]></short-description>
-        <description><![CDATA[
-          Sets the JVM version.
-        ]]></description>
-      </attribute>
-      <attribute name="jar" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[The location of the JAR file to execute.]]></short-description>
-        <description><![CDATA[
-          The location of the JAR file to execute.
-        ]]></description>
-      </attribute>
-      <attribute name="jvm" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Command used to start the VM (only if not forking).]]></short-description>
-        <description><![CDATA[
-          Set the command used to start the VM (only if not forking).
-        ]]></description>
-      </attribute>
-      <attribute name="jvmargs" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Command line arguments for the JVM.]]></short-description>
-        <description><![CDATA[
-          Set the command line arguments for the JVM.
-        ]]></description>
-      </attribute>
-      <attribute name="loaderconfig" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[A loader configuration to send to stylebook; optional.]]></short-description>
-        <description><![CDATA[
-          A loader configuration to send to stylebook; optional.
-        ]]></description>
-      </attribute>
-      <attribute name="maxmemory" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Corresponds to -mx or -Xmx depending on VM version.]]></short-description>
-        <description><![CDATA[
-          Corresponds to -mx or -Xmx depending on VM version.
-        ]]></description>
-      </attribute>
-      <attribute name="newenvironment" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[If true, use a completely new environment.]]></short-description>
-        <description><![CDATA[
-          If true, use a completely new environment.
-
- <p>Will be ignored if we are not forking a new VM.
-        ]]></description>
-      </attribute>
-      <attribute name="output" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[File the output of the process is redirected to.]]></short-description>
-        <description><![CDATA[
-          File the output of the process is redirected to.
-        ]]></description>
-      </attribute>
-      <attribute name="skindirectory" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[The directory that contains the stylebook skin;
- required.]]></short-description>
-        <description><![CDATA[
-          the directory that contains the stylebook skin;
- required.
-        ]]></description>
-      </attribute>
-      <attribute name="targetdirectory" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[The destination directory where the documentation is generated;
- required.]]></short-description>
-        <description><![CDATA[
-          the destination directory where the documentation is generated;
- required.
-        ]]></description>
-      </attribute>
-      <attribute name="timeout" type="java.lang.Long"
-                 briefType="long" required="NOTDEFINED">
-        <short-description><![CDATA[Timeout in milliseconds after which the process will be killed.]]></short-description>
-        <description><![CDATA[
-          Timeout in milliseconds after which the process will be killed.
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-      <element name="env" type="org.apache.tools.ant.types.Environment.Variable"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[Adds an environment variable.]]></short-description>
-        <description>
-          <![CDATA[Adds an environment variable.
-
- <p>Will be ignored if we are not forking a new VM.]]>
-        </description>
-      </element>
-
-      <element name="sysproperty" type="org.apache.tools.ant.types.Environment.Variable"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[Adds a system property.]]></short-description>
-        <description>
-          <![CDATA[Adds a system property.]]>
-        </description>
-      </element>
-
-      <element name="arg" type="org.apache.tools.ant.types.Commandline.Argument"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[Adds a command-line argument.]]></short-description>
-        <description>
-          <![CDATA[Adds a command-line argument.]]>
-        </description>
-      </element>
-
-      <element name="classpath" type="org.apache.tools.ant.types.Path"
-               briefType="Path"
-               required="NOTDEFINED">
-        <short-description><![CDATA[Adds a path to the classpath.]]></short-description>
-        <description>
-          <![CDATA[Adds a path to the classpath.]]>
-        </description>
-      </element>
-
-      <element name="jvmarg" type="org.apache.tools.ant.types.Commandline.Argument"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[Adds a JVM argument.]]></short-description>
-        <description>
-          <![CDATA[Adds a JVM argument.]]>
-        </description>
-      </element>
-
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="tar" category="packaging"
-      classname="org.apache.tools.ant.taskdefs.Tar"
-      matchingTask="true">
-
-  <!-- tar task -->
-<external>
-<description>
-<p>Creates a tar archive.</p>
-
-<p>The <i>basedir</i> attribute is the reference directory from where to tar.</p>
-
-<p>This task is a <a href="../dirtasks.html#directorybasedtasks">directory based task</a>
-and, as such, forms an implicit <a href="../CoreTypes/fileset.html">Fileset</a>. This
-defines which files, relative to the <i>basedir</i>, will be included in the
-archive. The tar task supports all the attributes of Fileset to refine the
-set of files to be included in the implicit fileset.</p>
-
-<p>In addition to the implicit fileset, the tar task supports nested filesets. These
-filesets are extended to allow control over the access mode, username and groupname
-to be applied to the tar entries. This is useful, for example, when preparing archives for
-Unix systems where some files need to have execute permission.</p>
-
-<p>Early versions of tar did not support path lengths greater than 100
-characters. Modern versions of tar do so, but in incompatible ways.
-The behaviour of the tar task when it encounters such paths is
-controlled by the <i>longfile</i> attribute.
-If the longfile attribute is set to <code>fail</code>, any long paths will
-cause the tar task to fail.  If the longfile attribute is set to
-<code>truncate</code>, any long paths will be truncated to the 100 character
-maximum length prior to adding to the archive. If the value of the longfile
-attribute is set to <code>omit</code> then files containing long paths will be
-omitted from the archive.  Either option ensures that the archive can be
-untarred by any compliant version of tar. If the loss of path or file
-information is not acceptable, and it rarely is, longfile may be set to the
-value <code>gnu</code>. The tar task will then produce a GNU tar file which
-can have arbitrary length paths. Note however, that the resulting archive will
-only be able to be untarred with GNU tar.  The default for the longfile
-attribute is <code>warn</code> which behaves just like the gnu option except
-that it produces a warning for each file path encountered that does not match
-the limit.</p>
-
-<p>Note that this task does not perform compression. You might want to use the
-<a href="gzip.html">GZip</a> task to prepare a .tar.gz package.</p>
-</description>
-
-<section anchor="examples" name="Examples">
-<pre>  &lt;tar tarfile=&quot;${dist}/manual.tar&quot; basedir=&quot;htdocs/manual&quot;/&gt;
-  &lt;gzip zipfile=&quot;${dist}/manual.tar.gz&quot; src=&quot;${dist}/manual.tar&quot;/&gt;</pre>
-<p>tars all files in the <code>htdocs/manual</code> directory into a file called <code>manual.tar</code>
-in the <code>${dist}</code>  directory, then applies the gzip task to compress
-it.</p>
-<pre>  &lt;tar destfile=&quot;${dist}/manual.tar&quot;
-       basedir=&quot;htdocs/manual&quot;
-       excludes=&quot;mydocs/**, **/todo.html&quot;
-  /&gt;</pre>
-<p>tars all files in the <code>htdocs/manual</code> directory into a file called <code>manual.tar</code>
-in the <code>${dist}</code> directory. Files in the directory <code>mydocs</code>,
-or files with the name <code>todo.html</code> are excluded.</p>
-
-<pre>
-&lt;tar destfile=&quot;${basedir}/docs.tar&quot;&gt;
-  &lt;tarfileset dir=&quot;${dir.src}/docs&quot;
-              fullpath=&quot;/usr/doc/ant/README&quot;
-              preserveLeadingSlashes=&quot;true&quot;&gt;
-    &lt;include name=&quot;readme.txt&quot;/&gt;
-  &lt;/tarfileset&gt;
-  &lt;tarfileset dir=&quot;${dir.src}/docs&quot;
-              prefix=&quot;/usr/doc/ant&quot;
-              preserveLeadingSlashes=&quot;true&quot;&gt;
-    &lt;include name=&quot;*.html&quot;/&gt;
-  &lt;/tarfileset&gt;
-&lt;/tar&gt;</pre>
-
-<p>
-  Writes the file <code>docs/readme.txt</code> as
-  <code>/usr/doc/ant/README</code> into the archive. All
-  <code>*.html</code> files in the <code>docs</code> directory are
-  prefixed by <code>/usr/doc/ant</code>, so for example
-  <code>docs/index.html</code> is written as
-  <code>/usr/doc/ant/index.html</code> to the archive.
-</p>
-
-<pre>&lt;tar longfile=&quot;gnu&quot;
-     destfile=&quot;${dist.base}/${dist.name}-src.tar&quot; &gt;
-  &lt;tarfileset dir=&quot;${dist.name}/..&quot; mode=&quot;755&quot; username=&quot;ant&quot; group=&quot;ant&quot;&gt;
-    &lt;include name=&quot;${dist.name}/bootstrap.sh&quot;/&gt;
-    &lt;include name=&quot;${dist.name}/build.sh&quot;/&gt;
-  &lt;/tarfileset&gt;
-  &lt;tarfileset dir=&quot;${dist.name}/..&quot; username=&quot;ant&quot; group=&quot;ant&quot;&gt;
-    &lt;include name=&quot;${dist.name}/**&quot;/&gt;
-    &lt;exclude name=&quot;${dist.name}/bootstrap.sh&quot;/&gt;
-    &lt;exclude name=&quot;${dist.name}/build.sh&quot;/&gt;
-  &lt;/tarfileset&gt;
-&lt;/tar&gt; </pre>
-
-<p>This example shows building a tar which uses the GNU extensions for long paths and
-where some files need to be marked as executable (mode 755)
-and the rest are use the default mode (read-write by owner). The first
-fileset selects just the executable files. The second fileset must exclude
-the executable files and include all others. </p>
-
-<p><strong>Note: </strong> The tar task does not ensure that a file is only selected
-by one fileset. If the same file is selected by more than one fileset, it will be included in the
-tar file twice, with the same path.</p>
-
-<p><strong>Note:</strong> The patterns in the include and exclude
-elements are considered to be relative to the corresponding dir
-attribute as with all other filesets.  In the example above,
-<code>${dist.name}</code> is not an absolute path, but a simple name
-of a directory, so <code>${dist.name}</code> is a valid path relative
-to <code>${dist.name}/..</code>.</p>
-
-</section>
-</external>
-
-  <short-description><![CDATA[Creates a tar archive.]]></short-description>
-  <description>
-    <![CDATA[Creates a tar archive.]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="basedir" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[This is the base directory to look in for things to tar.]]></short-description>
-        <description><![CDATA[
-          This is the base directory to look in for things to tar.
-        ]]></description>
-      </attribute>
-      <attribute name="compression" type="org.apache.tools.ant.taskdefs.Tar.TarCompressionMethod"
-                 briefType="&quot;none&quot;, &quot;gzip&quot;, &quot;bzip2&quot;" required="NOTDEFINED">
-        <short-description><![CDATA[Set compression method.]]></short-description>
-        <description><![CDATA[
-          Set compression method.
- Allowable values are
- <ul>
- <li>  none - no compression
- <li>  gzip - Gzip compression
- <li>  bzip2 - Bzip2 compression
- </ul>
-        ]]></description>
-      </attribute>
-      <attribute name="destfile" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[Set is the name/location of where to create the tar file.]]></short-description>
-        <description><![CDATA[
-          Set is the name/location of where to create the tar file.
-        ]]></description>
-      </attribute>
-      <attribute name="longfile" type="org.apache.tools.ant.taskdefs.Tar.TarLongFileMode"
-                 briefType="&quot;warn&quot;, &quot;fail&quot;, &quot;truncate&quot;, &quot;gnu&quot;, &quot;omit&quot;" required="NOTDEFINED">
-        <short-description><![CDATA[Set how to handle long files, those with a path&gt;100 chars.]]></short-description>
-        <description><![CDATA[
-          Set how to handle long files, those with a path&gt;100 chars.
- Optional, default=warn.
- <p>
- Allowable values are
- <ul>
- <li>  truncate - paths are truncated to the maximum length
- <li>  fail - paths greater than the maximim cause a build exception
- <li>  warn - paths greater than the maximum cause a warning and GNU is used
- <li>  gnu - GNU extensions are used for any paths greater than the maximum.
- <li>  omit - paths greater than the maximum are omitted from the archive
- </ul>
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-      <element name="tarfileset" type="org.apache.tools.ant.taskdefs.Tar.TarFileSet"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[Add a new fileset with the option to specify permissions.]]></short-description>
-        <description>
-          <![CDATA[Add a new fileset with the option to specify permissions]]>
-        </description>
-      </element>
-
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="taskdef" category="internal"
-      classname="org.apache.tools.ant.taskdefs.Taskdef"
-      >
-
-  <short-description><![CDATA[Adds a task definition to the current project, such that this new task can be used in the current project.]]></short-description>
-  <description>
-    <![CDATA[Adds a task definition to the current project, such that this new task can be
- used in the current project. Two attributes are needed, the name that identifies
- this task uniquely, and the full name of the class (including the packages) that
- implements this task.</p>
- <p>You can also define a group of tasks at once using the file or
- resource attributes.  These attributes point to files in the format of
- Java property files.  Each line defines a single task in the
- format:</p>
- <pre>
- taskname=fully.qualified.java.classname
- </pre>]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="classname" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[The full class name of the object being defined.]]></short-description>
-        <description><![CDATA[
-          the full class name of the object being defined.
- Required, unless file or resource have
- been specified.
-        ]]></description>
-      </attribute>
-      <attribute name="classpath" type="org.apache.tools.ant.types.Path"
-                 briefType="Path" required="NOTDEFINED">
-        <short-description><![CDATA[Classpath to be used when searching for component being defined.]]></short-description>
-        <description><![CDATA[
-          Set the classpath to be used when searching for component being defined
-        ]]></description>
-      </attribute>
-      <attribute name="classpathref" type="org.apache.tools.ant.types.Reference"
-                 briefType="Reference" required="NOTDEFINED">
-        <short-description><![CDATA[Reference to a classpath to use when loading the files.]]></short-description>
-        <description><![CDATA[
-          reference to a classpath to use when loading the files.
- To actually share the same loader, set loaderref as well
-        ]]></description>
-      </attribute>
-      <attribute name="file" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[Name of the property file  to load
- ant name/classname pairs from.]]></short-description>
-        <description><![CDATA[
-          Name of the property file  to load
- ant name/classname pairs from.
-        ]]></description>
-      </attribute>
-      <attribute name="loaderref" type="org.apache.tools.ant.types.Reference"
-                 briefType="Reference" required="NOTDEFINED">
-        <short-description><![CDATA[Use the reference to locate the loader.]]></short-description>
-        <description><![CDATA[
-          Use the reference to locate the loader. If the loader is not
- found, taskdef will use the specified classpath and register it
- with the specified name.
- This allow multiple taskdef/typedef to use the same class loader,
- so they can be used together. It eliminate the need to
- put them in the CLASSPATH.
-        ]]></description>
-      </attribute>
-      <attribute name="name" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Name of the property resource to load
- ant name/classname pairs from.]]></short-description>
-        <description><![CDATA[
-          Name of the property resource to load
- ant name/classname pairs from.
-        ]]></description>
-      </attribute>
-      <attribute name="resource" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Name of the property resource to load
- ant name/classname pairs from.]]></short-description>
-        <description><![CDATA[
-          Name of the property resource to load
- ant name/classname pairs from.
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-      <element name="classpath" type="org.apache.tools.ant.types.Path"
-               briefType="Path"
-               required="NOTDEFINED">
-        <short-description><![CDATA[Create the classpath to be used when searching for component being defined.]]></short-description>
-        <description>
-          <![CDATA[Create the classpath to be used when searching for component being defined]]>
-        </description>
-      </element>
-
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="telnet" category="other"
-      classname="org.apache.tools.ant.taskdefs.optional.net.TelnetTask"
-      >
-
-  <short-description><![CDATA[Automates the telnet protocol.]]></short-description>
-  <description>
-    <![CDATA[Automates the telnet protocol.]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="initialcr" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Send a carriage return after connecting; optional, defaults to false.]]></short-description>
-        <description><![CDATA[
-          send a carriage return after connecting; optional, defaults to false.
-        ]]></description>
-      </attribute>
-      <attribute name="password" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[The login password to use
- required if <tt>userid</tt> is set.]]></short-description>
-        <description><![CDATA[
-          Set the the login password to use
- required if <tt>userid</tt> is set.
-        ]]></description>
-      </attribute>
-      <attribute name="port" type="int"
-                 briefType="int" required="NOTDEFINED">
-        <short-description><![CDATA[Tcp port to connect to; default is 23.]]></short-description>
-        <description><![CDATA[
-          Set the tcp port to connect to; default is 23.
-        ]]></description>
-      </attribute>
-      <attribute name="server" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Hostname or address of the remote server.]]></short-description>
-        <description><![CDATA[
-          Set the hostname or address of the remote server.
-        ]]></description>
-      </attribute>
-      <attribute name="timeout" type="java.lang.Integer"
-                 briefType="int" required="NOTDEFINED">
-        <short-description><![CDATA[Default timeout in seconds to wait for a response, 
- zero means forever (the default).]]></short-description>
-        <description><![CDATA[
-          set a default timeout in seconds to wait for a response, 
- zero means forever (the default)
-        ]]></description>
-      </attribute>
-      <attribute name="userid" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[The login id to use on the server; 
- required if <tt>password</tt> is set.]]></short-description>
-        <description><![CDATA[
-          Set the the login id to use on the server; 
- required if <tt>password</tt> is set.
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-      <element name="read" type="org.apache.tools.ant.taskdefs.optional.net.TelnetTask.TelnetSubTask"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[A string to wait for from the server.]]></short-description>
-        <description>
-          <![CDATA[A string to wait for from the server. 
-  A subTask &lt;read&gt; tag was found.  Create the object, 
-  Save it in our list, and return it.]]>
-        </description>
-      </element>
-
-      <element name="write" type="org.apache.tools.ant.taskdefs.optional.net.TelnetTask.TelnetSubTask"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[Add text to send to the server
-  A subTask &lt;write&gt; tag was found.]]></short-description>
-        <description>
-          <![CDATA[Add text to send to the server
-  A subTask &lt;write&gt; tag was found.  Create the object, 
-  Save it in our list, and return it.]]>
-        </description>
-      </element>
-
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="tempfile" category="other"
-      classname="org.apache.tools.ant.taskdefs.TempFile"
-      >
-
-  <short-description><![CDATA[This task sets a property to  the name of a temporary file.]]></short-description>
-  <description>
-    <![CDATA[This task sets a property to  the name of a temporary file. 
-  Unlike the Java1.2 method to create a temporary file, this task
-  does work on Java1.1. Also, it does not actually create the
-  temporary file, but it does guarantee that the file did not
-  exist when the task was executed. 
- <p>  
- Examples
- <pre>&lt;tempfile property="temp.file" /&gt;</pre>
- create a temporary file
- <pre>&lt;tempfile property="temp.file" suffix=".xml" /&gt;</pre>
- create a temporary file with the .xml suffix.
- <pre>&lt;tempfile property="temp.file" destDir="build"/&gt;</pre>
- create a temp file in the build subdir]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="destdir" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[Destination directory.]]></short-description>
-        <description><![CDATA[
-          destination directory. If null, 
-the parent directory is used instead
-        ]]></description>
-      </attribute>
-      <attribute name="prefix" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Optional prefix string.]]></short-description>
-        <description><![CDATA[
-          optional prefix string
-        ]]></description>
-      </attribute>
-      <attribute name="property" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[The property you wish to assign the temporary file to.]]></short-description>
-        <description><![CDATA[
-          The property you wish to assign the temporary file to
-        ]]></description>
-      </attribute>
-      <attribute name="suffix" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Suffix string for the temp file (optional).]]></short-description>
-        <description><![CDATA[
-          Suffix string for the temp file (optional)
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="touch" category="filesystem"
-      classname="org.apache.tools.ant.taskdefs.Touch"
-      >
-
-  <short-description><![CDATA[Touch a file and/or fileset(s); corresponds to the Unix touch command.]]></short-description>
-  <description>
-    <![CDATA[Touch a file and/or fileset(s); corresponds to the Unix touch command.
-
- <p>If the file to touch doesn't exist, an empty one is
- created. </p>
-
- <p>Note: Setting the modification time of files is not supported in
- JDK 1.1.</p>]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="datetime" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[The new modification time of the file
- in the format MM/DD/YYYY HH:MM AM <i>or</i> PM;
- Optional, default=now.]]></short-description>
-        <description><![CDATA[
-          the new modification time of the file
- in the format MM/DD/YYYY HH:MM AM <i>or</i> PM;
- Optional, default=now
-        ]]></description>
-      </attribute>
-      <attribute name="file" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[Single source file to touch.]]></short-description>
-        <description><![CDATA[
-          Sets a single source file to touch.  If the file does not exist
- an empty file will be created.
-        ]]></description>
-      </attribute>
-      <attribute name="millis" type="long"
-                 briefType="long" required="NOTDEFINED">
-        <short-description><![CDATA[The new modification time of the file
- in milliseconds since midnight Jan 1 1970.]]></short-description>
-        <description><![CDATA[
-          the new modification time of the file
- in milliseconds since midnight Jan 1 1970.
- Optional, default=now
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-      <element name="fileset" type="org.apache.tools.ant.types.FileSet"
-               briefType="Fileset"
-               required="NOTDEFINED">
-        <short-description><![CDATA[Add a set of files to touch.]]></short-description>
-        <description>
-          <![CDATA[Add a set of files to touch]]>
-        </description>
-      </element>
-
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="translate" category="other"
-      classname="org.apache.tools.ant.taskdefs.optional.i18n.Translate"
-      matchingTask="true">
-
-  <short-description><![CDATA[Translates text embedded in files using Resource Bundle files.]]></short-description>
-  <description>
-    <![CDATA[Translates text embedded in files using Resource Bundle files.]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="bundle" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Sets Family name of resource bundle; required.]]></short-description>
-        <description><![CDATA[
-          Sets Family name of resource bundle; required.
-        ]]></description>
-      </attribute>
-      <attribute name="bundlecountry" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Sets locale specific country of resource bundle; optional.]]></short-description>
-        <description><![CDATA[
-          Sets locale specific country of resource bundle; optional.
-        ]]></description>
-      </attribute>
-      <attribute name="bundleencoding" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Sets Resource Bundle file encoding scheme; optional.]]></short-description>
-        <description><![CDATA[
-          Sets Resource Bundle file encoding scheme; optional.  Defaults to source file
- encoding
-        ]]></description>
-      </attribute>
-      <attribute name="bundlelanguage" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Sets locale specific language of resource bundle; optional.]]></short-description>
-        <description><![CDATA[
-          Sets locale specific language of resource bundle; optional.
-        ]]></description>
-      </attribute>
-      <attribute name="bundlevariant" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Sets locale specific variant of resource bundle; optional.]]></short-description>
-        <description><![CDATA[
-          Sets locale specific variant of resource bundle; optional.
-        ]]></description>
-      </attribute>
-      <attribute name="destencoding" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Sets destination file encoding scheme; optional.]]></short-description>
-        <description><![CDATA[
-          Sets destination file encoding scheme; optional.  Defaults to source file
- encoding
-        ]]></description>
-      </attribute>
-      <attribute name="endtoken" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Sets ending token to identify keys; required.]]></short-description>
-        <description><![CDATA[
-          Sets ending token to identify keys; required.
-        ]]></description>
-      </attribute>
-      <attribute name="forceoverwrite" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Whether or not to overwrite existing file irrespective of
- whether it is newer than the source file as well as the
- resource bundle file.]]></short-description>
-        <description><![CDATA[
-          Whether or not to overwrite existing file irrespective of
- whether it is newer than the source file as well as the
- resource bundle file.
- Defaults to false.
-        ]]></description>
-      </attribute>
-      <attribute name="srcencoding" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Sets source file encoding scheme; optional,
- defaults to encoding of local system.]]></short-description>
-        <description><![CDATA[
-          Sets source file encoding scheme; optional,
- defaults to encoding of local system.
-        ]]></description>
-      </attribute>
-      <attribute name="starttoken" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Sets starting token to identify keys; required.]]></short-description>
-        <description><![CDATA[
-          Sets starting token to identify keys; required.
-        ]]></description>
-      </attribute>
-      <attribute name="todir" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[Sets Destination directory; required.]]></short-description>
-        <description><![CDATA[
-          Sets Destination directory; required.
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-      <element name="fileset" type="org.apache.tools.ant.types.FileSet"
-               briefType="Fileset"
-               required="NOTDEFINED">
-        <short-description><![CDATA[Adds a set of files to translate as a nested fileset element.]]></short-description>
-        <description>
-          <![CDATA[Adds a set of files to translate as a nested fileset element.]]>
-        </description>
-      </element>
-
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="tstamp" category="utility"
-      classname="org.apache.tools.ant.taskdefs.Tstamp"
-      >
-
-  <short-description><![CDATA[Sets properties to the current time, or offsets from the current time.]]></short-description>
-  <description>
-    <![CDATA[Sets properties to the current time, or offsets from the current time.
- The default properties are TSTAMP, DSTAMP and TODAY;]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="prefix" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Prefix for the properties.]]></short-description>
-        <description><![CDATA[
-          Set a prefix for the properties. If the prefix does not end with a "."
- one is automatically added
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-      <element name="format" type="org.apache.tools.ant.taskdefs.Tstamp.CustomFormat"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[Create a custom format with the the current prefix.]]></short-description>
-        <description>
-          <![CDATA[create a custom format with the the current prefix.]]>
-        </description>
-      </element>
-
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="typedef" category="internal"
-      classname="org.apache.tools.ant.taskdefs.Typedef"
-      >
-
-  <short-description><![CDATA[Adds a data type definition to the current project.]]></short-description>
-  <description>
-    <![CDATA[Adds a data type definition to the current project.
- Two attributes are
- needed, the name that identifies this data type uniquely, and the full
- name of the class (including the packages) that implements this
- type.
- <p>You can also define a group of data types at once using the file or
- resource attributes.  These attributes point to files in the format of
- Java property files.   Each line defines a single data type in the
- format:</p>
- <pre>
- typename=fully.qualified.java.classname
- </pre>
- <p>Typedef should be used to add your own types to the system. Data
- types are things likepaths or filesets that can be defined at
- the project level and referenced via their ID attribute.</p>
- <p>Custom data types usually need custom tasks to put them to good use.</p>]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="classname" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[The full class name of the object being defined.]]></short-description>
-        <description><![CDATA[
-          the full class name of the object being defined.
- Required, unless file or resource have
- been specified.
-        ]]></description>
-      </attribute>
-      <attribute name="classpath" type="org.apache.tools.ant.types.Path"
-                 briefType="Path" required="NOTDEFINED">
-        <short-description><![CDATA[Classpath to be used when searching for component being defined.]]></short-description>
-        <description><![CDATA[
-          Set the classpath to be used when searching for component being defined
-        ]]></description>
-      </attribute>
-      <attribute name="classpathref" type="org.apache.tools.ant.types.Reference"
-                 briefType="Reference" required="NOTDEFINED">
-        <short-description><![CDATA[Reference to a classpath to use when loading the files.]]></short-description>
-        <description><![CDATA[
-          reference to a classpath to use when loading the files.
- To actually share the same loader, set loaderref as well
-        ]]></description>
-      </attribute>
-      <attribute name="file" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[Name of the property file  to load
- ant name/classname pairs from.]]></short-description>
-        <description><![CDATA[
-          Name of the property file  to load
- ant name/classname pairs from.
-        ]]></description>
-      </attribute>
-      <attribute name="loaderref" type="org.apache.tools.ant.types.Reference"
-                 briefType="Reference" required="NOTDEFINED">
-        <short-description><![CDATA[Use the reference to locate the loader.]]></short-description>
-        <description><![CDATA[
-          Use the reference to locate the loader. If the loader is not
- found, taskdef will use the specified classpath and register it
- with the specified name.
- This allow multiple taskdef/typedef to use the same class loader,
- so they can be used together. It eliminate the need to
- put them in the CLASSPATH.
-        ]]></description>
-      </attribute>
-      <attribute name="name" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Name of the property resource to load
- ant name/classname pairs from.]]></short-description>
-        <description><![CDATA[
-          Name of the property resource to load
- ant name/classname pairs from.
-        ]]></description>
-      </attribute>
-      <attribute name="resource" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Name of the property resource to load
- ant name/classname pairs from.]]></short-description>
-        <description><![CDATA[
-          Name of the property resource to load
- ant name/classname pairs from.
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-      <element name="classpath" type="org.apache.tools.ant.types.Path"
-               briefType="Path"
-               required="NOTDEFINED">
-        <short-description><![CDATA[Create the classpath to be used when searching for component being defined.]]></short-description>
-        <description>
-          <![CDATA[Create the classpath to be used when searching for component being defined]]>
-        </description>
-      </element>
-
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="untar" category="packaging"
-      classname="org.apache.tools.ant.taskdefs.Untar"
-      >
-
-  <short-description><![CDATA[Untar a file.]]></short-description>
-  <description>
-    <![CDATA[Untar a file.
- <p>For JDK 1.1 &quot;last modified time&quot; field is set to current time instead of being
- carried from the archive file.</p>
- <p>PatternSets are used to select files to extract
- <I>from</I> the archive.  If no patternset is used, all files are extracted.
- </p>
- <p>FileSet>s may be used used to select archived files
- to perform unarchival upon.
- </p>
- <p>File permissions will not be restored on extracted files.</p>
- <p>The untar task recognizes the long pathname entries used by GNU tar.<p>]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="compression" type="org.apache.tools.ant.taskdefs.Untar.UntarCompressionMethod"
-                 briefType="&quot;none&quot;, &quot;gzip&quot;, &quot;bzip2&quot;" required="NOTDEFINED">
-        <short-description><![CDATA[Set decompression algorithm to use; default=none.]]></short-description>
-        <description><![CDATA[
-          Set decompression algorithm to use; default=none.
-
- Allowable values are
- <ul>
-   <li>none - no compression
-   <li>gzip - Gzip compression
-   <li>bzip2 - Bzip2 compression
- </ul>
-        ]]></description>
-      </attribute>
-      <attribute name="dest" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[Destination directory.]]></short-description>
-        <description><![CDATA[
-          Set the destination directory. File will be unzipped into the
- destination directory.
-        ]]></description>
-      </attribute>
-      <attribute name="overwrite" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Should we overwrite files in dest, even if they are newer than
- the corresponding entries in the archive?.]]></short-description>
-        <description><![CDATA[
-          Should we overwrite files in dest, even if they are newer than
- the corresponding entries in the archive?
-        ]]></description>
-      </attribute>
-      <attribute name="src" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[Path to zip-file.]]></short-description>
-        <description><![CDATA[
-          Set the path to zip-file.
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-      <element name="fileset" type="org.apache.tools.ant.types.FileSet"
-               briefType="Fileset"
-               required="NOTDEFINED">
-        <short-description><![CDATA[Add a fileset.]]></short-description>
-        <description>
-          <![CDATA[Add a fileset]]>
-        </description>
-      </element>
-
-      <element name="patternset" type="org.apache.tools.ant.types.PatternSet"
-               briefType="Patternset"
-               required="NOTDEFINED">
-        <short-description><![CDATA[Add a patternset.]]></short-description>
-        <description>
-          <![CDATA[Add a patternset]]>
-        </description>
-      </element>
-
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="unzip" category="packaging"
-      classname="org.apache.tools.ant.taskdefs.Expand"
-      >
-
-  <short-description><![CDATA[Unzip a file.]]></short-description>
-  <description>
-    <![CDATA[Unzip a file.]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="dest" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[Destination directory.]]></short-description>
-        <description><![CDATA[
-          Set the destination directory. File will be unzipped into the
- destination directory.
-        ]]></description>
-      </attribute>
-      <attribute name="overwrite" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Should we overwrite files in dest, even if they are newer than
- the corresponding entries in the archive?.]]></short-description>
-        <description><![CDATA[
-          Should we overwrite files in dest, even if they are newer than
- the corresponding entries in the archive?
-        ]]></description>
-      </attribute>
-      <attribute name="src" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[Path to zip-file.]]></short-description>
-        <description><![CDATA[
-          Set the path to zip-file.
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-      <element name="fileset" type="org.apache.tools.ant.types.FileSet"
-               briefType="Fileset"
-               required="NOTDEFINED">
-        <short-description><![CDATA[Add a fileset.]]></short-description>
-        <description>
-          <![CDATA[Add a fileset]]>
-        </description>
-      </element>
-
-      <element name="patternset" type="org.apache.tools.ant.types.PatternSet"
-               briefType="Patternset"
-               required="NOTDEFINED">
-        <short-description><![CDATA[Add a patternset.]]></short-description>
-        <description>
-          <![CDATA[Add a patternset]]>
-        </description>
-      </element>
-
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="uptodate" category="control"
-      classname="org.apache.tools.ant.taskdefs.UpToDate"
-      >
-
-  <short-description><![CDATA[Sets the given property if the specified target has a timestamp greater than all of the source files.]]></short-description>
-  <description>
-    <![CDATA[Sets the given property if the specified target has a timestamp
- greater than all of the source files.]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="property" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[The property to set if the target file is more up-to-date than
- (each of) the source file(s).]]></short-description>
-        <description><![CDATA[
-          The property to set if the target file is more up-to-date than
- (each of) the source file(s).
-        ]]></description>
-      </attribute>
-      <attribute name="srcfile" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[The file that must be older than the target file
- if the property is to be set.]]></short-description>
-        <description><![CDATA[
-          The file that must be older than the target file
- if the property is to be set.
-        ]]></description>
-      </attribute>
-      <attribute name="targetfile" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[The file which must be more up-to-date than (each of) the source file(s)
- if the property is to be set.]]></short-description>
-        <description><![CDATA[
-          The file which must be more up-to-date than (each of) the source file(s)
- if the property is to be set.
-        ]]></description>
-      </attribute>
-      <attribute name="value" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[The value to set the named property to if the target file is more
- up-to-date than (each of) the source file(s).]]></short-description>
-        <description><![CDATA[
-          The value to set the named property to if the target file is more
- up-to-date than (each of) the source file(s). Defaults to 'true'.
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-      <element name="srcfiles" type="org.apache.tools.ant.types.FileSet"
-               briefType="Fileset"
-               required="NOTDEFINED">
-        <short-description><![CDATA[Nested &lt;srcfiles&gt; element.]]></short-description>
-        <description>
-          <![CDATA[Nested &lt;srcfiles&gt; element.]]>
-        </description>
-      </element>
-
-      <element name="mapper" type="org.apache.tools.ant.types.Mapper"
-               briefType="Mapper"
-               required="NOTDEFINED">
-        <short-description><![CDATA[Defines the FileNameMapper to use (nested mapper element).]]></short-description>
-        <description>
-          <![CDATA[Defines the FileNameMapper to use (nested mapper element).]]>
-        </description>
-      </element>
-
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="vajexport" category="other"
-      classname="org.apache.tools.ant.taskdefs.optional.ide.VAJExport"
-      >
-
-  <short-description><![CDATA[Export packages from the Visual Age for Java workspace.]]></short-description>
-  <description>
-    <![CDATA[Export packages from the Visual Age for Java workspace.
- The packages are specified similar to all other MatchingTasks.
- Since the VA Workspace is not file based, this task is simulating
- a directory hierarchy for the workspace:
- The 'root' contains all project 'dir's, and the projects contain
- their respective package 'dir's.
- Example:
- <blockquote>
- &lt;vajexport destdir="C:/builddir/source">
- &nbsp;&lt;include name="/MyVAProject/org/foo/subsystem1/**" />
- &nbsp;&lt;exclude name="/MyVAProject/org/foo/subsystem1/test/**"/>
- &lt;/vajexport>
- </blockquote>
- exports all packages in the project MyVAProject which start with
- 'org.foo.subsystem1' except of these starting with
- 'org.foo.subsystem1.test'.
-
- There are flags to choose which items to export:
- exportSources:   export Java sources
- exportResources: export project resources
- exportClasses:   export class files
- exportDebugInfo: export class files with debug info (use with exportClasses)
- default is exporting Java files and resources.]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="defaultexcludes" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Sets whether default exclusions should be used or not; default true.]]></short-description>
-        <description><![CDATA[
-          Sets whether default exclusions should be used or not; default true.
-        ]]></description>
-      </attribute>
-      <attribute name="destdir" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[Destination directory into which the selected
- items should be exported; required.]]></short-description>
-        <description><![CDATA[
-          Set the destination directory into which the selected
- items should be exported; required.
-        ]]></description>
-      </attribute>
-      <attribute name="excludes" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Set of exclude patterns.]]></short-description>
-        <description><![CDATA[
-          Sets the set of exclude patterns. Patterns may be separated by a comma
- or a space. Currently only patterns denoting packages are
- supported
-        ]]></description>
-      </attribute>
-      <attribute name="exportclasses" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Optional flag to export the class files; default false.]]></short-description>
-        <description><![CDATA[
-          optional flag to export the class files; default false.
-        ]]></description>
-      </attribute>
-      <attribute name="exportdebuginfo" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Optional flag to export the debug info; default false.
- debug info.]]></short-description>
-        <description><![CDATA[
-          optional flag to export the debug info; default false.
- debug info
-        ]]></description>
-      </attribute>
-      <attribute name="exportresources" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Optional flag to export the resource file; default true.]]></short-description>
-        <description><![CDATA[
-          optional flag to export the resource file; default true.
-        ]]></description>
-      </attribute>
-      <attribute name="exportsources" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Optional flag to export the Java files; default true.]]></short-description>
-        <description><![CDATA[
-          optional flag to export the Java files; default true.
-        ]]></description>
-      </attribute>
-      <attribute name="includes" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Set of include patterns.]]></short-description>
-        <description><![CDATA[
-          Sets the set of include patterns. Patterns may be separated by a comma
- or a space. Currently only patterns denoting packages are
- supported
-        ]]></description>
-      </attribute>
-      <attribute name="overwrite" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[If Overwrite is set, files will be overwritten during export.]]></short-description>
-        <description><![CDATA[
-          if Overwrite is set, files will be overwritten during export
-        ]]></description>
-      </attribute>
-      <attribute name="remote" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Name and port of a remote tool server, optiona.]]></short-description>
-        <description><![CDATA[
-          Name and port of a remote tool server, optiona.
- Format: &lt;servername&gt;:&lt;port no&gt;.
- If this attribute is set, the tasks will be executed on the specified tool
- server.
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-      <element name="exclude" type="org.apache.tools.ant.types.PatternSet.NameEntry"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[Add a name entry on the exclude list.]]></short-description>
-        <description>
-          <![CDATA[add a name entry on the exclude list]]>
-        </description>
-      </element>
-
-      <element name="include" type="org.apache.tools.ant.types.PatternSet.NameEntry"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[Add a name entry on the include list.]]></short-description>
-        <description>
-          <![CDATA[add a name entry on the include list]]>
-        </description>
-      </element>
-
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="vajimport" category="other"
-      classname="org.apache.tools.ant.taskdefs.optional.ide.VAJImport"
-      >
-
-  <short-description><![CDATA[Import source, class files, and resources to the Visual Age for Java workspace.]]></short-description>
-  <description>
-    <![CDATA[Import source, class files, and resources to the Visual Age for Java
- workspace.
- <p>
- Example:
- <pre>
- &lt;vajimport project="MyVAProject"&gt;
-   &lt;fileset dir="src"&gt;
-     &lt;include name="org/foo/subsystem1/**" /&gt;
-     &lt;exclude name="/org/foo/subsystem1/test/**" /&gt;
-  &lt;/fileset&gt;
- &lt;/vajexport&gt;
- </pre>
- import all source and resource files from the "src" directory
- which start with 'org.foo.subsystem1', except of these starting with
- 'org.foo.subsystem1.test' into the project MyVAProject.
- </p>
- <p>If MyVAProject isn't loaded into the Workspace, a new edition is
- created in the repository and automatically loaded into the Workspace.
- There has to be at least one nested FileSet element.
- </p>
- <p>There are attributes to choose which items to export:
- <table border="1" cellpadding="2" cellspacing="0">
- <tr>
-   <td valign="top"><b>Attribute</b></td>
-   <td valign="top"><b>Description</b></td>
-   <td align="center" valign="top"><b>Required</b></td>
- </tr>
- <tr>
-   <td valign="top">project</td>
-   <td valign="top">the name of the Project to import to</td>
-   <td align="center" valign="top">Yes</td>
- </tr>
- <tr>
-   <td valign="top">importSources</td>
-   <td valign="top">import Java sources, defaults to "yes"</td>
-   <td align="center" valign="top">No</td>
- </tr>
- <tr>
-   <td valign="top">importResources</td>
-   <td valign="top">import resource files (anything that doesn't
-                    end with .java or .class), defaults to "yes"</td>
-   <td align="center" valign="top">No</td>
- </tr>
- <tr>
-   <td valign="top">importClasses</td>
-   <td valign="top">import class files, defaults to "no"</td>
-   <td align="center" valign="top">No</td>
- </tr>
- </table>]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="defaultexcludes" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Sets whether default exclusions should be used or not.]]></short-description>
-        <description><![CDATA[
-          Sets whether default exclusions should be used or not.
-        ]]></description>
-      </attribute>
-      <attribute name="importclasses" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Flag to import .class files; optional, default false.]]></short-description>
-        <description><![CDATA[
-          Flag to import .class files; optional, default false.
-        ]]></description>
-      </attribute>
-      <attribute name="importresources" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Import resource files (anything that doesn't end in
- .class or .java); optional, default true.]]></short-description>
-        <description><![CDATA[
-          Import resource files (anything that doesn't end in
- .class or .java); optional, default true.
-        ]]></description>
-      </attribute>
-      <attribute name="importsources" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Import .java files; optional, default true.]]></short-description>
-        <description><![CDATA[
-          Import .java files; optional, default true.
-        ]]></description>
-      </attribute>
-      <attribute name="project" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[The VisualAge for Java Project name to import into.]]></short-description>
-        <description><![CDATA[
-          The VisualAge for Java Project name to import into.
-        ]]></description>
-      </attribute>
-      <attribute name="remote" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Name and port of a remote tool server, optiona.]]></short-description>
-        <description><![CDATA[
-          Name and port of a remote tool server, optiona.
- Format: &lt;servername&gt;:&lt;port no&gt;.
- If this attribute is set, the tasks will be executed on the specified tool
- server.
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-      <element name="fileset" type="org.apache.tools.ant.types.FileSet"
-               briefType="Fileset"
-               required="NOTDEFINED">
-        <short-description><![CDATA[Adds a set of files (nested fileset attribute).]]></short-description>
-        <description>
-          <![CDATA[Adds a set of files (nested fileset attribute).]]>
-        </description>
-      </element>
-
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="vajload" category="other"
-      classname="org.apache.tools.ant.taskdefs.optional.ide.VAJLoad"
-      >
-
-  <short-description><![CDATA[Load specific project versions into the Visual Age for Java workspace.]]></short-description>
-  <description>
-    <![CDATA[Load specific project versions into the Visual Age for Java workspace.
- Each project and version name has to be specified completely.
- Example:  
- <blockquote> 
- &lt;vajload>
- &nbsp;&lt;project name="MyVAProject" version="2.1"/>
- &nbsp;&lt;project name="Apache Xerces" version="1.2.0"/>
- &lt;/vajload>
- </blockquote>]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="remote" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Name and port of a remote tool server, optiona.]]></short-description>
-        <description><![CDATA[
-          Name and port of a remote tool server, optiona.
- Format: &lt;servername&gt;:&lt;port no&gt;.
- If this attribute is set, the tasks will be executed on the specified tool
- server.
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-      <element name="vajproject" type="org.apache.tools.ant.taskdefs.optional.ide.VAJProjectDescription"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[Add a project description entry on the project list.]]></short-description>
-        <description>
-          <![CDATA[Add a project description entry on the project list.]]>
-        </description>
-      </element>
-
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="vssadd" category="scm"
-      classname="org.apache.tools.ant.taskdefs.optional.vss.MSVSSADD"
-      >
-
-  <short-description><![CDATA[Performs Add commands to Microsoft Visual SourceSafe.]]></short-description>
-  <description>
-    <![CDATA[Performs Add commands to Microsoft Visual SourceSafe.
- Based on the VSS Checkin code by Martin Poeschl]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="autoresponse" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[What to respond with (sets the -I option).]]></short-description>
-        <description><![CDATA[
-          What to respond with (sets the -I option). By default, -I- is
- used; values of Y or N will be appended to this.
-        ]]></description>
-      </attribute>
-      <attribute name="comment" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Comment to apply; optional.]]></short-description>
-        <description><![CDATA[
-          Sets the comment to apply; optional.
- <p>
- If this is null or empty, it will be replaced with "-" which
- is what SourceSafe uses for an empty comment.
-        ]]></description>
-      </attribute>
-      <attribute name="localpath" type="org.apache.tools.ant.types.Path"
-                 briefType="Path" required="NOTDEFINED">
-        <short-description><![CDATA[Local path.]]></short-description>
-        <description><![CDATA[
-          Set the local path.
-        ]]></description>
-      </attribute>
-      <attribute name="login" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[The login to use when accessing VSS, formatted as "username,password";
- optional.]]></short-description>
-        <description><![CDATA[
-          The login to use when accessing VSS, formatted as "username,password";
- optional.
- <p>
- You can omit the password if your database is not password protected.
-  if you have a password and omit it, Ant/VSS will hang.
-        ]]></description>
-      </attribute>
-      <attribute name="recursive" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Set behaviour recursive or non-recursive.]]></short-description>
-        <description><![CDATA[
-          Set behaviour recursive or non-recursive
-        ]]></description>
-      </attribute>
-      <attribute name="serverpath" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Directory where <code>srssafe.ini</code> resides; optional.]]></short-description>
-        <description><![CDATA[
-          Set the directory where <code>srssafe.ini</code> resides; optional.
-        ]]></description>
-      </attribute>
-      <attribute name="ssdir" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Directory where <code>ss.exe</code> resides; optional.]]></short-description>
-        <description><![CDATA[
-          directory where <code>ss.exe</code> resides; optional.
- By default the task expects it to be in the PATH.
-        ]]></description>
-      </attribute>
-      <attribute name="vsspath" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[SourceSafe path which specifies the project/file(s) you wish to 
- perform the action on; required.]]></short-description>
-        <description><![CDATA[
-          SourceSafe path which specifies the project/file(s) you wish to 
- perform the action on; required. You should not specify the leading dollar-sign - 
- it is prepended by Ant automatically.
- <p>
- Ant can't cope with a '$' sign in an attribute so we have to add it here.
- Also we strip off any 'vss://' prefix which is an XMS special and should probably be removed!
-        ]]></description>
-      </attribute>
-      <attribute name="writable" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Leave added files writable?.]]></short-description>
-        <description><![CDATA[
-          Leave added files writable? Default: false.
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="vsscheckin" category="scm"
-      classname="org.apache.tools.ant.taskdefs.optional.vss.MSVSSCHECKIN"
-      >
-
-  <short-description><![CDATA[Performs CheckIn commands to Microsoft Visual SourceSafe.]]></short-description>
-  <description>
-    <![CDATA[Performs CheckIn commands to Microsoft Visual SourceSafe.]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="autoresponse" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[What to respond with (sets the -I option).]]></short-description>
-        <description><![CDATA[
-          What to respond with (sets the -I option). By default, -I- is
- used; values of Y or N will be appended to this.
-        ]]></description>
-      </attribute>
-      <attribute name="comment" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Comment to apply; optional.]]></short-description>
-        <description><![CDATA[
-          Set the comment to apply; optional.
- <p>
- If this is null or empty, it will be replaced with "-" which
- is what SourceSafe uses for an empty comment.
-        ]]></description>
-      </attribute>
-      <attribute name="localpath" type="org.apache.tools.ant.types.Path"
-                 briefType="Path" required="NOTDEFINED">
-        <short-description><![CDATA[Local path.]]></short-description>
-        <description><![CDATA[
-          Set the local path.
-        ]]></description>
-      </attribute>
-      <attribute name="login" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[The login to use when accessing VSS, formatted as "username,password";
- optional.]]></short-description>
-        <description><![CDATA[
-          The login to use when accessing VSS, formatted as "username,password";
- optional.
- <p>
- You can omit the password if your database is not password protected.
-  if you have a password and omit it, Ant/VSS will hang.
-        ]]></description>
-      </attribute>
-      <attribute name="recursive" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Flag to tell the task to recurse down the tree;
- optional, default false.]]></short-description>
-        <description><![CDATA[
-          Flag to tell the task to recurse down the tree;
- optional, default false.
-        ]]></description>
-      </attribute>
-      <attribute name="serverpath" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Directory where <code>srssafe.ini</code> resides; optional.]]></short-description>
-        <description><![CDATA[
-          Set the directory where <code>srssafe.ini</code> resides; optional.
-        ]]></description>
-      </attribute>
-      <attribute name="ssdir" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Directory where <code>ss.exe</code> resides; optional.]]></short-description>
-        <description><![CDATA[
-          directory where <code>ss.exe</code> resides; optional.
- By default the task expects it to be in the PATH.
-        ]]></description>
-      </attribute>
-      <attribute name="vsspath" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[SourceSafe path which specifies the project/file(s) you wish to 
- perform the action on; required.]]></short-description>
-        <description><![CDATA[
-          SourceSafe path which specifies the project/file(s) you wish to 
- perform the action on; required. You should not specify the leading dollar-sign - 
- it is prepended by Ant automatically.
- <p>
- Ant can't cope with a '$' sign in an attribute so we have to add it here.
- Also we strip off any 'vss://' prefix which is an XMS special and should probably be removed!
-        ]]></description>
-      </attribute>
-      <attribute name="writable" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Leave checked in files writable?.]]></short-description>
-        <description><![CDATA[
-          Leave checked in files writable? Default: false.
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="vsscheckout" category="scm"
-      classname="org.apache.tools.ant.taskdefs.optional.vss.MSVSSCHECKOUT"
-      >
-
-  <short-description><![CDATA[Performs CheckOut commands to Microsoft Visual SourceSafe.]]></short-description>
-  <description>
-    <![CDATA[Performs CheckOut commands to Microsoft Visual SourceSafe.
- <p>If you specify two or more attributes from version, date and 
- label only one will be used in the order version, date, label.</p>]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="autoresponse" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[What to respond with (sets the -I option).]]></short-description>
-        <description><![CDATA[
-          What to respond with (sets the -I option). By default, -I- is
- used; values of Y or N will be appended to this.
-        ]]></description>
-      </attribute>
-      <attribute name="date" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Date to get;
- optional, only one of <tt>version</tt>, <tt>label</tt>, or <tt>date</tt>
- allowed.]]></short-description>
-        <description><![CDATA[
-          Set the date to get;
- optional, only one of <tt>version</tt>, <tt>label</tt>, or <tt>date</tt>
- allowed.
-        ]]></description>
-      </attribute>
-      <attribute name="label" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Label to get;
- optional, only one of <tt>version</tt>, <tt>label</tt>, or <tt>date</tt>
- allowed.]]></short-description>
-        <description><![CDATA[
-          Set the label to get;
- optional, only one of <tt>version</tt>, <tt>label</tt>, or <tt>date</tt>
- allowed.
-        ]]></description>
-      </attribute>
-      <attribute name="localpath" type="org.apache.tools.ant.types.Path"
-                 briefType="Path" required="NOTDEFINED">
-        <short-description><![CDATA[Local path.]]></short-description>
-        <description><![CDATA[
-          Set the local path.
-        ]]></description>
-      </attribute>
-      <attribute name="login" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[The login to use when accessing VSS, formatted as "username,password";
- optional.]]></short-description>
-        <description><![CDATA[
-          The login to use when accessing VSS, formatted as "username,password";
- optional.
- <p>
- You can omit the password if your database is not password protected.
-  if you have a password and omit it, Ant/VSS will hang.
-        ]]></description>
-      </attribute>
-      <attribute name="recursive" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Flag to tell the task to recurse down the tree;
- optional, default false.]]></short-description>
-        <description><![CDATA[
-          Flag to tell the task to recurse down the tree;
- optional, default false.
-        ]]></description>
-      </attribute>
-      <attribute name="serverpath" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Directory where <code>srssafe.ini</code> resides; optional.]]></short-description>
-        <description><![CDATA[
-          Set the directory where <code>srssafe.ini</code> resides; optional.
-        ]]></description>
-      </attribute>
-      <attribute name="ssdir" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Directory where <code>ss.exe</code> resides; optional.]]></short-description>
-        <description><![CDATA[
-          directory where <code>ss.exe</code> resides; optional.
- By default the task expects it to be in the PATH.
-        ]]></description>
-      </attribute>
-      <attribute name="version" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Version to get;
- optional, only one of <tt>version</tt>, <tt>label</tt>, or <tt>date</tt>
- allowed.]]></short-description>
-        <description><![CDATA[
-          Set the version to get;
- optional, only one of <tt>version</tt>, <tt>label</tt>, or <tt>date</tt>
- allowed.
-        ]]></description>
-      </attribute>
-      <attribute name="vsspath" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[SourceSafe path which specifies the project/file(s) you wish to 
- perform the action on; required.]]></short-description>
-        <description><![CDATA[
-          SourceSafe path which specifies the project/file(s) you wish to 
- perform the action on; required. You should not specify the leading dollar-sign - 
- it is prepended by Ant automatically.
- <p>
- Ant can't cope with a '$' sign in an attribute so we have to add it here.
- Also we strip off any 'vss://' prefix which is an XMS special and should probably be removed!
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="vsscp" category="scm"
-      classname="org.apache.tools.ant.taskdefs.optional.vss.MSVSSCP"
-      >
-
-  <short-description><![CDATA[Performs CP (Change Project) commands to Microsoft Visual SourceSafe.]]></short-description>
-  <description>
-    <![CDATA[Performs CP (Change Project) commands to Microsoft Visual SourceSafe.
- <p>This task is typically used before a VssAdd in order to set the target project</p>
- Based on the VSS Checkin code by Martin Poeschl]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="autoresponse" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[What to respond with (sets the -I option).]]></short-description>
-        <description><![CDATA[
-          What to respond with (sets the -I option). By default, -I- is
- used; values of Y or N will be appended to this.
-        ]]></description>
-      </attribute>
-      <attribute name="login" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[The login to use when accessing VSS, formatted as "username,password";
- optional.]]></short-description>
-        <description><![CDATA[
-          The login to use when accessing VSS, formatted as "username,password";
- optional.
- <p>
- You can omit the password if your database is not password protected.
-  if you have a password and omit it, Ant/VSS will hang.
-        ]]></description>
-      </attribute>
-      <attribute name="serverpath" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Directory where <code>srssafe.ini</code> resides; optional.]]></short-description>
-        <description><![CDATA[
-          Set the directory where <code>srssafe.ini</code> resides; optional.
-        ]]></description>
-      </attribute>
-      <attribute name="ssdir" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Directory where <code>ss.exe</code> resides; optional.]]></short-description>
-        <description><![CDATA[
-          directory where <code>ss.exe</code> resides; optional.
- By default the task expects it to be in the PATH.
-        ]]></description>
-      </attribute>
-      <attribute name="vsspath" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[SourceSafe path which specifies the project/file(s) you wish to 
- perform the action on; required.]]></short-description>
-        <description><![CDATA[
-          SourceSafe path which specifies the project/file(s) you wish to 
- perform the action on; required. You should not specify the leading dollar-sign - 
- it is prepended by Ant automatically.
- <p>
- Ant can't cope with a '$' sign in an attribute so we have to add it here.
- Also we strip off any 'vss://' prefix which is an XMS special and should probably be removed!
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="vsscreate" category="scm"
-      classname="org.apache.tools.ant.taskdefs.optional.vss.MSVSSCREATE"
-      >
-
-  <short-description><![CDATA[Creates a new project in Microsoft Visual SourceSafe.]]></short-description>
-  <description>
-    <![CDATA[Creates a new project in Microsoft Visual SourceSafe.
- <p>
- The following attributes are interpreted:
- <table border="1">
-   <tr>
-     <th>Attribute</th>
-     <th>Values</th>
-     <th>Required</th>
-   </tr>
-   <tr>
-      <td>login</td>
-      <td>username,password</td>
-      <td>No</td>
-   </tr>
-   <tr>
-      <td>vsspath</td>
-      <td>SourceSafe path of project to be created</td>
-      <td>Yes</td>
-   </tr>
-   <tr>
-      <td>ssdir</td>
-      <td>directory where <code>ss.exe</code> resides. By default the task
-      expects it to be in the PATH.</td>
-      <td>No</td>
-   </tr>
-   <tr>
-      <td>quiet</td>
-      <td>suppress output (off by default)</td>
-      <td>No</td>
-   </tr>
-   <tr>
-      <td>failOnError</td>
-      <td>fail if there is an error creating the project (true by default)</td>
-      <td>No</td>
-   </tr>   
-   <tr>
-      <td>autoresponse</td>
-      <td>What to respond with (sets the -I option). By default, -I- is
-      used; values of Y or N will be appended to this.</td>
-      <td>No</td>
-   </tr>
-   <tr>
-      <td>comment</td>
-      <td>The comment to use for this label. Empty or '-' for no comment.</td>
-      <td>No</td>
-   </tr>
- </table>]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="autoresponse" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[What to respond with (sets the -I option).]]></short-description>
-        <description><![CDATA[
-          What to respond with (sets the -I option). By default, -I- is
- used; values of Y or N will be appended to this.
-        ]]></description>
-      </attribute>
-      <attribute name="comment" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Comment to apply in SourceSafe.]]></short-description>
-        <description><![CDATA[
-          Sets the comment to apply in SourceSafe.
- <p>
- If this is null or empty, it will be replaced with "-" which
- is what SourceSafe uses for an empty comment.
-        ]]></description>
-      </attribute>
-      <attribute name="failonerror" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Sets whether task should fail if there is an error creating the project;
- optional, default true.]]></short-description>
-        <description><![CDATA[
-          Sets whether task should fail if there is an error creating the project;
- optional, default true.
-        ]]></description>
-      </attribute>
-      <attribute name="login" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[The login to use when accessing VSS, formatted as "username,password";
- optional.]]></short-description>
-        <description><![CDATA[
-          The login to use when accessing VSS, formatted as "username,password";
- optional.
- <p>
- You can omit the password if your database is not password protected.
-  if you have a password and omit it, Ant/VSS will hang.
-        ]]></description>
-      </attribute>
-      <attribute name="quiet" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Sets/clears quiet mode; optional, default false.]]></short-description>
-        <description><![CDATA[
-          Sets/clears quiet mode; optional, default false.
-        ]]></description>
-      </attribute>
-      <attribute name="serverpath" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Directory where <code>srssafe.ini</code> resides; optional.]]></short-description>
-        <description><![CDATA[
-          Set the directory where <code>srssafe.ini</code> resides; optional.
-        ]]></description>
-      </attribute>
-      <attribute name="ssdir" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Directory where <code>ss.exe</code> resides; optional.]]></short-description>
-        <description><![CDATA[
-          directory where <code>ss.exe</code> resides; optional.
- By default the task expects it to be in the PATH.
-        ]]></description>
-      </attribute>
-      <attribute name="vsspath" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[SourceSafe path which specifies the project/file(s) you wish to 
- perform the action on; required.]]></short-description>
-        <description><![CDATA[
-          SourceSafe path which specifies the project/file(s) you wish to 
- perform the action on; required. You should not specify the leading dollar-sign - 
- it is prepended by Ant automatically.
- <p>
- Ant can't cope with a '$' sign in an attribute so we have to add it here.
- Also we strip off any 'vss://' prefix which is an XMS special and should probably be removed!
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="vssget" category="scm"
-      classname="org.apache.tools.ant.taskdefs.optional.vss.MSVSSGET"
-      >
-
-  <short-description><![CDATA[Perform Get commands to Microsoft Visual SourceSafe.]]></short-description>
-  <description>
-    <![CDATA[Perform Get commands to Microsoft Visual SourceSafe.
- <p>
- The following attributes are interpreted:
- <table border="1">
-   <tr>
-     <th>Attribute</th>
-     <th>Values</th>
-     <th>Required</th>
-   </tr>
-   <tr>
-      <td>login</td>
-      <td>username,password</td>
-      <td>No</td>
-   </tr>
-   <tr>
-      <td>vsspath</td>
-      <td>SourceSafe path</td>
-      <td>Yes</td>
-   </tr>
-   <tr>
-      <td>localpath</td>
-      <td>Override the working directory and get to the specified path</td>
-      <td>No</td>
-   </tr>
-   <tr>
-      <td>writable</td>
-      <td>true or false</td>
-      <td>No</td>
-   </tr>
-   <tr>
-      <td>recursive</td>
-      <td>true or false</td>
-      <td>No</td>
-   </tr>
-   <tr>
-      <td>version</td>
-      <td>a version number to get</td>
-      <td>No</td>
-   </tr>
-   <tr>
-      <td>date</td>
-      <td>a date stamp to get at</td>
-      <td>No</td>
-   </tr>
-   <tr>
-      <td>label</td>
-      <td>a label to get for</td>
-      <td>No</td>
-   </tr>
-   <tr>
-      <td>quiet</td>
-      <td>suppress output (off by default)</td>
-      <td>No</td>
-   </tr>
-   <tr>
-      <td>autoresponse</td>
-      <td>What to respond with (sets the -I option). By default, -I- is
-      used; values of Y or N will be appended to this.</td>
-      <td>No</td>
-   </tr>
- </table>
- <p>Note that only one of version, date or label should be specified</p>]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="autoresponse" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[What to respond with (sets the -I option).]]></short-description>
-        <description><![CDATA[
-          What to respond with (sets the -I option). By default, -I- is
- used; values of Y or N will be appended to this.
-        ]]></description>
-      </attribute>
-      <attribute name="date" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Date to get;
- optional, only one of <tt>version</tt>, <tt>label</tt>, or <tt>date</tt>
- allowed.]]></short-description>
-        <description><![CDATA[
-          Set the date to get;
- optional, only one of <tt>version</tt>, <tt>label</tt>, or <tt>date</tt>
- allowed.
- <p>
- ORIGINAL COMMENT THAT DOES NOT SEEM AT ALL VALID:
- Note we assume that if the supplied string has the value "null" that something
- went wrong and that the string value got populated from a null object. This
- happens if a ant variable is used e.g. date="${date}" when date
- has not been defined to ant!
-        ]]></description>
-      </attribute>
-      <attribute name="label" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Label to get;
- optional, only one of <tt>version</tt>, <tt>label</tt>, or <tt>date</tt>
- allowed.]]></short-description>
-        <description><![CDATA[
-          Set the label to get;
- optional, only one of <tt>version</tt>, <tt>label</tt>, or <tt>date</tt>
- allowed.
- <p>
- Note we assume that if the supplied string has the value "null" that something
- went wrong and that the string value got populated from a null object. This
- happens if a ant variable is used e.g. label="${label_server}" when label_server
- has not been defined to ant!
-        ]]></description>
-      </attribute>
-      <attribute name="localpath" type="org.apache.tools.ant.types.Path"
-                 briefType="Path" required="NOTDEFINED">
-        <short-description><![CDATA[Override the working directory and get to the specified path; optional.]]></short-description>
-        <description><![CDATA[
-          Override the working directory and get to the specified path; optional.
-        ]]></description>
-      </attribute>
-      <attribute name="login" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[The login to use when accessing VSS, formatted as "username,password";
- optional.]]></short-description>
-        <description><![CDATA[
-          The login to use when accessing VSS, formatted as "username,password";
- optional.
- <p>
- You can omit the password if your database is not password protected.
-  if you have a password and omit it, Ant/VSS will hang.
-        ]]></description>
-      </attribute>
-      <attribute name="quiet" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Flag to suppress output when true ; false by default.]]></short-description>
-        <description><![CDATA[
-          Flag to suppress output when true ; false by default.
-        ]]></description>
-      </attribute>
-      <attribute name="recursive" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Flag to tell the task to recurse down the tree;
- optional, default false.]]></short-description>
-        <description><![CDATA[
-          Flag to tell the task to recurse down the tree;
- optional, default false.
-        ]]></description>
-      </attribute>
-      <attribute name="serverpath" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Directory where <code>srssafe.ini</code> resides; optional.]]></short-description>
-        <description><![CDATA[
-          Set the directory where <code>srssafe.ini</code> resides; optional.
-        ]]></description>
-      </attribute>
-      <attribute name="ssdir" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Directory where <code>ss.exe</code> resides; optional.]]></short-description>
-        <description><![CDATA[
-          directory where <code>ss.exe</code> resides; optional.
- By default the task expects it to be in the PATH.
-        ]]></description>
-      </attribute>
-      <attribute name="version" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Version number to get; 
- optional, only one of <tt>version</tt>, <tt>label</tt>, or <tt>date</tt>
- allowed.]]></short-description>
-        <description><![CDATA[
-          Set a version number to get; 
- optional, only one of <tt>version</tt>, <tt>label</tt>, or <tt>date</tt>
- allowed.
- <p>
- ORIGINAL COMMENT THAT DOES NOT SEEM AT ALL VALID:
- Note we assume that if the supplied string has the value "null" that something
- went wrong and that the string value got populated from a null object. This
- happens if a ant variable is used e.g. version="${ver_server}" when ver_server
- has not been defined to ant!
- NO, in this case the version string is "${ver_server}".
-        ]]></description>
-      </attribute>
-      <attribute name="vsspath" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[SourceSafe path which specifies the project/file(s) you wish to 
- perform the action on; required.]]></short-description>
-        <description><![CDATA[
-          SourceSafe path which specifies the project/file(s) you wish to 
- perform the action on; required. You should not specify the leading dollar-sign - 
- it is prepended by Ant automatically.
- <p>
- Ant can't cope with a '$' sign in an attribute so we have to add it here.
- Also we strip off any 'vss://' prefix which is an XMS special and should probably be removed!
-        ]]></description>
-      </attribute>
-      <attribute name="writable" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Make fetched files  writable; optional, default false.]]></short-description>
-        <description><![CDATA[
-          make fetched files  writable; optional, default false.
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="vsshistory" category="scm"
-      classname="org.apache.tools.ant.taskdefs.optional.vss.MSVSSHISTORY"
-      >
-
-  <short-description><![CDATA[Performs History commands to Microsoft Visual SourceSafe.]]></short-description>
-  <description>
-    <![CDATA[Performs History commands to Microsoft Visual SourceSafe.]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="dateformat" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Format of dates in fromDate and toDate; optional.]]></short-description>
-        <description><![CDATA[
-          Format of dates in fromDate and toDate; optional.
- Used when calculating dates with 
- the numdays attribute. 
- This string uses the formatting rules of SimpleDateFormat. 
-  Defaults to DateFormat.SHORT.
-        ]]></description>
-      </attribute>
-      <attribute name="fromdate" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Start Date for the Comparison of two versions; optional.]]></short-description>
-        <description><![CDATA[
-          Set the Start Date for the Comparison of two versions; optional.
-        ]]></description>
-      </attribute>
-      <attribute name="fromlabel" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Start Label; optional.]]></short-description>
-        <description><![CDATA[
-          Set the Start Label; optional
-        ]]></description>
-      </attribute>
-      <attribute name="login" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[The login to use when accessing VSS, formatted as "username,password";
- optional.]]></short-description>
-        <description><![CDATA[
-          The login to use when accessing VSS, formatted as "username,password";
- optional.
- <p>
- You can omit the password if your database is not password protected.
-  if you have a password and omit it, Ant/VSS will hang.
-        ]]></description>
-      </attribute>
-      <attribute name="numdays" type="int"
-                 briefType="int" required="NOTDEFINED">
-        <short-description><![CDATA[Number of days for comparison; 
- optional.]]></short-description>
-        <description><![CDATA[
-          Set the number of days for comparison; 
- optional.
- <p>
- The default value is 2 days. (maybe)
-        ]]></description>
-      </attribute>
-      <attribute name="output" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[Output file name for the history; optional.]]></short-description>
-        <description><![CDATA[
-          Set the output file name for the history; optional.
-        ]]></description>
-      </attribute>
-      <attribute name="recursive" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Flag to tell the task to recurse down the tree;
- optional, default false.]]></short-description>
-        <description><![CDATA[
-          Flag to tell the task to recurse down the tree;
- optional, default false.
-        ]]></description>
-      </attribute>
-      <attribute name="serverpath" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Directory where <code>srssafe.ini</code> resides; optional.]]></short-description>
-        <description><![CDATA[
-          Set the directory where <code>srssafe.ini</code> resides; optional.
-        ]]></description>
-      </attribute>
-      <attribute name="ssdir" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Directory where <code>ss.exe</code> resides; optional.]]></short-description>
-        <description><![CDATA[
-          directory where <code>ss.exe</code> resides; optional.
- By default the task expects it to be in the PATH.
-        ]]></description>
-      </attribute>
-      <attribute name="style" type="org.apache.tools.ant.taskdefs.optional.vss.MSVSSHISTORY.BriefCodediffNofile"
-                 briefType="&quot;brief&quot;, &quot;codediff&quot;, &quot;nofile&quot;, &quot;default&quot;" required="NOTDEFINED">
-        <short-description><![CDATA[Specify the output style; optional.]]></short-description>
-        <description><![CDATA[
-          Specify the output style; optional.
-        ]]></description>
-      </attribute>
-      <attribute name="todate" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[End Date for the Comparison of two versions; optional.]]></short-description>
-        <description><![CDATA[
-          Set the End Date for the Comparison of two versions; optional.
-        ]]></description>
-      </attribute>
-      <attribute name="tolabel" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[End Label ; optional.]]></short-description>
-        <description><![CDATA[
-          Set the End Label ; optional
-        ]]></description>
-      </attribute>
-      <attribute name="user" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Name the user whose changes we would like to see; optional.]]></short-description>
-        <description><![CDATA[
-          Name the user whose changes we would like to see; optional
-        ]]></description>
-      </attribute>
-      <attribute name="vsspath" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[SourceSafe path which specifies the project/file(s) you wish to 
- perform the action on; required.]]></short-description>
-        <description><![CDATA[
-          SourceSafe path which specifies the project/file(s) you wish to 
- perform the action on; required. You should not specify the leading dollar-sign - 
- it is prepended by Ant automatically.
- <p>
- Ant can't cope with a '$' sign in an attribute so we have to add it here.
- Also we strip off any 'vss://' prefix which is an XMS special and should probably be removed!
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="vsslabel" category="scm"
-      classname="org.apache.tools.ant.taskdefs.optional.vss.MSVSSLABEL"
-      >
-
-  <short-description><![CDATA[Performs Label commands to Microsoft Visual SourceSafe.]]></short-description>
-  <description>
-    <![CDATA[Performs Label commands to Microsoft Visual SourceSafe.
-
- <p>
- The following attributes are interpreted:
- <table border="1">
-   <tr>
-     <th>Attribute</th>
-     <th>Values</th>
-     <th>Required</th>
-   </tr>
-   <tr>
-      <td>login</td>
-      <td>username,password</td>
-      <td>No</td>
-   </tr>
-   <tr>
-      <td>vsspath</td>
-      <td>SourceSafe path</td>
-      <td>Yes</td>
-   </tr>
-   <tr>
-      <td>ssdir</td>
-      <td>directory where <code>ss.exe</code> resides. By default the task
-      expects it to be in the PATH.</td>
-      <td>No</td>
-   </tr>
-   <tr>
-      <td>label</td>
-      <td>A label to apply to the hierarchy</td>
-      <td>Yes</td>
-   </tr>
-   <tr>
-      <td>version</td>
-      <td>An existing file or project version to label</td>
-      <td>No</td>
-   </tr>
-   <tr>
-      <td>autoresponse</td>
-      <td>What to respond with (sets the -I option). By default, -I- is
-      used; values of Y or N will be appended to this.</td>
-      <td>No</td>
-   </tr>
-   <tr>
-      <td>comment</td>
-      <td>The comment to use for this label. Empty or '-' for no comment.</td>
-      <td>No</td>
-   </tr>
- </table>]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="autoresponse" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[What to respond with (sets the -I option).]]></short-description>
-        <description><![CDATA[
-          What to respond with (sets the -I option). By default, -I- is
- used; values of Y or N will be appended to this.
-        ]]></description>
-      </attribute>
-      <attribute name="comment" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[The comment to use for this label; optional.]]></short-description>
-        <description><![CDATA[
-          The comment to use for this label; optional.
- Empty or '-' for no comment.
- <p>
- If this is null or empty, it will be replaced with "-" which
- is what SourceSafe uses for an empty comment.
-        ]]></description>
-      </attribute>
-      <attribute name="label" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Label to apply; required.]]></short-description>
-        <description><![CDATA[
-          Set the label to apply; required.
- <p>
- Note we assume that if the supplied string has the value "null" that something
- went wrong and that the string value got populated from a null object. This
- happens if a ant variable is used e.g. label="${label_server}" when label_server
- has not been defined to ant!
-        ]]></description>
-      </attribute>
-      <attribute name="login" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[The login to use when accessing VSS, formatted as "username,password";
- optional.]]></short-description>
-        <description><![CDATA[
-          The login to use when accessing VSS, formatted as "username,password";
- optional.
- <p>
- You can omit the password if your database is not password protected.
-  if you have a password and omit it, Ant/VSS will hang.
-        ]]></description>
-      </attribute>
-      <attribute name="serverpath" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Directory where <code>srssafe.ini</code> resides; optional.]]></short-description>
-        <description><![CDATA[
-          Set the directory where <code>srssafe.ini</code> resides; optional.
-        ]]></description>
-      </attribute>
-      <attribute name="ssdir" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Directory where <code>ss.exe</code> resides; optional.]]></short-description>
-        <description><![CDATA[
-          directory where <code>ss.exe</code> resides; optional.
- By default the task expects it to be in the PATH.
-        ]]></description>
-      </attribute>
-      <attribute name="version" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Name an existing file or project version to label; optional.]]></short-description>
-        <description><![CDATA[
-          Name an existing file or project version to label; optional.
- By default the current version is labelled.
- <p>
- Note we assume that if the supplied string has the value "null" that something
- went wrong and that the string value got populated from a null object. This
- happens if a ant variable is used e.g. version="${ver_server}" when ver_server
- has not been defined to ant!
-        ]]></description>
-      </attribute>
-      <attribute name="vsspath" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[SourceSafe path which specifies the project/file(s) you wish to 
- perform the action on; required.]]></short-description>
-        <description><![CDATA[
-          SourceSafe path which specifies the project/file(s) you wish to 
- perform the action on; required. You should not specify the leading dollar-sign - 
- it is prepended by Ant automatically.
- <p>
- Ant can't cope with a '$' sign in an attribute so we have to add it here.
- Also we strip off any 'vss://' prefix which is an XMS special and should probably be removed!
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="waitfor" category="control"
-      classname="org.apache.tools.ant.taskdefs.WaitFor"
-      >
-
-  <short-description><![CDATA[Wait for an external event to occur.]]></short-description>
-  <description>
-    <![CDATA[Wait for an external event to occur.
-
- Wait for an external process to start or to complete some
- task. This is useful with the <code>parallel</code> task to
- syncronize the execution of tests with server startup.
-
- The following attributes can be specified on a waitfor task:
- <ul>
- <li>maxwait - maximum length of time to wait before giving up</li>
- <li>maxwaitunit - The unit to be used to interpret maxwait attribute</li>
- <li>checkevery - amount of time to sleep between each check</li>
- <li>checkeveryunit - The unit to be used to interpret checkevery attribute</li>
- <li>timeoutproperty - name of a property to set if maxwait has been exceeded.</li>
- </ul>
-
- The maxwaitunit and checkeveryunit are allowed to have the following values:
- millesond, second, minute, hour, day and week. The default is millisecond.]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="checkevery" type="long"
-                 briefType="long" required="NOTDEFINED">
-        <short-description><![CDATA[Time between each check.]]></short-description>
-        <description><![CDATA[
-          Set the time between each check
-        ]]></description>
-      </attribute>
-      <attribute name="checkeveryunit" type="org.apache.tools.ant.taskdefs.WaitFor.Unit"
-                 briefType="&quot;millisecond&quot;, &quot;second&quot;, &quot;minute&quot;, &quot;hour&quot;, &quot;day&quot;, &quot;week&quot;" required="NOTDEFINED">
-        <short-description><![CDATA[Check every time unit.]]></short-description>
-        <description><![CDATA[
-          Set the check every time unit
-        ]]></description>
-      </attribute>
-      <attribute name="maxwait" type="long"
-                 briefType="long" required="NOTDEFINED">
-        <short-description><![CDATA[Maximum length of time to wait.]]></short-description>
-        <description><![CDATA[
-          Set the maximum length of time to wait
-        ]]></description>
-      </attribute>
-      <attribute name="maxwaitunit" type="org.apache.tools.ant.taskdefs.WaitFor.Unit"
-                 briefType="&quot;millisecond&quot;, &quot;second&quot;, &quot;minute&quot;, &quot;hour&quot;, &quot;day&quot;, &quot;week&quot;" required="NOTDEFINED">
-        <short-description><![CDATA[Max wait time unit.]]></short-description>
-        <description><![CDATA[
-          Set the max wait time unit
-        ]]></description>
-      </attribute>
-      <attribute name="timeoutproperty" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Name the property to set after a timeout.]]></short-description>
-        <description><![CDATA[
-          Name the property to set after a timeout.
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-      <element name="and" type="org.apache.tools.ant.taskdefs.condition.And"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[Add an &lt;and&gt; condition "container".]]></short-description>
-        <description>
-          <![CDATA[Add an &lt;and&gt; condition "container".]]>
-        </description>
-      </element>
-
-      <element name="available" type="org.apache.tools.ant.taskdefs.Available"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[Add an &lt;available&gt; condition.]]></short-description>
-        <description>
-          <![CDATA[Add an &lt;available&gt; condition.]]>
-        </description>
-      </element>
-
-      <element name="checksum" type="org.apache.tools.ant.taskdefs.Checksum"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[Add an &lt;checksum&gt; condition.]]></short-description>
-        <description>
-          <![CDATA[Add an &lt;checksum&gt; condition.]]>
-        </description>
-      </element>
-
-      <element name="contains" type="org.apache.tools.ant.taskdefs.condition.Contains"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[Add a &lt;contains&gt; condition.]]></short-description>
-        <description>
-          <![CDATA[Add a &lt;contains&gt; condition.]]>
-        </description>
-      </element>
-
-      <element name="equals" type="org.apache.tools.ant.taskdefs.condition.Equals"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[Add an &lt;equals&gt; condition.]]></short-description>
-        <description>
-          <![CDATA[Add an &lt;equals&gt; condition.]]>
-        </description>
-      </element>
-
-      <element name="filesmatch" type="org.apache.tools.ant.taskdefs.condition.FilesMatch"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[Add a &lt;filesmatch&gt; condition.]]></short-description>
-        <description>
-          <![CDATA[Add a &lt;filesmatch&gt; condition.]]>
-        </description>
-      </element>
-
-      <element name="http" type="org.apache.tools.ant.taskdefs.condition.Http"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[Add an &lt;http&gt; condition.]]></short-description>
-        <description>
-          <![CDATA[Add an &lt;http&gt; condition.]]>
-        </description>
-      </element>
-
-      <element name="isfalse" type="org.apache.tools.ant.taskdefs.condition.IsFalse"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[Add a &lt;isfalse&gt; condition.]]></short-description>
-        <description>
-          <![CDATA[Add a &lt;isfalse&gt; condition.]]>
-        </description>
-      </element>
-
-      <element name="isset" type="org.apache.tools.ant.taskdefs.condition.IsSet"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[Add an &lt;isset&gt; condition.]]></short-description>
-        <description>
-          <![CDATA[Add an &lt;isset&gt; condition.]]>
-        </description>
-      </element>
-
-      <element name="istrue" type="org.apache.tools.ant.taskdefs.condition.IsTrue"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[Add a &lt;istrue&gt; condition.]]></short-description>
-        <description>
-          <![CDATA[Add a &lt;istrue&gt; condition.]]>
-        </description>
-      </element>
-
-      <element name="not" type="org.apache.tools.ant.taskdefs.condition.Not"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[Add an &lt;not&gt; condition "container".]]></short-description>
-        <description>
-          <![CDATA[Add an &lt;not&gt; condition "container".]]>
-        </description>
-      </element>
-
-      <element name="or" type="org.apache.tools.ant.taskdefs.condition.Or"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[Add an &lt;or&gt; condition "container".]]></short-description>
-        <description>
-          <![CDATA[Add an &lt;or&gt; condition "container".]]>
-        </description>
-      </element>
-
-      <element name="os" type="org.apache.tools.ant.taskdefs.condition.Os"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[Add an &lt;os&gt; condition.]]></short-description>
-        <description>
-          <![CDATA[Add an &lt;os&gt; condition.]]>
-        </description>
-      </element>
-
-      <element name="socket" type="org.apache.tools.ant.taskdefs.condition.Socket"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[Add a &lt;socket&gt; condition.]]></short-description>
-        <description>
-          <![CDATA[Add a &lt;socket&gt; condition.]]>
-        </description>
-      </element>
-
-      <element name="uptodate" type="org.apache.tools.ant.taskdefs.UpToDate"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[Add an &lt;uptodate&gt; condition.]]></short-description>
-        <description>
-          <![CDATA[Add an &lt;uptodate&gt; condition.]]>
-        </description>
-      </element>
-
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="war" category="packaging"
-      classname="org.apache.tools.ant.taskdefs.War"
-      matchingTask="true">
-
-  <short-description><![CDATA[An extension of &lt;jar&gt; to create a WAR archive.]]></short-description>
-  <description>
-    <![CDATA[An extension of &lt;jar&gt; to create a WAR archive.
- Contains special treatment for files that should end up in the
- <code>WEB-INF/lib</code>, <code>WEB-INF/classes</code> or
- <code>WEB-INF</code> directories of the Web Application Archive.</p>
- <p>(The War task is a shortcut for specifying the particular layout of a WAR file. 
- The same thing can be accomplished by using the <i>prefix</i> and <i>fullpath</i>
- attributes of zipfilesets in a Zip or Jar task.)</p>
- <p>The extended zipfileset element from the zip task (with attributes <i>prefix</i>, <i>fullpath</i>, and <i>src</i>) is available in the War task.</p>]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="basedir" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[Directory from which to archive files; optional.]]></short-description>
-        <description><![CDATA[
-          Directory from which to archive files; optional.
-        ]]></description>
-      </attribute>
-      <attribute name="compress" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Whether we want to compress the files or only store them;
- optional, default=true;.]]></short-description>
-        <description><![CDATA[
-          Whether we want to compress the files or only store them;
- optional, default=true;
-        ]]></description>
-      </attribute>
-      <attribute name="destfile" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[The file to create; required.]]></short-description>
-        <description><![CDATA[
-          The file to create; required.
-        ]]></description>
-      </attribute>
-      <attribute name="duplicate" type="org.apache.tools.ant.taskdefs.Zip.Duplicate"
-                 briefType="&quot;add&quot;, &quot;preserve&quot;, &quot;fail&quot;" required="NOTDEFINED">
-        <short-description><![CDATA[Sets behavior for when a duplicate file is about to be added -
- one of <code>keep</code>, <code>skip</code> or <code>overwrite</code>.]]></short-description>
-        <description><![CDATA[
-          Sets behavior for when a duplicate file is about to be added -
- one of <code>keep</code>, <code>skip</code> or <code>overwrite</code>.
- Possible values are: <code>keep</code> (keep both
- of the files); <code>skip</code> (keep the first version
- of the file found); <code>overwrite</code> overwrite the file
- with the new file
- Default for zip tasks is <code>keep</code>
-        ]]></description>
-      </attribute>
-      <attribute name="encoding" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Encoding to use for filenames, defaults to the platform's
- default encoding.]]></short-description>
-        <description><![CDATA[
-          Encoding to use for filenames, defaults to the platform's
- default encoding.
-
- <p>For a list of possible values see <a
- href="http://java.sun.com/products/jdk/1.2/docs/guide/internat/encoding.doc.html">http://java.sun.com/products/jdk/1.2/docs/guide/internat/encoding.doc.html</a>.</p>
-        ]]></description>
-      </attribute>
-      <attribute name="filesonly" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[If true, emulate Sun's jar utility by not adding parent directories;
- optional, defaults to false.]]></short-description>
-        <description><![CDATA[
-          If true, emulate Sun's jar utility by not adding parent directories;
- optional, defaults to false.
-        ]]></description>
-      </attribute>
-      <attribute name="index" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Set whether or not to create an index list for classes.]]></short-description>
-        <description><![CDATA[
-          Set whether or not to create an index list for classes.
- This may speed up classloading in some cases.
-        ]]></description>
-      </attribute>
-      <attribute name="manifest" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[The manifest file to use.]]></short-description>
-        <description><![CDATA[
-          The manifest file to use. This can be either the location of a manifest,
- or the name of a jar added through a fileset. If its the name of an added
- jar, the task expects the manifest to be in the jar at META-INF/MANIFEST.MF.
-        ]]></description>
-      </attribute>
-      <attribute name="update" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[If true, updates an existing file, otherwise overwrite
- any existing one; optional defaults to false.]]></short-description>
-        <description><![CDATA[
-          If true, updates an existing file, otherwise overwrite
- any existing one; optional defaults to false.
-        ]]></description>
-      </attribute>
-      <attribute name="webxml" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[Deployment descriptor to use (WEB-INF/web.xml);
- required unless <tt>update=true</tt>.]]></short-description>
-        <description><![CDATA[
-          set the deployment descriptor to use (WEB-INF/web.xml);
- required unless <tt>update=true</tt>
-        ]]></description>
-      </attribute>
-      <attribute name="whenempty" type="org.apache.tools.ant.taskdefs.Zip.WhenEmpty"
-                 briefType="&quot;fail&quot;, &quot;skip&quot;, &quot;create&quot;" required="NOTDEFINED">
-        <short-description><![CDATA[Sets behavior of the task when no files match.]]></short-description>
-        <description><![CDATA[
-          Sets behavior of the task when no files match.
- Possible values are: <code>fail</code> (throw an exception
- and halt the build); <code>skip</code> (do not create
- any archive, but issue a warning); <code>create</code>
- (make an archive with no entries).
- Default for zip tasks is <code>skip</code>;
- for jar tasks, <code>create</code>.
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-      <element name="classes" type="org.apache.tools.ant.types.ZipFileSet"
-               briefType="ZipFileset"
-               required="NOTDEFINED">
-        <short-description><![CDATA[Add files under WEB-INF/classes.]]></short-description>
-        <description>
-          <![CDATA[add files under WEB-INF/classes]]>
-        </description>
-      </element>
-
-      <element name="manifest" type="org.apache.tools.ant.taskdefs.Manifest"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[Allows the manifest for the archive file to be provided inline
- in the buildfile rather than in an external file.]]></short-description>
-        <description>
-          <![CDATA[Allows the manifest for the archive file to be provided inline
- in the buildfile rather than in an external file.]]>
-        </description>
-      </element>
-
-      <element name="fileset" type="org.apache.tools.ant.types.FileSet"
-               briefType="Fileset"
-               required="NOTDEFINED">
-        <short-description><![CDATA[Adds a set of files.]]></short-description>
-        <description>
-          <![CDATA[Adds a set of files.]]>
-        </description>
-      </element>
-
-      <element name="lib" type="org.apache.tools.ant.types.ZipFileSet"
-               briefType="ZipFileset"
-               required="NOTDEFINED">
-        <short-description><![CDATA[Add files under WEB-INF/lib/.]]></short-description>
-        <description>
-          <![CDATA[add files under WEB-INF/lib/]]>
-        </description>
-      </element>
-
-      <element name="metainf" type="org.apache.tools.ant.types.ZipFileSet"
-               briefType="ZipFileset"
-               required="NOTDEFINED">
-        <short-description><![CDATA[Adds a zipfileset to include in the META-INF directory.]]></short-description>
-        <description>
-          <![CDATA[Adds a zipfileset to include in the META-INF directory.]]>
-        </description>
-      </element>
-
-      <element name="webinf" type="org.apache.tools.ant.types.ZipFileSet"
-               briefType="ZipFileset"
-               required="NOTDEFINED">
-        <short-description><![CDATA[Files to add under WEB-INF;.]]></short-description>
-        <description>
-          <![CDATA[files to add under WEB-INF;]]>
-        </description>
-      </element>
-
-      <element name="zipgroupfileset" type="org.apache.tools.ant.types.FileSet"
-               briefType="Fileset"
-               required="NOTDEFINED">
-        <short-description><![CDATA[Adds a group of zip files.]]></short-description>
-        <description>
-          <![CDATA[Adds a group of zip files.]]>
-        </description>
-      </element>
-
-      <element name="zipfileset" type="org.apache.tools.ant.types.ZipFileSet"
-               briefType="ZipFileset"
-               required="NOTDEFINED">
-        <short-description><![CDATA[Adds a set of files that can be
- read from an archive and be given a prefix/fullpath.]]></short-description>
-        <description>
-          <![CDATA[Adds a set of files that can be
- read from an archive and be given a prefix/fullpath.]]>
-        </description>
-      </element>
-
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="wljspc" category="other"
-      classname="org.apache.tools.ant.taskdefs.optional.jsp.WLJspc"
-      matchingTask="true">
-
-  <short-description><![CDATA[Precompiles JSP's using WebLogic's JSP compiler (weblogic.jspc).]]></short-description>
-  <description>
-    <![CDATA[Precompiles JSP's using WebLogic's JSP compiler (weblogic.jspc).]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="classpath" type="org.apache.tools.ant.types.Path"
-                 briefType="Path" required="NOTDEFINED">
-        <short-description><![CDATA[Classpath to be used for this compilation.]]></short-description>
-        <description><![CDATA[
-          Set the classpath to be used for this compilation.
-        ]]></description>
-      </attribute>
-      <attribute name="dest" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[Directory containing the source jsp's.]]></short-description>
-        <description><![CDATA[
-          Set the directory containing the source jsp's
-        ]]></description>
-      </attribute>
-      <attribute name="package" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Package under which the compiled classes go.]]></short-description>
-        <description><![CDATA[
-          Set the package under which the compiled classes go
-        ]]></description>
-      </attribute>
-      <attribute name="src" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[Directory containing the source jsp's.]]></short-description>
-        <description><![CDATA[
-          Set the directory containing the source jsp's
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-      <element name="classpath" type="org.apache.tools.ant.types.Path"
-               briefType="Path"
-               required="NOTDEFINED">
-        <short-description><![CDATA[Maybe creates a nested classpath element.]]></short-description>
-        <description>
-          <![CDATA[Maybe creates a nested classpath element.]]>
-        </description>
-      </element>
-
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="wlrun" category="other"
-      classname="org.apache.tools.ant.taskdefs.optional.ejb.WLRun"
-      >
-
-  <short-description><![CDATA[Starts a WebLogic server.]]></short-description>
-  <description>
-    <![CDATA[Starts a WebLogic server.
- A number of parameters are used to control the operation of the weblogic instance. Note that the task,
- and hence ant, will not complete until the weblogic instance is stopped.</p>]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="args" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Additional argument string passed to the Weblogic instance;
- optional.]]></short-description>
-        <description><![CDATA[
-          Additional argument string passed to the Weblogic instance;
- optional.
-        ]]></description>
-      </attribute>
-      <attribute name="beahome" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[The location of the BEA Home; implicitly
- selects Weblogic 6.0; optional.]]></short-description>
-        <description><![CDATA[
-          The location of the BEA Home; implicitly
- selects Weblogic 6.0; optional.
-        ]]></description>
-      </attribute>
-      <attribute name="classpath" type="org.apache.tools.ant.types.Path"
-                 briefType="Path" required="NOTDEFINED">
-        <short-description><![CDATA[The classpath to be used with the Java Virtual Machine that runs the Weblogic
- Server; required.]]></short-description>
-        <description><![CDATA[
-          The classpath to be used with the Java Virtual Machine that runs the Weblogic
- Server; required. Prior to Weblogic 6.0, this is typically set to the Weblogic
- boot classpath. Under Weblogic 6.0 this should include all the
- weblogic jars
-        ]]></description>
-      </attribute>
-      <attribute name="domain" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Domain to run in; required for WL6.0.]]></short-description>
-        <description><![CDATA[
-          Set the Domain to run in; required for WL6.0
-        ]]></description>
-      </attribute>
-      <attribute name="home" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[The location where weblogic lives.]]></short-description>
-        <description><![CDATA[
-          The location where weblogic lives.
- Required. This is the absolute location, not relative to
-  BEA home.
-        ]]></description>
-      </attribute>
-      <attribute name="jvmargs" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Additional arguments to pass to the weblogic JVM.]]></short-description>
-        <description><![CDATA[
-          Set the additional arguments to pass to the weblogic JVM
-        ]]></description>
-      </attribute>
-      <attribute name="name" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[The name of the weblogic server within the weblogic home which is to be run.]]></short-description>
-        <description><![CDATA[
-          The name of the weblogic server within the weblogic home which is to be run.
- Optiona, defaults to &quot;myserver&quot;
-        ]]></description>
-      </attribute>
-      <attribute name="pkpassword" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Private key password so the server can decrypt the SSL private key file;
- optional and only applicable to WL6.0.]]></short-description>
-        <description><![CDATA[
-          Set the private key password so the server can decrypt the SSL private key file;
- optional and only applicable to WL6.0.
-        ]]></description>
-      </attribute>
-      <attribute name="password" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Management password of the server;
- optional and only applicable to WL6.0.]]></short-description>
-        <description><![CDATA[
-          Set the management password of the server;
- optional and only applicable to WL6.0.
-        ]]></description>
-      </attribute>
-      <attribute name="policy" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[The name of the security policy file within the weblogic home directory that
- is to be used.]]></short-description>
-        <description><![CDATA[
-          The name of the security policy file within the weblogic home directory that
- is to be used. If not specified, the default policy file <code>weblogic.policy</code>
- is used.
-        ]]></description>
-      </attribute>
-      <attribute name="properties" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[The name of the server's properties file within the weblogic home directory
- used to control the weblogic instance;
- required for WL4.5.1.]]></short-description>
-        <description><![CDATA[
-          The name of the server's properties file within the weblogic home directory
- used to control the weblogic instance;
- required for WL4.5.1
-        ]]></description>
-      </attribute>
-      <attribute name="username" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Management username to run the server;
- optional and only applicable to WL6.0.]]></short-description>
-        <description><![CDATA[
-          Set the management username to run the server;
- optional and only applicable to WL6.0.
-        ]]></description>
-      </attribute>
-      <attribute name="weblogicmainclass" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Name of the main class for weblogic; optional.]]></short-description>
-        <description><![CDATA[
-          name of the main class for weblogic; optional.
-        ]]></description>
-      </attribute>
-      <attribute name="wlclasspath" type="org.apache.tools.ant.types.Path"
-                 briefType="Path" required="NOTDEFINED">
-        <short-description><![CDATA[Weblogic classpath used by the Weblogic Server;
- optional, and only applicable to WL4.5.1
-
- The weblogic classpath is used by weblogic to support dynamic class loading.]]></short-description>
-        <description><![CDATA[
-          Set the weblogic classpath used by the Weblogic Server;
- optional, and only applicable to WL4.5.1
-
- The weblogic classpath is used by weblogic to support dynamic class loading.
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-      <element name="classpath" type="org.apache.tools.ant.types.Path"
-               briefType="Path"
-               required="NOTDEFINED">
-        <short-description><![CDATA[Add the classpath for the user classes.]]></short-description>
-        <description>
-          <![CDATA[Add the classpath for the user classes]]>
-        </description>
-      </element>
-
-      <element name="wlclasspath" type="org.apache.tools.ant.types.Path"
-               briefType="Path"
-               required="NOTDEFINED">
-        <short-description><![CDATA[Get the classpath to the weblogic classpaths.]]></short-description>
-        <description>
-          <![CDATA[Get the classpath to the weblogic classpaths]]>
-        </description>
-      </element>
-
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="wlstop" category="other"
-      classname="org.apache.tools.ant.taskdefs.optional.ejb.WLStop"
-      >
-
-  <short-description><![CDATA[Shuts down a WebLogic server.]]></short-description>
-  <description>
-    <![CDATA[Shuts down a WebLogic server.
- To shut down an instance you must supply both a username and
- a password.]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="beahome" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[The location of the BEA Home; implicitly
- selects Weblogic 6.0 shutdown; optional.]]></short-description>
-        <description><![CDATA[
-          The location of the BEA Home; implicitly
- selects Weblogic 6.0 shutdown; optional.
-        ]]></description>
-      </attribute>
-      <attribute name="classpath" type="org.apache.tools.ant.types.Path"
-                 briefType="Path" required="NOTDEFINED">
-        <short-description><![CDATA[The classpath to be used with the Java Virtual Machine that runs the Weblogic
- Shutdown command;.]]></short-description>
-        <description><![CDATA[
-          The classpath to be used with the Java Virtual Machine that runs the Weblogic
- Shutdown command;
-        ]]></description>
-      </attribute>
-      <attribute name="delay" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Delay (in seconds) before shutting down the server;
- optional.]]></short-description>
-        <description><![CDATA[
-          Set the delay (in seconds) before shutting down the server;
- optional.
-        ]]></description>
-      </attribute>
-      <attribute name="password" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[The password for the account specified in the
- user parameter; required.]]></short-description>
-        <description><![CDATA[
-          The password for the account specified in the
- user parameter; required
-        ]]></description>
-      </attribute>
-      <attribute name="url" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[URL to which the weblogic server is listening
- for T3 connections; required.]]></short-description>
-        <description><![CDATA[
-          Set the URL to which the weblogic server is listening
- for T3 connections; required.
-        ]]></description>
-      </attribute>
-      <attribute name="user" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[The username of the account which will be used to shutdown the server;
- required.]]></short-description>
-        <description><![CDATA[
-          The username of the account which will be used to shutdown the server;
- required.
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-      <element name="classpath" type="org.apache.tools.ant.types.Path"
-               briefType="Path"
-               required="NOTDEFINED">
-        <short-description><![CDATA[The classpath to be used with the Java Virtual Machine that runs the Weblogic
- Shutdown command;.]]></short-description>
-        <description>
-          <![CDATA[The classpath to be used with the Java Virtual Machine that runs the Weblogic
- Shutdown command;]]>
-        </description>
-      </element>
-
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="wsdltodotnet" category="dotnet"
-      classname="org.apache.tools.ant.taskdefs.optional.dotnet.WsdlToDotnet"
-      >
-
-  <short-description><![CDATA[Converts a WSDL file or URL resource into a .NET language.]]></short-description>
-  <description>
-    <![CDATA[Converts a WSDL file or URL resource into a .NET language.
-
- See "Creating an XML Web Service Proxy", "wsdl.exe" docs in
- the framework SDK documentation]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="destfile" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[Name of the file to generate.]]></short-description>
-        <description><![CDATA[
-          Name of the file to generate. Required
-        ]]></description>
-      </attribute>
-      <attribute name="extraoptions" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Any extra WSDL.EXE options which aren't explicitly
-  supported by the ant wrapper task; optional.]]></short-description>
-        <description><![CDATA[
-          Any extra WSDL.EXE options which aren't explicitly
-  supported by the ant wrapper task; optional
-        ]]></description>
-      </attribute>
-      <attribute name="failonerror" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Should failure halt the build?.]]></short-description>
-        <description><![CDATA[
-          Should failure halt the build? optional, default=true
-        ]]></description>
-      </attribute>
-      <attribute name="language" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Language; one of "CS", "JS", or "VB"
- optional, default is CS for C# source.]]></short-description>
-        <description><![CDATA[
-          set the language; one of "CS", "JS", or "VB"
- optional, default is CS for C# source
-        ]]></description>
-      </attribute>
-      <attribute name="namespace" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Namespace to place  the source in.
- optional; default "".]]></short-description>
-        <description><![CDATA[
-          namespace to place  the source in.
- optional; default ""
-        ]]></description>
-      </attribute>
-      <attribute name="server" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Flag to enable server side code generation;
- optional, default=false.]]></short-description>
-        <description><![CDATA[
-          flag to enable server side code generation;
- optional, default=false
-        ]]></description>
-      </attribute>
-      <attribute name="srcfile" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[The local WSDL file to parse; either url or srcFile is required.]]></short-description>
-        <description><![CDATA[
-          The local WSDL file to parse; either url or srcFile is required.
-        ]]></description>
-      </attribute>
-      <attribute name="url" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[URL to fetch.]]></short-description>
-        <description><![CDATA[
-          Sets the URL to fetch. Fetching is by wsdl.exe; Ant proxy settings
- are ignored; either url or srcFile is required.
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="xmlproperty" category="xml"
-      classname="org.apache.tools.ant.taskdefs.XmlProperty"
-      >
-
-  <short-description><![CDATA[Loads property values from a valid XML file, generating the property names from the file's element and attribute names.]]></short-description>
-  <description>
-    <![CDATA[Loads property values from a valid XML file,
- generating the property names from the file's element and attribute names.
-
- Example:
- <pre>
-   &lt;root-tag myattr="true"&gt;
-     &lt;inner-tag someattr="val"&gt;Text&lt;/inner-tag&gt;
-     &lt;a2&gt;&lt;a3&gt;&lt;a4&gt;false&lt;/a4&gt;&lt;/a3&gt;&lt;/a2&gt;
-   &lt;/root-tag&gt;
-</pre>
- this generates
- <pre>
-  root-tag(myattr)=true
-  root-tag.inner-tag=Text
-  root-tag.inner-tag(someattr)=val
-  root-tag.a2.a3.a4=false
- </pre>]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="collapseattributes" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Flag to treat attributes as nested elements;
- optional, default false.]]></short-description>
-        <description><![CDATA[
-          flag to treat attributes as nested elements;
- optional, default false
-        ]]></description>
-      </attribute>
-      <attribute name="file" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[The XML file to parse; required.]]></short-description>
-        <description><![CDATA[
-          The XML file to parse; required.
-        ]]></description>
-      </attribute>
-      <attribute name="keeproot" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Flag to include the xml root tag as a 
- first value in the property name; optional, 
- default is true.]]></short-description>
-        <description><![CDATA[
-          flag to include the xml root tag as a 
- first value in the property name; optional, 
- default is true
-        ]]></description>
-      </attribute>
-      <attribute name="prefix" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[The prefix to prepend to each property.]]></short-description>
-        <description><![CDATA[
-          the prefix to prepend to each property
-        ]]></description>
-      </attribute>
-      <attribute name="validate" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Flag to validate the XML file; optional, default false.]]></short-description>
-        <description><![CDATA[
-          flag to validate the XML file; optional, default false
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="xmlvalidate" category="other"
-      classname="org.apache.tools.ant.taskdefs.optional.XMLValidateTask"
-      >
-
-  <short-description><![CDATA[Checks XML files are valid (or only well formed).]]></short-description>
-  <description>
-    <![CDATA[Checks XML files are valid (or only well formed). The
- task uses the SAX2 parser implementation provided by JAXP by default
- (probably the one that is used by Ant itself), but one can specify any
- SAX1/2 parser if needed]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="classname" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Specify the class name of the SAX parser to be used. (optional).]]></short-description>
-        <description><![CDATA[
-          Specify the class name of the SAX parser to be used. (optional)
-        ]]></description>
-      </attribute>
-      <attribute name="classpath" type="org.apache.tools.ant.types.Path"
-                 briefType="Path" required="NOTDEFINED">
-        <short-description><![CDATA[Specify the classpath to be searched to load the parser (optional).]]></short-description>
-        <description><![CDATA[
-          Specify the classpath to be searched to load the parser (optional)
-        ]]></description>
-      </attribute>
-      <attribute name="classpathref" type="org.apache.tools.ant.types.Reference"
-                 briefType="Reference" required="NOTDEFINED">
-        <short-description><![CDATA[Where to find the parser class; optional.]]></short-description>
-        <description><![CDATA[
-          Where to find the parser class; optional.
-        ]]></description>
-      </attribute>
-      <attribute name="failonerror" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Specify how parser error are to be handled; 
- optional, default=true
- <p>
- If set to <code>true</code> (default), throw a buildException if the parser yields an error.]]></short-description>
-        <description><![CDATA[
-          Specify how parser error are to be handled; 
- optional, default=true
- <p>
- If set to <code>true</code> (default), throw a buildException if the parser yields an error.
-        ]]></description>
-      </attribute>
-      <attribute name="file" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[Specify the file to be checked; optional.]]></short-description>
-        <description><![CDATA[
-          specify the file to be checked; optional.
-        ]]></description>
-      </attribute>
-      <attribute name="lenient" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Specify whether the parser should be validating.]]></short-description>
-        <description><![CDATA[
-          Specify whether the parser should be validating. Default is <code>true</code>.
- <p>
- If set to false, the validation will fail only if the parsed document is not well formed XML.
- <p>
- this option is ignored if the specified class with {@link #setClassName(String)} is not a SAX2
- XMLReader.
-        ]]></description>
-      </attribute>
-      <attribute name="warn" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Specify how parser error are to be handled.]]></short-description>
-        <description><![CDATA[
-          Specify how parser error are to be handled.
- <p>
- If set to <code>true</true> (default), log a warn message for each SAX warn event.
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-      <element name="xmlcatalog" type="org.apache.tools.ant.types.XMLCatalog"
-               briefType="XMLCatalog"
-               required="NOTDEFINED">
-        <short-description><![CDATA[Add an XMLCatalog as a nested element; optional.]]></short-description>
-        <description>
-          <![CDATA[add an XMLCatalog as a nested element; optional.]]>
-        </description>
-      </element>
-
-      <element name="fileset" type="org.apache.tools.ant.types.FileSet"
-               briefType="Fileset"
-               required="NOTDEFINED">
-        <short-description><![CDATA[Specify a set of file to be checked.]]></short-description>
-        <description>
-          <![CDATA[specify a set of file to be checked]]>
-        </description>
-      </element>
-
-      <element name="classpath" type="org.apache.tools.ant.types.Path"
-               briefType="Path"
-               required="NOTDEFINED">
-        <short-description><![CDATA[No description.]]></short-description>
-        <description>
-          <![CDATA[]]>
-        </description>
-      </element>
-
-      <element name="dtd" type="org.apache.tools.ant.types.DTDLocation"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[Create a DTD location record; optional.]]></short-description>
-        <description>
-          <![CDATA[Create a DTD location record; optional.
- This stores the location of a DTD. The DTD is identified
- by its public Id.]]>
-        </description>
-      </element>
-
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="xslt" category="xml"
-      classname="org.apache.tools.ant.taskdefs.XSLTProcess"
-      matchingTask="true">
-
-  <short-description><![CDATA[Processes a set of XML documents via XSLT.]]></short-description>
-  <description>
-    <![CDATA[Processes a set of XML documents via XSLT. This is
- useful for building views of XML based documentation.]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="basedir" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[Base directory; 
- optional, default is the project's basedir.]]></short-description>
-        <description><![CDATA[
-          Set the base directory; 
- optional, default is the project's basedir.
-        ]]></description>
-      </attribute>
-      <attribute name="classpath" type="org.apache.tools.ant.types.Path"
-                 briefType="Path" required="NOTDEFINED">
-        <short-description><![CDATA[Optional classpath to the XSL processor.]]></short-description>
-        <description><![CDATA[
-          Set the optional classpath to the XSL processor
-        ]]></description>
-      </attribute>
-      <attribute name="classpathref" type="org.apache.tools.ant.types.Reference"
-                 briefType="Reference" required="NOTDEFINED">
-        <short-description><![CDATA[Reference to an optional classpath to the XSL processor.]]></short-description>
-        <description><![CDATA[
-          Set the reference to an optional classpath to the XSL processor
-        ]]></description>
-      </attribute>
-      <attribute name="destdir" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[Destination directory into which the XSL result
- files should be copied to; 
- required, unless <tt>in</tt> and <tt>out</tt> are
- specified.]]></short-description>
-        <description><![CDATA[
-          Set the destination directory into which the XSL result
- files should be copied to; 
- required, unless <tt>in</tt> and <tt>out</tt> are
- specified.
-        ]]></description>
-      </attribute>
-      <attribute name="extension" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Desired file extension to be used for the target;
- optional, default is html.]]></short-description>
-        <description><![CDATA[
-          Set the desired file extension to be used for the target;
- optional, default is html.
-        ]]></description>
-      </attribute>
-      <attribute name="force" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Set whether to check dependencies, or always generate;
- optional, default is false.]]></short-description>
-        <description><![CDATA[
-          Set whether to check dependencies, or always generate;
- optional, default is false.
-        ]]></description>
-      </attribute>
-      <attribute name="in" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[Specifies a single XML document to be styled.]]></short-description>
-        <description><![CDATA[
-          specifies a single XML document to be styled. Should be used 
- with the <tt>out</tt> attribute; ; required if <tt>out</tt> is set
-        ]]></description>
-      </attribute>
-      <attribute name="out" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[Specifies the output name for the styled result from the 
- <tt>in</tt> attribute; required if <tt>in</tt> is set.]]></short-description>
-        <description><![CDATA[
-          Specifies the output name for the styled result from the 
- <tt>in</tt> attribute; required if <tt>in</tt> is set
-        ]]></description>
-      </attribute>
-      <attribute name="processor" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Name of the XSL processor to use; optional, default trax.]]></short-description>
-        <description><![CDATA[
-          Set the name of the XSL processor to use; optional, default trax.
- Other values are "xalan" for Xalan1 and "xslp" for XSL:P, though the
- later is strongly deprecated.
-        ]]></description>
-      </attribute>
-      <attribute name="scanincludeddirectories" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Whether to style all files in the included directories as well;
- optional, default is true.]]></short-description>
-        <description><![CDATA[
-          Whether to style all files in the included directories as well;
- optional, default is true.
-        ]]></description>
-      </attribute>
-      <attribute name="style" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Name of the stylesheet to use - given either relative
- to the project's basedir or as an absolute path; required.]]></short-description>
-        <description><![CDATA[
-          Name of the stylesheet to use - given either relative
- to the project's basedir or as an absolute path; required.
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-      <element name="xmlcatalog" type="org.apache.tools.ant.types.XMLCatalog"
-               briefType="XMLCatalog"
-               required="NOTDEFINED">
-        <short-description><![CDATA[Add the catalog to our internal catalog.]]></short-description>
-        <description>
-          <![CDATA[Add the catalog to our internal catalog]]>
-        </description>
-      </element>
-
-      <element name="classpath" type="org.apache.tools.ant.types.Path"
-               briefType="Path"
-               required="NOTDEFINED">
-        <short-description><![CDATA[Optional classpath to the XSL processor.]]></short-description>
-        <description>
-          <![CDATA[Set the optional classpath to the XSL processor]]>
-        </description>
-      </element>
-
-      <element name="outputproperty" type="org.apache.tools.ant.taskdefs.XSLTProcess.OutputProperty"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[Create an instance of an output property to be configured.]]></short-description>
-        <description>
-          <![CDATA[Create an instance of an output property to be configured.]]>
-        </description>
-      </element>
-
-      <element name="param" type="org.apache.tools.ant.taskdefs.XSLTProcess.Param"
-               briefType=""
-               required="NOTDEFINED">
-        <short-description><![CDATA[Create an instance of an XSL parameter for configuration by Ant.]]></short-description>
-        <description>
-          <![CDATA[Create an instance of an XSL parameter for configuration by Ant.]]>
-        </description>
-      </element>
-
-    </elements>
-
-  </structure>
-
-</task>
-
-
-<task name="zip" category="packaging"
-      classname="org.apache.tools.ant.taskdefs.Zip"
-      matchingTask="true">
-
-  <short-description><![CDATA[Create a Zip file.]]></short-description>
-  <description>
-    <![CDATA[Create a Zip file.]]>
-  </description>
-
-  <structure>
-
-    <attributes>
-      <attribute name="basedir" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[Directory from which to archive files; optional.]]></short-description>
-        <description><![CDATA[
-          Directory from which to archive files; optional.
-        ]]></description>
-      </attribute>
-      <attribute name="compress" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[Whether we want to compress the files or only store them;
- optional, default=true;.]]></short-description>
-        <description><![CDATA[
-          Whether we want to compress the files or only store them;
- optional, default=true;
-        ]]></description>
-      </attribute>
-      <attribute name="destfile" type="java.io.File"
-                 briefType="File" required="NOTDEFINED">
-        <short-description><![CDATA[The file to create; required.]]></short-description>
-        <description><![CDATA[
-          The file to create; required.
-        ]]></description>
-      </attribute>
-      <attribute name="duplicate" type="org.apache.tools.ant.taskdefs.Zip.Duplicate"
-                 briefType="&quot;add&quot;, &quot;preserve&quot;, &quot;fail&quot;" required="NOTDEFINED">
-        <short-description><![CDATA[Sets behavior for when a duplicate file is about to be added -
- one of <code>keep</code>, <code>skip</code> or <code>overwrite</code>.]]></short-description>
-        <description><![CDATA[
-          Sets behavior for when a duplicate file is about to be added -
- one of <code>keep</code>, <code>skip</code> or <code>overwrite</code>.
- Possible values are: <code>keep</code> (keep both
- of the files); <code>skip</code> (keep the first version
- of the file found); <code>overwrite</code> overwrite the file
- with the new file
- Default for zip tasks is <code>keep</code>
-        ]]></description>
-      </attribute>
-      <attribute name="encoding" type="java.lang.String"
-                 briefType="String" required="NOTDEFINED">
-        <short-description><![CDATA[Encoding to use for filenames, defaults to the platform's
- default encoding.]]></short-description>
-        <description><![CDATA[
-          Encoding to use for filenames, defaults to the platform's
- default encoding.
-
- <p>For a list of possible values see <a
- href="http://java.sun.com/products/jdk/1.2/docs/guide/internat/encoding.doc.html">http://java.sun.com/products/jdk/1.2/docs/guide/internat/encoding.doc.html</a>.</p>
-        ]]></description>
-      </attribute>
-      <attribute name="filesonly" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[If true, emulate Sun's jar utility by not adding parent directories;
- optional, defaults to false.]]></short-description>
-        <description><![CDATA[
-          If true, emulate Sun's jar utility by not adding parent directories;
- optional, defaults to false.
-        ]]></description>
-      </attribute>
-      <attribute name="update" type="boolean"
-                 briefType="boolean" required="NOTDEFINED">
-        <short-description><![CDATA[If true, updates an existing file, otherwise overwrite
- any existing one; optional defaults to false.]]></short-description>
-        <description><![CDATA[
-          If true, updates an existing file, otherwise overwrite
- any existing one; optional defaults to false.
-        ]]></description>
-      </attribute>
-      <attribute name="whenempty" type="org.apache.tools.ant.taskdefs.Zip.WhenEmpty"
-                 briefType="&quot;fail&quot;, &quot;skip&quot;, &quot;create&quot;" required="NOTDEFINED">
-        <short-description><![CDATA[Sets behavior of the task when no files match.]]></short-description>
-        <description><![CDATA[
-          Sets behavior of the task when no files match.
- Possible values are: <code>fail</code> (throw an exception
- and halt the build); <code>skip</code> (do not create
- any archive, but issue a warning); <code>create</code>
- (make an archive with no entries).
- Default for zip tasks is <code>skip</code>;
- for jar tasks, <code>create</code>.
-        ]]></description>
-      </attribute>
-    </attributes>
-
-    <elements>
-      <element name="fileset" type="org.apache.tools.ant.types.FileSet"
-               briefType="Fileset"
-               required="NOTDEFINED">
-        <short-description><![CDATA[Adds a set of files.]]></short-description>
-        <description>
-          <![CDATA[Adds a set of files.]]>
-        </description>
-      </element>
-
-      <element name="zipgroupfileset" type="org.apache.tools.ant.types.FileSet"
-               briefType="Fileset"
-               required="NOTDEFINED">
-        <short-description><![CDATA[Adds a group of zip files.]]></short-description>
-        <description>
-          <![CDATA[Adds a group of zip files.]]>
-        </description>
-      </element>
-
-      <element name="zipfileset" type="org.apache.tools.ant.types.ZipFileSet"
-               briefType="ZipFileset"
-               required="NOTDEFINED">
-        <short-description><![CDATA[Adds a set of files that can be
- read from an archive and be given a prefix/fullpath.]]></short-description>
-        <description>
-          <![CDATA[Adds a set of files that can be
- read from an archive and be given a prefix/fullpath.]]>
-        </description>
-      </element>
-
-    </elements>
-
-  </structure>
-
-</task>
-</tasks>
diff --git a/ant/org.eclipse.ant.ui/Ant Editor Content Assist Dev/tasks.xml b/ant/org.eclipse.ant.ui/Ant Editor Content Assist Dev/tasks.xml
deleted file mode 100644
index 626f04e..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor Content Assist Dev/tasks.xml
+++ /dev/null
@@ -1,5139 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TASKS>
-	<TASK NAME="ant">
-		<DESCRIPTION>&lt;p&gt;Runs Ant on a supplied buildfile. This can be used to build subprojects.&lt;/p&gt;
-&lt;p&gt;When the &lt;i&gt;antfile&lt;/i&gt; attribute is omitted, the file &amp;quot;build.xml&amp;quot;
-in the supplied directory (&lt;i&gt;dir&lt;/i&gt; attribute) is used.&lt;/p&gt;
-&lt;p&gt;If no target attribute is supplied, the default target of the new project is
-used.&lt;/p&gt;
-&lt;p&gt;By default, all of the properties of the current project will be
-available in the new project.   Alternatively, you can
-set the &lt;i&gt;inheritAll&lt;/i&gt; attribute to &lt;code&gt;false&lt;/code&gt; and only
-&amp;quot;user&amp;quot; properties (i.e., those passed on the command-line)
-will be passed to the new project.  In either case, the set of
-properties passed to the new project will override the properties that 
-are set in the new project (See also the &lt;a href=&quot;property.html&quot;&gt;property task&lt;/a&gt;).&lt;/p&gt;
-&lt;p&gt;You can also set properties in the new project from the old project by
-using nested property tags. These properties are always passed regardless of the
-setting of &lt;i&gt;inheritAll&lt;/i&gt;.  This allows you to parameterize your subprojects.&lt;/p&gt;
-&lt;p&gt;References to data types can also be passed to the new project, but
-by default they are not.  If you set the inheritrefs attribute to
-true, all references will be copied, but they will not override
-references defined in the new project.&lt;/p&gt;
-&lt;p&gt;Nested &lt;a href=&quot;#reference&quot;&gt;&lt;i&gt;&amp;lt;reference&amp;gt;&lt;/i&gt;&lt;/a&gt; elements
-can also be used to copy references from the calling project to the
-new project, optionally under a different id.  References taken from
-nested elements will override existing references in the new
-project.&lt;/p&gt;
-</DESCRIPTION>
-		<ATTRIBUTE NAME="antfile" REQUIRED="no">
-			<DESCRIPTION>the buildfile to use. Defaults to&quot;build.xml&quot;.  This file is expected to be a filenamerelative to the dir attribute given</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="dir" REQUIRED="no">
-			<DESCRIPTION>the directory to use as a basedir for the new Ant project. Defaults to the current project's basedir, unlessinheritall has been set to false, in which case it doesn'thave a default value.  This will override the basedirsetting of the called project</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="target" REQUIRED="no">
-			<DESCRIPTION>the target of the new Ant project that should be executed.Defaults to the new project's default target</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="output" REQUIRED="no">
-			<DESCRIPTION>Filename to write the ant output to.  This isrelative to the value of the dir attribute if it has been set orto the base directory of the current project otherwise.</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="inheritall" REQUIRED="no">
-			<DESCRIPTION>If true, pass all properties to thenew Ant project.  Defaults to true</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="inheritrefs" REQUIRED="no">
-			<DESCRIPTION>If true, pass all references to thenew Ant project.  Defaults to false</DESCRIPTION>
-		</ATTRIBUTE>
-	</TASK>
-	<TASK NAME="antcall">
-		<DESCRIPTION>&lt;p&gt;Call another target within the same build-file optionally specifying some
-properties (param's in this context)&lt;/p&gt;
-&lt;p&gt;By default, all of the properties of the current project will be
-available in the new project.   Alternatively, you can
-set the &lt;i&gt;inheritAll&lt;/i&gt; attribute to &lt;code&gt;false&lt;/code&gt; and only
-&amp;quot;user&amp;quot; properties (i.e., those passed on the command-line)
-will be passed to the new project.  In either case, the set of
-properties passed to the new project will override the properties that 
-are set in the new project (See also the &lt;a href=&quot;property.html&quot;&gt;property task&lt;/a&gt;).&lt;/p&gt;
-&lt;p&gt;You can also set properties in the new project from the old project by
-using nested param tags. These properties are always passed regardless of the
-setting of &lt;i&gt;inheritAll&lt;/i&gt;.  This allows you to parameterize your subprojects.&lt;/p&gt;
-&lt;p&gt;Nested &lt;a href=&quot;#reference&quot;&gt;&lt;i&gt;&amp;lt;reference&amp;gt;&lt;/i&gt;&lt;/a&gt; elements can
-be used to copy references from the calling project to the new
-project, optionally under a different id.  References taken from
-nested elements will override existing references in the new
-project.&lt;/p&gt;
-&lt;p&gt;
-When a target is invoked by antcall, all of its dependent targets will
-also be called within the context of any new parameters. For example. if
-the target &amp;quot;doSomethingElse&amp;quot; depended on the target &amp;quot;init&amp;quot;, then the 
-&lt;i&gt;antcall&lt;/i&gt; of &amp;quot;doSomethingElse&amp;quot; will call &amp;quot;init&amp;quot; during the call. 
-Of course, any properties defined in the antcall task or inherited from the calling target 
-will be fixed and not overridable in the init task -or indeed in the &amp;quot;doSomethingElse&amp;quot; task.  
-&lt;/p&gt;
-</DESCRIPTION>
-		<ATTRIBUTE NAME="target" REQUIRED="yes">
-			<DESCRIPTION>The target to execute</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="inheritall" REQUIRED="no">
-			<DESCRIPTION>If true, pass all properties to the new Antproject.  Defaults to true.</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="inheritrefs" REQUIRED="no">
-			<DESCRIPTION>If true, pass all references to thenew Ant project.  Defaults to false</DESCRIPTION>
-		</ATTRIBUTE>
-	</TASK>
-	<TASK NAME="antstructure">
-		<DESCRIPTION>&lt;p&gt;Generates a DTD for Ant buildfiles which contains information
-about all tasks currently known to Ant.&lt;/p&gt; 
-&lt;p&gt;Note that the DTD generated by this task is incomplete, you can
-always add XML entities using &lt;a
-href=&quot;taskdef.html&quot;&gt;&lt;code&gt;&amp;lt;taskdef&amp;gt;&lt;/code&gt;&lt;/a&gt; or &lt;a
-href=&quot;typedef.html&quot;&gt;&lt;code&gt;&amp;lt;typedef&amp;gt;&lt;/code&gt;&lt;/a&gt;. See &lt;a
-href=&quot;http://www.sdv.fr/pages/casa/html/ant-dtd.en.html&quot;
-target=&quot;_top&quot;&gt;here&lt;/a&gt; for a way to get around this problem.&lt;/p&gt;
-&lt;p&gt;This task doesn't know about required attributes, all will be
-listed as &lt;code&gt;#IMPLIED&lt;/code&gt;.&lt;/p&gt;
-</DESCRIPTION>
-		<ATTRIBUTE NAME="output" REQUIRED="yes">
-			<DESCRIPTION>file to write the DTD to</DESCRIPTION>
-		</ATTRIBUTE>
-	</TASK>
-	<TASK NAME="apply">
-		<DESCRIPTION>&lt;p&gt;Executes a system command. When the &lt;i&gt;os&lt;/i&gt; attribute is specified, then
-the command is only executed when Ant is run on one of the specified operating
-systems.&lt;/p&gt;
-&lt;p&gt;The files and/or directories of a number of &lt;a
-href=&quot;../CoreTypes/fileset.html&quot;&gt;FileSet&lt;/a&gt;s are passed as arguments
-to the system command.&lt;/p&gt;
-&lt;p&gt;If you specify a nested &lt;a
-href=&quot;../CoreTypes/mapper.html&quot;&gt;mapper&lt;/a&gt; and the &lt;i&gt;dest&lt;/i&gt; attribute,
-the timestamp of each source file is compared to the timestamp of a
-target file which is defined by the nested mapper element and searched
-for in the given dest.&lt;/p&gt;
-&lt;p&gt;At least one fileset is required, and you must not specify more than
-one mapper.&lt;/p&gt;
-</DESCRIPTION>
-		<ATTRIBUTE NAME="executable" REQUIRED="yes">
-			<DESCRIPTION>the command to execute without any command linearguments</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="dest" REQUIRED="yes, if you specify a nested mapper">
-			<DESCRIPTION>the directory where the &lt;apply&gt; expects the target files will be placed by the command, when it is executed. </DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="dir" REQUIRED="no">
-			<DESCRIPTION>the directory in which the command should be executed</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="relative" REQUIRED="no, default is false">
-			<DESCRIPTION>whether the filenames should be passed on thecommand line as absolute or relative pathnames (relative to thebase directory of the corresponding fileset for source files orthe dest attribute for target files)</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="os" REQUIRED="no">
-			<DESCRIPTION>list of Operating Systems on which the command may beexecuted</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="output" REQUIRED="no">
-			<DESCRIPTION>the file to which the output of the command should beredirected</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="outputproperty" REQUIRED="no">
-			<DESCRIPTION>the name of a property in which the output of the command should be stored</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="timeout" REQUIRED="no">
-			<DESCRIPTION>Stop the command if it doesn't finish within thespecified time (given in milliseconds)</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="failonerror" REQUIRED="no">
-			<DESCRIPTION>Stop the buildprocess if the command exits with areturncode other than 0</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="skipemptyfilesets" REQUIRED="no, default is false">
-			<DESCRIPTION>Don't run the command, if no source files havebeen found or are newer than their corresponding targetfiles</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="parallel" REQUIRED="no">
-			<DESCRIPTION>Run the command only once, appending all files asarguments. If false, command will be executed once for every file. Defaults to false.</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="type" REQUIRED="no, default is file">
-			<DESCRIPTION>One of file, dir orboth. If set to file, only the names of plainfiles will be sent to the command. If set to dir, onlythe names of directories are considered</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="newenvironment" REQUIRED="no, default is false">
-			<DESCRIPTION>Do not propagate old environment when new environmentvariables are specified</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="vmlauncher" REQUIRED="no, default is true">
-			<DESCRIPTION>Run command using the Java VM's execution facilitieswhere available. If set to false the underlying OS's shell,either directly or through the antRun scripts, will be used.Under some operating systems, this gives access to facilitiesnot normally available through the VM including, under Windows,being able to execute scripts, rather than their associatedinterpreter.  If you want to specify the name of theexecutable as a relative path to the directory given by thedir attribute, it may become necessary to set vmlauncher tofalse as well</DESCRIPTION>
-		</ATTRIBUTE>
-	</TASK>
-	<TASK NAME="available">
-		<DESCRIPTION>&lt;p&gt;Sets a property if a resource is available at runtime. This resource can be a
-file, a directory, a class in the classpath, or a JVM system resource.&lt;/p&gt;
-&lt;p&gt;If the resource is present, the property value is set to true by
-default; otherwise, the property is not set. You can set the value to
-something other than the default by specifying the &lt;code&gt;value&lt;/code&gt; attribute.&lt;/p&gt;
-&lt;p&gt;Normally, this task is used to set properties that are useful to avoid target
-execution depending on system parameters.&lt;/p&gt;
-</DESCRIPTION>
-		<ATTRIBUTE NAME="property" REQUIRED="yes">
-			<DESCRIPTION>The name of the property to set</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="value" REQUIRED="no">
-			<DESCRIPTION>The value to set the property to. Defaults to &quot;true&quot;</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="classname" REQUIRED="yes">
-			<DESCRIPTION>The class to look for in the classpath</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="file" REQUIRED="">
-			<DESCRIPTION>The file to look for</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="resource" REQUIRED="">
-			<DESCRIPTION>The resource to look for in the JVM</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="classpath" REQUIRED="no">
-			<DESCRIPTION>The classpath to use when looking up classname or resource</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="filepath" REQUIRED="no">
-			<DESCRIPTION>The path to use when looking up file</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="classpathref" REQUIRED="no">
-			<DESCRIPTION>The classpath to use, given as a reference to a path defined elsewhere</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="type" REQUIRED="no">
-			<DESCRIPTION>The type of file to look for, either a directory (type=&quot;dir&quot;) or a file(type=&quot;file&quot;). If not set, the property will be set if the name specified in the fileattribute exists as either a file or a directory</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="ignoresystemclasses" REQUIRED="no">
-			<DESCRIPTION>Ignore Ant's runtime classes, using only the specifiedclasspath.  Only affects the &quot;classname&quot; attribute.  Defaults to &quot;false</DESCRIPTION>
-		</ATTRIBUTE>
-	</TASK>
-	<TASK NAME="basename">
-		<DESCRIPTION>&lt;p&gt;
-Task to determine the basename of a specified file, optionally minus a
-specified suffix.
-&lt;/p&gt;
-&lt;p&gt;
-When this task executes, it will set the specified property to the
-value of the last path element of the specified file. If &lt;code&gt;file&lt;/code&gt; is a
-directory, the basename will be the last directory element. If
-&lt;code&gt;file&lt;/code&gt; is a full-path, relative-path, or simple filename,
-the basename will be the simple file name, without any directory elements.
-&lt;/p&gt;
-&lt;p&gt; 
-</DESCRIPTION>
-		<ATTRIBUTE NAME="file" REQUIRED="yes">
-			<DESCRIPTION>The path to take the basename of</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="property" REQUIRED="yes">
-			<DESCRIPTION>The name of the property to set</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="suffix" REQUIRED="no">
-			<DESCRIPTION>The suffix to remove from the resulting basename(specified either with or without the &quot;.&quot;)</DESCRIPTION>
-		</ATTRIBUTE>
-	</TASK>
-	<TASK NAME="buildnumber">
-		<DESCRIPTION>&lt;p&gt;This is a basic task that can be used to track build numbers.&lt;/p&gt;
-&lt;p&gt;It will first attempt to read a build number from a file (by default,
-&lt;code&gt;build.number&lt;/code&gt; in the current directory), then
-set the property &lt;code&gt;build.number&lt;/code&gt; to the value that was read in
-(or to &lt;code&gt;0&lt;/code&gt;, if no such value). It will then increment the
-number by one and write it back out to the file.
-(See the
-&lt;a href=&quot;../OptionalTasks/propertyfile.html&quot;&gt;PropertyFile&lt;/a&gt; task
-if you need finer control over things such as the property name or
-the number format.)
-&lt;/p&gt;
-</DESCRIPTION>
-		<ATTRIBUTE NAME="file" REQUIRED="no; defaults to &quot;build.number&quot;">
-			<DESCRIPTION>The file to read and write the build number from/to</DESCRIPTION>
-		</ATTRIBUTE>
-	</TASK>
-	<TASK NAME="changelog">
-		<DESCRIPTION>&lt;p&gt;Generates an XML-formatted report file of the change logs recorded in a
-&lt;a href=&quot;http://www.cvshome.org/&quot; target=&quot;_top&quot;&gt;CVS&lt;/a&gt; repository. &lt;/p&gt;
-</DESCRIPTION>
-		<ATTRIBUTE NAME="dir" REQUIRED="no; defaults to ${basedir}.">
-			<DESCRIPTION>The directory from which to run the CVS logcommand</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="destfile" REQUIRED="yes">
-			<DESCRIPTION>The file in which to write the change log report</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="usersfile" REQUIRED="no">
-			<DESCRIPTION>Property file that contains name-value pairs mappinguser IDs and names that should be used in the report in place ofthe user ID</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="daysinpast" REQUIRED="no">
-			<DESCRIPTION>Sets the number of days into the past for which thechange log information should be retrieved</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="start" REQUIRED="no">
-			<DESCRIPTION>The earliest date from which change logs are to beincluded in the report</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="end" REQUIRED="no">
-			<DESCRIPTION>The latest date to which change logs are to beincluded in the report</DESCRIPTION>
-		</ATTRIBUTE>
-	</TASK>
-	<TASK NAME="checksum">
-		<DESCRIPTION>&lt;p&gt;
-Generates checksum for files.  This task can also be used to
-perform checksum verifications.
-&lt;/p&gt;
-</DESCRIPTION>
-		<ATTRIBUTE NAME="file" REQUIRED="one of either file or
-     at least one nested fileset element.">
-			<DESCRIPTION>The file to generate checksum for</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="algorithm" REQUIRED="no">
-			<DESCRIPTION>Specifies the algorithm to be used tocompute the checksum. Defaults to &quot;MD5&quot;.Other popular algorithms like &quot;SHA&quot; may be usedas well.</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="provider" REQUIRED="no">
-			<DESCRIPTION>Specifies the provider of the algorithm</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="fileext" REQUIRED="no">
-			<DESCRIPTION>The generated checksum file's name will be theoriginal filename with &quot;.&quot; and fileext added to it.Defaults to the algorithm name being used.</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="property" REQUIRED="no">
-			<DESCRIPTION>Specifies the name of the property to be setwith the generated checksum value.  This cannot be specifiedwhen fileext is being used or when the number of filesfor which checksums is to be generated is greater than 1.</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="forceoverwrite" REQUIRED="no">
-			<DESCRIPTION>Overwrite existing files even if the destinationfiles are newer. Defaults to &quot;no&quot;</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="verifyproperty" REQUIRED="no">
-			<DESCRIPTION>Specifies the name of the property to be setwith &quot;true&quot; or &quot;false&quot; depending upon whetherthe generated checksum matches the existing checksum.  Whenthis is set, the generated checksum is not written to a file orproperty, but rather, the content of the file or property is used tocheck against the generated checksum.</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="readbuffersize" REQUIRED="no">
-			<DESCRIPTION>The size of the buffer )in bytes) to use whenreading a file. Defaults to &quot;8192&quot; - you may get abetter performance on big files if you increase this value</DESCRIPTION>
-		</ATTRIBUTE>
-	</TASK>
-	<TASK NAME="chmod">
-		<DESCRIPTION>&lt;p&gt;Changes the permissions of a file or all files inside specified directories. Right now it has effect only under Unix.
-The permissions are also UNIX style, like the argument for the chmod command.&lt;/p&gt;
-&lt;p&gt;See the section on &lt;a href=&quot;../dirtasks.html#directorybasedtasks&quot;&gt;directory based
-tasks&lt;/a&gt;, on how the inclusion/exclusion of files works, and how to
-write patterns.&lt;/p&gt;
-&lt;p&gt;This task holds an implicit &lt;a href=&quot;../CoreTypes/fileset.html&quot;&gt;FileSet&lt;/a&gt; and
-supports all of FileSet's attributes and nested elements
-directly. More FileSets can be specified using nested
-&lt;code&gt;&amp;lt;fileset&amp;gt;&lt;/code&gt; elements.&lt;/p&gt;
-</DESCRIPTION>
-		<ATTRIBUTE NAME="file" REQUIRED="exactly one of the two or nested &lt;fileset&gt; elements.">
-			<DESCRIPTION>the file or single directory of which the permissions must be changed</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="dir" REQUIRED="">
-			<DESCRIPTION>the directory which holds the files whose permissions must be changed</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="perm" REQUIRED="yes">
-			<DESCRIPTION>the new permissions</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="includes" REQUIRED="no">
-			<DESCRIPTION>comma- or space-separated list of patterns of files that must beincluded</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="excludes" REQUIRED="no">
-			<DESCRIPTION>comma- or space-separated list of patterns of files that must beexcluded. No files (except default excludes) are excluded when omitted</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="defaultexcludes" REQUIRED="no">
-			<DESCRIPTION>indicates whether default excludes should be used or not(&quot;yes&quot;/&quot;no&quot;). Default excludes are used when omitted</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="parallel" REQUIRED="no">
-			<DESCRIPTION>process all specified files using a singlechmod command. Defaults to true</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="type" REQUIRED="no, default is file">
-			<DESCRIPTION>One of file, dir orboth. If set to file, only the permissions ofplain files are going to be changed. If set to dir, onlythe directories are considered</DESCRIPTION>
-		</ATTRIBUTE>
-	</TASK>
-	<TASK NAME="concat">
-		<DESCRIPTION>&lt;p&gt;
-Concatenates a file, or a series of files, to a single file or
-the console. The destination file will be created if it does
-not exist, though the the &lt;var&gt;append&lt;/var&gt; attribute may be
-used to alter this behavior.
-&lt;/p&gt;
-&lt;p&gt;
-&lt;a href=&quot;../CoreTypes/fileset.html&quot;&gt;FileSet&lt;/a&gt;s and/or &lt;a
-href=&quot;../CoreTypes/filelist.html&quot;&gt;FileList&lt;/a&gt;s are used to
-select which files are to be concatenated. There is no
-singular 'file' attribute to specify a single file to cat -- a
-fileset or filelist must also be used in these cases.
-&lt;/p&gt;
-</DESCRIPTION>
-		<ATTRIBUTE NAME="destfile" REQUIRED="no
- 	  ">
-			<DESCRIPTION>The destination file for the concatenated stream.If not specified the console will be used instead.</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="append" REQUIRED="no">
-			<DESCRIPTION>Specifies whether or not the file specified by 'destfile'should be overwritten. Defaults to &quot;no&quot;.</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="encoding" REQUIRED="no">
-			<DESCRIPTION>Specifies the encoding for the input files. Please see http://java.sun.com/products/jdk/1.2/docs/guide/internat/encoding.doc.htmlfor a list of possible values. Defaults to the platform'sdefault character encoding.</DESCRIPTION>
-		</ATTRIBUTE>
-	</TASK>
-	<TASK NAME="condition">
-		<DESCRIPTION>&lt;p&gt;Sets a property if a certain condition holds true - this is a
-generalization of &lt;a href=&quot;available.html&quot;&gt;Available&lt;/a&gt; and &lt;a
-href=&quot;uptodate.html&quot;&gt;Uptodate&lt;/a&gt;.&lt;/p&gt;
-&lt;p&gt;If the condition holds true, the property value is set to true by
-default; otherwise, the property is not set. You can set the value to
-something other than the default by specifying the &lt;code&gt;value&lt;/code&gt;
-attribute.&lt;/p&gt;
-&lt;p&gt;Conditions are specified as &lt;a href=&quot;#nested&quot;&gt;nested elements&lt;/a&gt;,
-you must specify exactly one condition.&lt;/p&gt;
-</DESCRIPTION>
-		<ATTRIBUTE NAME="property" REQUIRED="yes">
-			<DESCRIPTION>The name of the property to set</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="value" REQUIRED="no">
-			<DESCRIPTION>The value to set the property to. Defaults to&quot;true&quot;</DESCRIPTION>
-		</ATTRIBUTE>
-	</TASK>
-	<TASK NAME="conditions">
-		<DESCRIPTION></DESCRIPTION>	</TASK>
-	<TASK NAME="copy">
-		<DESCRIPTION>&lt;p&gt;Copies a file or FileSet to a new file or directory.  By default, files are
-only copied if the source file is newer than the destination file,
-or when the destination file does not exist.  However, you can explicitly
-overwrite files with the &lt;code&gt;overwrite&lt;/code&gt; attribute.&lt;/p&gt;
-&lt;p&gt;&lt;a href=&quot;../CoreTypes/fileset.html&quot;&gt;FileSet&lt;/a&gt;s are used to select a
-set of files to copy.
-To use a &lt;code&gt;&amp;lt;fileset&amp;gt;&lt;/code&gt;, the &lt;code&gt;todir&lt;/code&gt; attribute
-must be set.&lt;/p&gt;
-</DESCRIPTION>
-		<ATTRIBUTE NAME="file" REQUIRED="yes, unless a nested
-     &lt;fileset&gt; element is used.">
-			<DESCRIPTION>The file to copy</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="preservelastmodified" REQUIRED="no; defaults to false.">
-			<DESCRIPTION>Give the copied files the same last modifiedtime as the original source files.(Note: Ignored on Java 1.1</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="tofile" REQUIRED="with the file
-       attribute, either tofile or todir can be used.
-       with nested &lt;fileset&gt; elements, if the set of files
-       is greater than 1, or if only the dir attribute is
-       specified in the &lt;fileset&gt;, or if the
-       file attribute is also specified, then only
-       todir is allowed.">
-			<DESCRIPTION>The file to copy to</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="todir" REQUIRED="">
-			<DESCRIPTION>The directory to copy to</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="overwrite" REQUIRED="no; defaults to false.">
-			<DESCRIPTION>Overwrite existing files even if the destinationfiles are newer</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="filtering" REQUIRED="no; defaults to false.">
-			<DESCRIPTION>Indicates whether token filtering using the globalbuild-file filters should take place during the copy.Note: Nested &lt;filterset&gt; elements willalways be used, even if this attribute is not specified, or its value isfalse (no, or off)</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="flatten" REQUIRED="no; defaults to false.">
-			<DESCRIPTION>Ignore the directory structure of the source files,and copy all files into the directory specified by the todirattribute.  Note that you can achieve the same effect by using aflatten mapper</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="includeemptydirs" REQUIRED="no; defaults to true.">
-			<DESCRIPTION>Copy any empty directories included in the FileSet(s).</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="failonerror" REQUIRED="no; defaults to true.">
-			<DESCRIPTION>Log a warning message, but do not stop the build,when the file to copy does not exist.Only meaningful when copying a single file.</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="verbose" REQUIRED="no; defaults to false.">
-			<DESCRIPTION>Log the files that are being copied</DESCRIPTION>
-		</ATTRIBUTE>
-	</TASK>
-	<TASK NAME="copydir">
-		<DESCRIPTION>&lt;p&gt;Copies a directory tree from the source to the destination.&lt;/p&gt;
-&lt;p&gt;It is possible to refine the set of files that are being copied. This can be
-done with the &lt;i&gt;includes&lt;/i&gt;, &lt;i&gt;includesfile&lt;/i&gt;, &lt;i&gt;excludes&lt;/i&gt;, &lt;i&gt;excludesfile&lt;/i&gt; and &lt;i&gt;defaultexcludes&lt;/i&gt;
-attributes. With the &lt;i&gt;includes&lt;/i&gt; or &lt;i&gt;includesfile&lt;/i&gt; attribute you specify the files you want to
-have included by using patterns. The &lt;i&gt;exclude&lt;/i&gt; or &lt;i&gt;excludesfile&lt;/i&gt; attribute is used to specify
-the files you want to have excluded. This is also done with patterns. And
-finally with the &lt;i&gt;defaultexcludes&lt;/i&gt; attribute, you can specify whether you
-want to use default exclusions or not. See the section on &lt;a
-href=&quot;../dirtasks.html#directorybasedtasks&quot;&gt;directory based tasks&lt;/a&gt;, on how the
-inclusion/exclusion of files works, and how to write patterns.&lt;/p&gt;
-&lt;p&gt;This task forms an implicit &lt;a href=&quot;../CoreTypes/fileset.html&quot;&gt;FileSet&lt;/a&gt; and
-supports all attributes of &lt;code&gt;&amp;lt;fileset&amp;gt;&lt;/code&gt;
-(&lt;code&gt;dir&lt;/code&gt; becomes &lt;code&gt;src&lt;/code&gt;) as well as the nested
-&lt;code&gt;&amp;lt;include&amp;gt;&lt;/code&gt;, &lt;code&gt;&amp;lt;exclude&amp;gt;&lt;/code&gt; and
-&lt;code&gt;&amp;lt;patternset&amp;gt;&lt;/code&gt; elements.&lt;/p&gt;
-</DESCRIPTION>
-		<ATTRIBUTE NAME="src" REQUIRED="yes">
-			<DESCRIPTION>the directory to copy</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="dest" REQUIRED="yes">
-			<DESCRIPTION>the directory to copy to</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="includes" REQUIRED="no">
-			<DESCRIPTION>comma- or space-separated list of patterns of files that must beincluded. All files are included when omitted</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="includesfile" REQUIRED="no">
-			<DESCRIPTION>the name of a file. Each line of this file istaken to be an include patter</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="excludes" REQUIRED="no">
-			<DESCRIPTION>comma- or space-separated list of patterns of files that must beexcluded. No files (except default excludes) are excluded when omitted</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="excludesfile" REQUIRED="no">
-			<DESCRIPTION>the name of a file. Each line of this file istaken to be an exclude patter</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="defaultexcludes" REQUIRED="no">
-			<DESCRIPTION>indicates whether default excludes should be used or not(&quot;yes&quot;/&quot;no&quot;). Default excludes are used when omitted</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="filtering" REQUIRED="no">
-			<DESCRIPTION>indicates whether token filtering should take place duringthe cop</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="flatten" REQUIRED="no">
-			<DESCRIPTION>ignore directory structure of source directory,copy all files into a single directory, specified by the destattribute (default is false)</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="forceoverwrite" REQUIRED="no">
-			<DESCRIPTION>overwrite existing files even if the destinationfiles are newer (default is false)</DESCRIPTION>
-		</ATTRIBUTE>
-	</TASK>
-	<TASK NAME="copyfile">
-		<DESCRIPTION>&lt;p&gt;Copies a file from the source to the destination. The file is only copied if
-the source file is newer than the destination file, or when the destination file
-does not exist.&lt;/p&gt;
-</DESCRIPTION>
-		<ATTRIBUTE NAME="src" REQUIRED="yes">
-			<DESCRIPTION>the filename of the file to copy</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="dest" REQUIRED="yes">
-			<DESCRIPTION>the filename of the file where to copy to</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="filtering" REQUIRED="no">
-			<DESCRIPTION>indicates whether token filtering should take place duringthe cop</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="forceoverwrite" REQUIRED="no">
-			<DESCRIPTION>overwrite existing files even if the destinationfiles are newer (default is false)</DESCRIPTION>
-		</ATTRIBUTE>
-	</TASK>
-	<TASK NAME="cvs">
-		<DESCRIPTION>&lt;p&gt;Handles packages/modules retrieved from a
-&lt;a href=&quot;http://www.cvshome.org/&quot; target=&quot;_top&quot;&gt;CVS&lt;/a&gt; repository.&lt;/p&gt;
-&lt;p&gt;When doing automated builds, the &lt;a href=&quot;get.html&quot;&gt;get task&lt;/a&gt; should be
-preferred over the &lt;i&gt;checkout&lt;/i&gt; command, because of speed.&lt;/p&gt;
-</DESCRIPTION>
-		<ATTRIBUTE NAME="command" REQUIRED="no, default &quot;checkout&quot;.">
-			<DESCRIPTION>the CVS command to execute</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="compression" REQUIRED="no. defaults to false.">
-			<DESCRIPTION>true or false - if setto true, this is the same as compressionlevel=&quot;3</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="compressionlevel" REQUIRED="no. defaults to no compression.">
-			<DESCRIPTION>A number between 1 and 9 (corresponding topossible values for CVS' -z# argument). Anyother value is treated as compression=&quot;false</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="cvsroot" REQUIRED="no">
-			<DESCRIPTION>the CVSROOT variable</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="cvsrsh" REQUIRED="no">
-			<DESCRIPTION>the CVS_RSH variable</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="dest" REQUIRED="no, default is project's basedir.">
-			<DESCRIPTION>the directory where the checked out files should be placed</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="package" REQUIRED="no">
-			<DESCRIPTION>the package/module to check out</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="tag" REQUIRED="no">
-			<DESCRIPTION>the tag of the package/module to check out</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="date" REQUIRED="no">
-			<DESCRIPTION>Use the most recent revision no later than the given dat</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="quiet" REQUIRED="no, default &quot;false&quot;">
-			<DESCRIPTION>suppress informational messages</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="noexec" REQUIRED="no, default to &quot;false&quot;">
-			<DESCRIPTION>report only, don't change any files</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="output" REQUIRED="no, default output to ant log as msg_info.">
-			<DESCRIPTION>the file to direct standard output from the command</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="error" REQUIRED="no, default error to ant log as msg_warn.">
-			<DESCRIPTION>the file to direct standard error from the command</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="append" REQUIRED="no, default to &quot;false&quot;.">
-			<DESCRIPTION>whether to append output/error when redirecting to a file</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="port" REQUIRED="no, default port 2401.">
-			<DESCRIPTION>Port used by CVS to communicate with the server</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="passfile" REQUIRED="no, default file ~/.cvspass.">
-			<DESCRIPTION>Password file to read passwords from</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="failonerror" REQUIRED="no">
-			<DESCRIPTION>Stop the build process if the command exits with areturn code other than 0. Defaults to fals</DESCRIPTION>
-		</ATTRIBUTE>
-	</TASK>
-	<TASK NAME="cvspass">
-		<DESCRIPTION>&lt;p&gt;Adds entries to a .cvspass file. Adding entries to this file has the same affect as a cvs login command.&lt;/p&gt;
-</DESCRIPTION>
-		<ATTRIBUTE NAME="cvsroot" REQUIRED="yes">
-			<DESCRIPTION>the CVS repository to add an entry for</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="password" REQUIRED="yes">
-			<DESCRIPTION>Password to be added to the password file</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="passfile" REQUIRED="no, default is ~/.cvspass.">
-			<DESCRIPTION>Password file to add the entry to</DESCRIPTION>
-		</ATTRIBUTE>
-	</TASK>
-	<TASK NAME="cvstagdiff">
-		<DESCRIPTION>&lt;p&gt;Generates an XML-formatted report file of the changes between two tags or dates recorded in a
-&lt;a href=&quot;http://www.cvshome.org/&quot; target=&quot;_top&quot;&gt;CVS&lt;/a&gt; repository. &lt;/p&gt;
-</DESCRIPTION>
-		<ATTRIBUTE NAME="starttag" REQUIRED="exactly one of the two.">
-			<DESCRIPTION>The earliest tag from which diffs are to beincluded in the report</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="startdate" REQUIRED="">
-			<DESCRIPTION>The earliest date from which diffs are to beincluded in the report</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="endtag" REQUIRED="exactly one of the two.">
-			<DESCRIPTION>The latest tag from which diffs are to beincluded in the report</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="enddate" REQUIRED="">
-			<DESCRIPTION>The latest date from which diffs are to beincluded in the report</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="destfile" REQUIRED="yes">
-			<DESCRIPTION>The file in which to write the diff report</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="rootdir" REQUIRED="no">
-			<DESCRIPTION>Root directory for the package, if different from the package name</DESCRIPTION>
-		</ATTRIBUTE>
-	</TASK>
-	<TASK NAME="delete">
-		<DESCRIPTION>&lt;p&gt;Deletes a single file, a specified directory and all its files and
-subdirectories, or a set of files specified by one or more
-&lt;a href=&quot;../CoreTypes/fileset.html&quot;&gt;FileSet&lt;/a&gt;s.
-When specifying a set of files, empty directories are &lt;i&gt;not&lt;/i&gt; removed by
-default.
-To remove empty directories, use the &lt;code&gt;includeEmptyDirs&lt;/code&gt; attribute.
-&lt;/p&gt;
-&lt;p&gt;
-If you use this task to delete temporary files created by editors
-and it doesn't seem to work, read up on the 
-&lt;a href=&quot;../dirtasks.html#defaultexcludes&quot;&gt;default exclusion set&lt;/a&gt;
-in &lt;strong&gt;Directory-based Tasks&lt;/strong&gt;, and see the
-&lt;code&gt;defaultexcludes&lt;/code&gt; attribute below.
-</DESCRIPTION>
-		<ATTRIBUTE NAME="file" REQUIRED="at least one of the two,
-      unless a &lt;fileset&gt; is specified.">
-			<DESCRIPTION>The file to delete, specified as either the simplefilename (if the file exists in the current base directory), arelative-path filename, or a full-path filename</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="dir" REQUIRED="">
-			<DESCRIPTION>The directory to delete, including all its files andsubdirectoriesNote: dir is not usedto specify a directory name for file; fileand dir are independent of each otherWARNING: Do not set dir to&quot;.&quot;, &quot;${basedir}&quot;,or the full-pathname equivalent unless you truly intend torecursively remove the entire contents of the current base directory(and the base directory itself, if different from the current workingdirectory)</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="verbose" REQUIRED="no">
-			<DESCRIPTION>Show the name of each deleted file(&quot;true&quot;/&quot;false&quot;).Default is &quot;false&quot; when omitted</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="quiet" REQUIRED="no">
-			<DESCRIPTION>If the specified file or directory does not exist,do not display a diagnostic message (unless Anthas been invoked with the &amp;#x2011;verbose or&amp;#x2011;debug switches) or modify the exit status toreflect an error.When set to &quot;true&quot;, if a file or directory cannot be deleted,no error is reported. This setting emulates the -f option to the Unix rm command.Default is &quot;false&quot;.Setting this to &quot;true&quot; implies settingfailonerror to &quot;false&quot;.</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="failonerror" REQUIRED="no">
-			<DESCRIPTION>Controls whether an error (such as a failure to delete a file)stops the build or is merely reported to the screen.Only relevant if quiet is &quot;false&quot;.Default is &quot;true&quot;.</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="includeemptydirs" REQUIRED="no">
-			<DESCRIPTION>Set to &quot;true&quot; to delete empty directories whenusing filesets.  Default is &quot;false&quot;</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="includes" REQUIRED="no">
-			<DESCRIPTION>Deprecated.  Use &lt;fileset&gt;.Comma- or space-separated list of patterns offiles that must be deleted. All files are relative to the directoryspecified in dir.</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="includesfile" REQUIRED="no">
-			<DESCRIPTION>Deprecated.  Use &lt;fileset&gt;.The name of a file. Each line ofthis file is taken to be an include patter</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="excludes" REQUIRED="no">
-			<DESCRIPTION>Deprecated.  Use &lt;fileset&gt;.Comma- or space-separated list of patterns offiles that must be excluded from the deletion list.All files are relative to the directory specified in dir.No files (except default excludes) are excluded when omitted</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="excludesfile" REQUIRED="no">
-			<DESCRIPTION>Deprecated.  Use &lt;fileset&gt;.The name of a file. Each line ofthis file is taken to be an exclude patter</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="defaultexcludes" REQUIRED="no">
-			<DESCRIPTION>Indicates whether default excludesshould be used or not (&quot;yes&quot;/&quot;no&quot;).Default excludes are used when omitted</DESCRIPTION>
-		</ATTRIBUTE>
-	</TASK>
-	<TASK NAME="deltree">
-		<DESCRIPTION>&lt;p&gt;Deletes a directory with all its files and subdirectories.&lt;/p&gt;
-</DESCRIPTION>
-		<ATTRIBUTE NAME="dir" REQUIRED="yes">
-			<DESCRIPTION>the directory to delete</DESCRIPTION>
-		</ATTRIBUTE>
-	</TASK>
-	<TASK NAME="dependset">
-		<DESCRIPTION>&lt;p&gt;
-The dependset task compares a set of source files with a set of target
-files.  If any of the source files is more recent than any of
-the target files, all of the target files are removed.  
-&lt;/p&gt;
-&lt;p&gt;
-Source files and target files are specified via nested &lt;a
-href=&quot;../CoreTypes/fileset.html&quot;&gt;FileSets&lt;/a&gt; and/or nested &lt;a
-href=&quot;../CoreTypes/filelist.html&quot;&gt;FileLists&lt;/a&gt;.  Arbitrarily many
-source and target filesets/filelists may be specified, but at 
-least one filelist/fileset is required for both sources and targets.
-&lt;/p&gt;
-&lt;p&gt;
-Use a FileSet when you want to use wildcard include or exclude
-patterns and don't care about missing files.  Use a FileList when you
-want to consider the non-existence of a file as if it were out of
-date.  If there are any non-existing files in any source or target
-FileList, all target files will be removed.
-&lt;/p&gt;
-&lt;p&gt;
-DependSet is useful to capture dependencies that are not or cannot be
-determined algorithmically.  For example, the &amp;lt;style&amp;gt; task only
-compares the source XML file and XSLT stylesheet against the target
-file to determined whether to restyle the source.  Using dependset you
-can extend this dependency checking to include a DTD or XSD file as
-well as other stylesheets imported by the main stylesheet.
-&lt;/p&gt;
-</DESCRIPTION>	</TASK>
-	<TASK NAME="dirname">
-		<DESCRIPTION>&lt;p&gt;
-Task to determine the directory path of a specified file.
-&lt;/p&gt;
-&lt;p&gt; 
-When this task executes, it will set the specified property to the
-value of the specified file up to, but not including, the last path
-element. If the specified file is a path that ends in a filename,
-the filename will be dropped. If the specified file is just a filename,
-the directory will be the current directory.
-&lt;/p&gt;
-</DESCRIPTION>
-		<ATTRIBUTE NAME="file" REQUIRED="yes">
-			<DESCRIPTION>The path to take the dirname of</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="property" REQUIRED="yes">
-			<DESCRIPTION>The name of the property to set</DESCRIPTION>
-		</ATTRIBUTE>
-	</TASK>
-	<TASK NAME="ear">
-		<DESCRIPTION>&lt;p&gt;An extension of the &lt;a href=&quot;jar.html&quot;&gt;Jar&lt;/a&gt; task with special
-treatment for files that should end up in an Enterprise Application archive.&lt;/p&gt;
-&lt;p&gt;(The Ear task is a shortcut for specifying the particular layout of a EAR file. 
-The same thing can be accomplished by using the &lt;i&gt;prefix&lt;/i&gt; and &lt;i&gt;fullpath&lt;/i&gt;
-attributes of zipfilesets in a Zip or Jar task.)&lt;/p&gt;
-&lt;p&gt;The extended zipfileset element from the zip task (with attributes &lt;i&gt;prefix&lt;/i&gt;, &lt;i&gt;fullpath&lt;/i&gt;, and &lt;i&gt;src&lt;/i&gt;) is available in the Ear task.&lt;/p&gt;
-</DESCRIPTION>
-		<ATTRIBUTE NAME="destfile" REQUIRED="yes">
-			<DESCRIPTION>the EAR file to create</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="appxml" REQUIRED="yes, unless update is set to true">
-			<DESCRIPTION>The deployment descriptor to use (META-INF/application.xml)</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="basedir" REQUIRED="no">
-			<DESCRIPTION>the directory from which to jar the files</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="compress" REQUIRED="no">
-			<DESCRIPTION>Not only store data but also compress them, defaults to tru</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="encoding" REQUIRED="no">
-			<DESCRIPTION>The character encoding to use for filenamesinside the archive.  Defaults to UTF8. It is notrecommended to change this value as the created archive will mostlikely be unreadable for Java otherwise</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="filesonly" REQUIRED="no">
-			<DESCRIPTION>Store only file entries, defaults to fals</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="includes" REQUIRED="no">
-			<DESCRIPTION>comma- or space-separated list of patterns of files that must beincluded. All files are included when omitted</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="includesfile" REQUIRED="no">
-			<DESCRIPTION>the name of a file. Each line of this file istaken to be an include patter</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="excludes" REQUIRED="no">
-			<DESCRIPTION>comma- or space-separated list of patterns of files that must beexcluded. No files (except default excludes) are excluded when omitted</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="excludesfile" REQUIRED="no">
-			<DESCRIPTION>the name of a file. Each line of this file istaken to be an exclude patter</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="defaultexcludes" REQUIRED="no">
-			<DESCRIPTION>indicates whether default excludes should be used or not(&quot;yes&quot;/&quot;no&quot;). Default excludes are used when omitted</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="manifest" REQUIRED="no">
-			<DESCRIPTION>the manifest file to use</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="update" REQUIRED="no">
-			<DESCRIPTION>indicates whether to update or overwritethe destination file if it already exists</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="duplicate" REQUIRED="no">
-			<DESCRIPTION>behavior when a duplicate file is found.  Valid values are &quot;add&quot;, &quot;preserve&quot;, and &quot;fail&quot;.  The default value is &quot;add&quot;. </DESCRIPTION>
-		</ATTRIBUTE>
-	</TASK>
-	<TASK NAME="echo">
-		<DESCRIPTION>&lt;p&gt;Echoes a message to the current loggers and listeners which
-means &lt;tt&gt;System.out&lt;/tt&gt; unless overridden. A &lt;tt&gt;level&lt;/tt&gt;
-can be specified, which controls at what logging level the message is
-filtered at. 
-&lt;p&gt; 
-The task can also echo to a file, in which case the option to append rather
-than overwrite the file is available, and the &lt;tt&gt;level&lt;/tt&gt; option is 
-ignored&lt;/p&gt;
-</DESCRIPTION>
-		<ATTRIBUTE NAME="message" REQUIRED="yes, unless data is included in a
-       character section within this element.">
-			<DESCRIPTION>the message to echo</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="file" REQUIRED="no">
-			<DESCRIPTION>the file to write the message to</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="append" REQUIRED="no - default is false.">
-			<DESCRIPTION>Append to an existing file</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="level" REQUIRED="no - default is &quot;warning&quot;.">
-			<DESCRIPTION>Control the level at which this message is reported.One of &quot;error&quot;, &quot;warning&quot;, &quot;info&quot;, &quot;verbose&quot;, &quot;debug</DESCRIPTION>
-		</ATTRIBUTE>
-	</TASK>
-	<TASK NAME="exec">
-		<DESCRIPTION>&lt;p&gt;Executes a system command. When the &lt;i&gt;os&lt;/i&gt; attribute is specified, then
-the command is only executed when Ant is run on one of the specified operating
-systems.&lt;/p&gt;
-</DESCRIPTION>
-		<ATTRIBUTE NAME="command" REQUIRED="exactly one of the two.">
-			<DESCRIPTION>the command to execute with all command linearguments. deprecated, use executable and nested&lt;arg&gt; elements instead</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="executable" REQUIRED="">
-			<DESCRIPTION>the command to execute without any command linearguments</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="dir" REQUIRED="no">
-			<DESCRIPTION>the directory in which the command should be executed</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="os" REQUIRED="no">
-			<DESCRIPTION>list of Operating Systems on which the command may beexecuted. If the current OS's name is contained in this list, the command willbe executed. The OS's name is determined by the Java Virtual machine and is setin the &quot;os.name&quot; system property</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="output" REQUIRED="no">
-			<DESCRIPTION>the file to which the output of the command should beredirected</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="append" REQUIRED="no">
-			<DESCRIPTION>whether output should be appended to or overwritean existing file.  Defaults to false</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="outputproperty" REQUIRED="no">
-			<DESCRIPTION>the name of a property in which the output of the command should be stored</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="resultproperty" REQUIRED="no">
-			<DESCRIPTION>the name of a property in which the return code of the command should be stored. Only of interest if failonerror=fals</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="timeout" REQUIRED="no">
-			<DESCRIPTION>Stop the command if it doesn't finish within thespecified time (given in milliseconds)</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="failonerror" REQUIRED="no">
-			<DESCRIPTION>Stop the buildprocess if the command exits with areturncode other than 0. Defaults to fals</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="failifexecutionfails" REQUIRED="no">
-			<DESCRIPTION>Stop the build if we can't start the program.Defaults to true.</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="newenvironment" REQUIRED="no, default is false">
-			<DESCRIPTION>Do not propagate old environment when new environmentvariables are specified</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="vmlauncher" REQUIRED="no, default is true">
-			<DESCRIPTION>Run command using the Java VM's execution facilitieswhere available. If set to false the underlying OS's shell,either directly or through the antRun scripts, will be used.Under some operating systems, this gives access to facilitiesnot normally available through the VM including, under Windows,being able to execute scripts, rather than their associatedinterpreter.  If you want to specify the name of theexecutable as a relative path to the directory given by thedir attribute, it may become necessary to set vmlauncher tofalse as well</DESCRIPTION>
-		</ATTRIBUTE>
-	</TASK>
-	<TASK NAME="fail">
-		<DESCRIPTION>&lt;p&gt;Exits the current build (just throwing a BuildException), optionally printing additional information.&lt;/p&gt;
-&lt;p&gt;The message of the Exception can be set via the message attribute
-or character data nested into the element.&lt;/p&gt;
-</DESCRIPTION>
-		<ATTRIBUTE NAME="message" REQUIRED="no">
-			<DESCRIPTION>A message giving further information on why the build exite</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="if" REQUIRED="no">
-			<DESCRIPTION>Only fail if a property of the given name existsin the current projec</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="unless" REQUIRED="no">
-			<DESCRIPTION>Only fail if a property of the given name doesn'texist in the current projec</DESCRIPTION>
-		</ATTRIBUTE>
-	</TASK>
-	<TASK NAME="filter">
-		<DESCRIPTION>&lt;p&gt;Sets a token filter for this project or read multiple token filter from
-an input file and sets these as filters.
-Token filters are used by all tasks that perform file copying operations
-through the Project commodity methods.&lt;/p&gt;
-&lt;p&gt;Note 1: the token string must not contain the separators chars (@).&lt;br&gt;
-Note 2: Either token and value attributes must be provided, or only the
-filtersfile attribute.&lt;/p&gt;
-</DESCRIPTION>
-		<ATTRIBUTE NAME="token" REQUIRED="yes*">
-			<DESCRIPTION>the token string without </DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="value" REQUIRED="yes*">
-			<DESCRIPTION>the string that should be put to replace the token when the file is copie</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="filtersfile" REQUIRED="yes*">
-			<DESCRIPTION>The file from which the filters must be read. This file must be a formatted as a property file.</DESCRIPTION>
-		</ATTRIBUTE>
-	</TASK>
-	<TASK NAME="fixcrlf">
-		<DESCRIPTION>&lt;p&gt;
-Adjusts a text file to local conventions.
-&lt;/p&gt;
-&lt;p&gt;
-The set of files to be adjusted can be refined with the
-&lt;i&gt;includes&lt;/i&gt;, &lt;i&gt;includesfile&lt;/i&gt;, &lt;i&gt;excludes&lt;/i&gt;,
-&lt;i&gt;excludesfile&lt;/i&gt; and &lt;i&gt;defaultexcludes&lt;/i&gt;
-attributes. Patterns provided through the &lt;i&gt;includes&lt;/i&gt; or
-&lt;i&gt;includesfile&lt;/i&gt; attributes specify files to be
-included. Patterns provided through the &lt;i&gt;exclude&lt;/i&gt; or
-&lt;i&gt;excludesfile&lt;/i&gt; attribute specify files to be
-excluded. Additionally, default exclusions can be specified with
-the &lt;i&gt;defaultexcludes&lt;/i&gt; attribute. See the section on &lt;a
-href=&quot;../dirtasks.html#directorybasedtasks&quot;&gt;directory based
-tasks&lt;/a&gt;, for details of file inclusion/exclusion patterns
-and their usage.
-&lt;/p&gt;
-&lt;p&gt;This task forms an implicit &lt;a href=&quot;../CoreTypes/fileset.html&quot;&gt;FileSet&lt;/a&gt; and
-supports all attributes of &lt;code&gt;&amp;lt;fileset&amp;gt;&lt;/code&gt;
-(&lt;code&gt;dir&lt;/code&gt; becomes &lt;code&gt;srcdir&lt;/code&gt;) as well as the nested
-&lt;code&gt;&amp;lt;include&amp;gt;&lt;/code&gt;, &lt;code&gt;&amp;lt;exclude&amp;gt;&lt;/code&gt; and
-&lt;code&gt;&amp;lt;patternset&amp;gt;&lt;/code&gt; elements.&lt;/p&gt;
-&lt;p&gt;
-The output file is only written if it is a new file, or if it
-differs from the existing file.  This prevents spurious
-rebuilds based on unchanged files which have been regenerated
-by this task.
-&lt;/p&gt;
-</DESCRIPTION>
-		<ATTRIBUTE NAME="srcdir" REQUIRED="yes">
-			<DESCRIPTION>Where to find the files to be fixed up</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="destdir" REQUIRED="no">
-			<DESCRIPTION>Where to place the corrected files.  Defaults tosrcDir (replacing the original file</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="includes" REQUIRED="no">
-			<DESCRIPTION>comma- or space-separated list of patterns of files that must beincluded. All files are included when omitted</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="includesfile" REQUIRED="no">
-			<DESCRIPTION>the name of a file. Each line of this file istaken to be an include patter</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="excludes" REQUIRED="no">
-			<DESCRIPTION>comma- or space-separated list of patterns of files that must beexcluded. No files (except default excludes) are excluded when omitted</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="excludesfile" REQUIRED="no">
-			<DESCRIPTION>the name of a file. Each line of this file istaken to be an exclude patter</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="defaultexcludes" REQUIRED="no">
-			<DESCRIPTION>indicates whether default excludes should be used or not(&quot;yes&quot;/&quot;no&quot;). Default excludes are used when omitted</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="eol" REQUIRED="no">
-			<DESCRIPTION>Specifies how end-of-line (EOL) characters are to behandled.  The EOL characters are CR, LF and the pair CRLF.Valid values for this property are:asis: leave EOL characters alonecr: convert all EOLs to a single CRlf: convert all EOLs to a single LFcrlf: convert all EOLs to the pair CRLFDefault is based on the platform on which you are runningthis task.  For Unix platforms, the default is &quot;lf&quot;.For DOS based systems (including Windows), the default is&quot;crlf&quot;.  For Mac OS, the default is &quot;cr&quot;.This is the preferred method for specifying EOL.  The&quot;cr&quot; attribute (see below) isnow deprecated.N.B.: One special case is recognized. The threecharacters CR-CR-LF are regarded as a single EOL.Unless this property is specified as &quot;asis&quot;,this sequence will be converted into the specified EOLtype.</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="cr" REQUIRED="no">
-			<DESCRIPTION>Deprecated. Specifies how CR characters areto be handled at end-of-line (EOL).  Valid values for thisproperty are:asis: leave EOL characters alone.add: add a CR before any single LF characters. Theintent is to convert all EOLs to the pair CRLF.remove: remove all CRs from the file.  The intent isto convert all EOLs to a single LF.Default is based on the platform on which you are runningthis task.  For Unix platforms, the default is &quot;remove&quot;.For DOS based systems (including Windows), the default is&quot;add&quot;.N.B.: One special case is recognized. The threecharacters CR-CR-LF are regarded as a single EOL.Unless this property is specified as &quot;asis&quot;,this sequence will be converted into the specified EOLtype.</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="javafiles" REQUIRED="no">
-			<DESCRIPTION>Used only in association with the&quot;tab&quot; attribute (see below), thisboolean attribute indicates whether the fileset is a setof java source files(&quot;yes&quot;/&quot;no&quot;). Defaults to&quot;no&quot;.  See notes in section on &quot;tab&quot;.</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="tab" REQUIRED="no">
-			<DESCRIPTION>Specifies how tab characters are to be handled.  Validvalues for this property are:add: convert sequences of spaces which span a tab stop to tabsasis: leave tab and space characters aloneremove: convert tabs to spacesDefault for this parameter is &quot;asis&quot;.N.B.: When the attribute&quot;javafiles&quot; (see above) is&quot;true&quot;, literal TAB characters occurringwithin Java string or character constants are nevermodified.  This functionality also requires therecognition of Java-style comments.N.B.: There is an incompatibility between thisand the previous version in the handling of whitespace at the end of lines.  This version doesnot remove trailing whitespace on lines.</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="tablength" REQUIRED="no">
-			<DESCRIPTION>TAB character interval. Valid values are between2 and 80 inclusive.  The default for this parameter is 8</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="eof" REQUIRED="no">
-			<DESCRIPTION>Specifies how DOS end of file (control-Z) characters areto be handled.  Valid values for this property are:add: ensure that there is an EOF character at the end of the fileasis: leave EOF characters aloneremove: remove any EOF character found at the endDefault is based on the platform on which you are running this task.For Unix platforms, the default is remove.  For DOS based systems(including Windows), the default is asis.</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="encoding" REQUIRED="no - defaults to default jvm encoding">
-			<DESCRIPTION>The encoding of the file</DESCRIPTION>
-		</ATTRIBUTE>
-	</TASK>
-	<TASK NAME="genkey">
-		<DESCRIPTION>&lt;p&gt;Generates a key in keystore. This task needs Java1.2 or later&lt;/p&gt;
-</DESCRIPTION>
-		<ATTRIBUTE NAME="alias" REQUIRED="yes.">
-			<DESCRIPTION>the alias to add unde</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="storepass" REQUIRED="yes.">
-			<DESCRIPTION>password for keystore integrity. Mustbe at least 6 characters lon</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="keystore" REQUIRED="no">
-			<DESCRIPTION>keystore locatio</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="storetype" REQUIRED="no">
-			<DESCRIPTION>keystore typ</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="keypass" REQUIRED="no">
-			<DESCRIPTION>password for private key (if different</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="sigalg" REQUIRED="no">
-			<DESCRIPTION>the algorithm to use in signin</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="keyalg" REQUIRED="no">
-			<DESCRIPTION>the method to use when generating name-value pai</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="verbose" REQUIRED="no">
-			<DESCRIPTION>(true | false) verbose output when signin</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="dname" REQUIRED="yes if dname element unspecified">
-			<DESCRIPTION>The distinguished name for entit</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="validity" REQUIRED="no">
-			<DESCRIPTION>(integer) indicates how many days certificate is vali</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="keysize" REQUIRED="no">
-			<DESCRIPTION>(integer) indicates the size of key generate</DESCRIPTION>
-		</ATTRIBUTE>
-	</TASK>
-	<TASK NAME="get">
-		<DESCRIPTION>&lt;p&gt;Gets a file from a URL. When the verbose option is &amp;quot;on&amp;quot;, this task
-displays a '.' for every 100 Kb retrieved. Any URL schema supported by
-the runtime is valid here, including http:, ftp: and jar:; 
-https: is only valid if the appropriate support is added to the pre-1.4 Java
-runtimes. 
-&lt;/p&gt;
-&lt;p&gt;This task should be preferred above the &lt;a href=&quot;cvs.html&quot;&gt;CVS task&lt;/a&gt; when
-fetching remote content. CVS is significantly slower than loading a compressed
-archive compared to http/ftp.&lt;/p&gt;
-The &lt;i&gt;usetimestamp&lt;/i&gt; option enables you to control downloads so that the remote file is
-only fetched if newer than the local copy. If there is no local copy, the download always takes 
-place. When a file is downloaded, the timestamp of the downloaded file is set to the remote timestamp,
-if  the JVM is Java1.2 or later. 
-NB: This timestamp facility only works on downloads using the HTTP protocol. 
-&lt;p&gt;
-A username and password can be specified, in which case basic 'slightly encoded
-plain text' authentication is used. This is only a secure authentication
-mechanism over an HTTPS link.
-&lt;/p&gt;
-</DESCRIPTION>
-		<ATTRIBUTE NAME="src" REQUIRED="yes">
-			<DESCRIPTION>the URL from which to retrieve a file</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="dest" REQUIRED="yes">
-			<DESCRIPTION>the file where to store the retrieved file</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="verbose" REQUIRED="no; default &quot;false&quot;">
-			<DESCRIPTION>show verbose progress information (&quot;on&quot;/&quot;off&quot;)</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="ignoreerrors" REQUIRED="no; default &quot;false&quot;">
-			<DESCRIPTION>Log errors but don't treat as fatal</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="usetimestamp" REQUIRED="no; default &quot;false&quot;">
-			<DESCRIPTION>conditionally download a file based on the timestamp of thelocal copy. HTTP onl</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="username" REQUIRED="if password is set">
-			<DESCRIPTION>username for 'BASIC' http authenticatio</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="password" REQUIRED="if username is set">
-			<DESCRIPTION>password: required</DESCRIPTION>
-		</ATTRIBUTE>
-	</TASK>
-	<TASK NAME="input">
-		<DESCRIPTION>&lt;p&gt;Allows user interaction during the build process by prompting for
-input.  To do so, it uses the configured 
-&lt;a href=&quot;../inputhandler.html&quot;&gt;InputHandler&lt;/a&gt;.&lt;/p&gt;
-&lt;p&gt;The prompt can be set via the message attribute or as character
-data nested into the element.&lt;/p&gt;
-&lt;p&gt;Optinonally a set of valid imput arguments can be defined via the
-validargs attribute. Input task will no accept value that don't match
-one of the predefined.&lt;/p&gt;
-&lt;p&gt;Optionally a property can be created from the value entered by the
-user. This property can then be used during the following build
-run. Input behaves according to &lt;a href=&quot;property.html&quot;&gt;property
-task&lt;/a&gt; which means that existing properties cannot be overriden.&lt;/p&gt;
-</DESCRIPTION>
-		<ATTRIBUTE NAME="message" REQUIRED="no">
-			<DESCRIPTION>the Message which gets displayed to the userduring the build run</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="validargs" REQUIRED="no">
-			<DESCRIPTION>comma separated String containing valid inputarguments. If set, input task will reject any input not definedhere.  Validargs are compared case sensitive. If you want 'a' and'A' to be accepted you will need to define both arguments withinvalidargs</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="addproperty" REQUIRED="no">
-			<DESCRIPTION>the name of a property to be created frominput. Behaviour is equal to propertytask which means that existing properties cannot beoverriden</DESCRIPTION>
-		</ATTRIBUTE>
-	</TASK>
-	<TASK NAME="jar">
-		<DESCRIPTION>&lt;p&gt;Jars a set of files.&lt;/p&gt;
-&lt;p&gt;The &lt;i&gt;basedir&lt;/i&gt; attribute is the reference directory from where to jar.&lt;/p&gt;
-&lt;p&gt;Note that file permissions will not be stored in the resulting jarfile.&lt;/p&gt;
-&lt;p&gt;It is possible to refine the set of files that are being jarred. This can be
-done with the &lt;i&gt;includes&lt;/i&gt;, &lt;i&gt;includesfile&lt;/i&gt;, &lt;i&gt;excludes&lt;/i&gt;, &lt;i&gt;excludesfile&lt;/i&gt; and &lt;i&gt;defaultexcludes&lt;/i&gt;
-attributes. With the &lt;i&gt;includes&lt;/i&gt; or &lt;i&gt;includesfile&lt;/i&gt; attribute you specify the files you want to
-have included by using patterns. The &lt;i&gt;exclude&lt;/i&gt; or &lt;i&gt;excludesfile&lt;/i&gt; attribute is used to specify
-the files you want to have excluded. This is also done with patterns. And
-finally with the &lt;i&gt;defaultexcludes&lt;/i&gt; attribute, you can specify whether you
-want to use default exclusions or not. See the section on &lt;a
-href=&quot;../dirtasks.html#directorybasedtasks&quot;&gt;directory based tasks&lt;/a&gt;, on how the
-inclusion/exclusion of files works, and how to write patterns.&lt;/p&gt;
-&lt;p&gt;This task forms an implicit &lt;a href=&quot;../CoreTypes/fileset.html&quot;&gt;FileSet&lt;/a&gt; and
-supports all attributes of &lt;code&gt;&amp;lt;fileset&amp;gt;&lt;/code&gt;
-(&lt;code&gt;dir&lt;/code&gt; becomes &lt;code&gt;basedir&lt;/code&gt;) as well as the nested
-&lt;code&gt;&amp;lt;include&amp;gt;&lt;/code&gt;, &lt;code&gt;&amp;lt;exclude&amp;gt;&lt;/code&gt; and
-&lt;code&gt;&amp;lt;patternset&amp;gt;&lt;/code&gt; elements.&lt;/p&gt;
-&lt;p&gt;You can also use nested file sets for more flexibility, and specify
-multiple ones to merge together different trees of files into one JAR.
-The extended fileset and groupfileset attributes from the zip task are
-also available in the jar task.
-See the &lt;a href=&quot;zip.html&quot;&gt;Zip&lt;/a&gt; task for more details and examples.&lt;/p&gt;
-&lt;p&gt;If the manifest is omitted, a simple one will be supplied by Ant.&lt;/p&gt;
-&lt;p&gt;The &lt;code&gt;update&lt;/code&gt; parameter controls what happens if the
-JAR file already exists. When set to &lt;code&gt;yes&lt;/code&gt;, the JAR file is
-updated with the files specified. When set to &lt;code&gt;no&lt;/code&gt; (the
-default) the JAR file is overwritten. An example use of this is
-provided in the &lt;a href=&quot;zip.html&quot;&gt;Zip task documentation&lt;/a&gt;.&lt;/p&gt;
-&lt;p&gt;(The Jar task is a shortcut for specifying the manifest file of a JAR file.
-The same thing can be accomplished by using the &lt;i&gt;fullpath&lt;/i&gt;
-attribute of a zipfileset in a Zip task. The one difference is that if the
-&lt;i&gt;manifest&lt;/i&gt; attribute is not specified, the Jar task will
-include an empty one for you.)&lt;/p&gt;
-&lt;p&gt;Manifests are processed by the Jar task according to the
-&lt;a href=&quot;http://java.sun.com/j2se/1.3/docs/guide/jar/jar.html&quot;&gt;Jar file specification.&lt;/a&gt;
-Note in particular that this may result in manifest lines greater than 72 bytes
-being wrapped and continued on the next line.
-&lt;/p&gt;
-</DESCRIPTION>
-		<ATTRIBUTE NAME="destfile" REQUIRED="yes">
-			<DESCRIPTION>the JAR file to create</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="basedir" REQUIRED="no">
-			<DESCRIPTION>the directory from which to jar the files</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="compress" REQUIRED="no">
-			<DESCRIPTION>Not only store data but also compress them, defaults to tru</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="encoding" REQUIRED="no">
-			<DESCRIPTION>The character encoding to use for filenamesinside the archive.  Defaults to UTF8. It is notrecommended to change this value as the created archive will mostlikely be unreadable for Java otherwise</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="filesonly" REQUIRED="no">
-			<DESCRIPTION>Store only file entries, defaults to fals</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="includes" REQUIRED="no">
-			<DESCRIPTION>comma- or space-separated list of patterns of files that must beincluded. All files are included when omitted</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="includesfile" REQUIRED="no">
-			<DESCRIPTION>the name of a file. Each line of this file istaken to be an include patter</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="excludes" REQUIRED="no">
-			<DESCRIPTION>comma- or space-separated list of patterns of files that must beexcluded. No files (except default excludes) are excluded when omitted</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="excludesfile" REQUIRED="no">
-			<DESCRIPTION>the name of a file. Each line of this file istaken to be an exclude patter</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="defaultexcludes" REQUIRED="no">
-			<DESCRIPTION>indicates whether default excludes should be used or not(&quot;yes&quot;/&quot;no&quot;). Default excludes are used when omitted</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="manifest" REQUIRED="no">
-			<DESCRIPTION>the manifest file to use.  This can be either the location of a manifest, or the name of a jar added through a fileset.  If its the name of an added jar, the task expects the manifest to be in the jar at META-INF/MANIFEST.M</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="update" REQUIRED="no">
-			<DESCRIPTION>indicates whether to update or overwritethe destination file if it already exists</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="whenempty" REQUIRED="no">
-			<DESCRIPTION>behavior when no files match.  Valid values are &quot;fail&quot;, &quot;skip&quot;, and &quot;create&quot;.  Default is &quot;skip&quot;</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="duplicate" REQUIRED="no">
-			<DESCRIPTION>behavior when a duplicate file is found.  Valid values are &quot;add&quot;, &quot;preserve&quot;, and &quot;fail&quot;.  The default value is &quot;add&quot;. </DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="index" REQUIRED="no">
-			<DESCRIPTION>whether to create an index list to speed up classloading.  This is a JDK 1.3+ specific feature.  Defaults to false.</DESCRIPTION>
-		</ATTRIBUTE>
-	</TASK>
-	<TASK NAME="java">
-		<DESCRIPTION>&lt;p&gt;Executes a Java class within the running (Ant) VM or forks another VM if
-specified.&lt;/p&gt;
-&lt;p&gt;
-If odd things go wrong when you run this task, set fork=&quot;true&quot; to use a new
-JVM.
-</DESCRIPTION>
-		<ATTRIBUTE NAME="classname" REQUIRED="either jar or classname">
-			<DESCRIPTION>the Java class to execute</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="jar" REQUIRED="either jar or classname">
-			<DESCRIPTION>the location of the jar file to execute (must have a Main-Class entry in the manifest). Fork must be set to true if this option is selected</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="args" REQUIRED="no">
-			<DESCRIPTION>the arguments for the class that isexecuted. deprecated, use nested &lt;arg&gt;elements instead</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="classpath" REQUIRED="no">
-			<DESCRIPTION>the classpath to use</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="classpathref" REQUIRED="no">
-			<DESCRIPTION>the classpath to use, given as reference to a PATH defined elsewhere</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="fork" REQUIRED="no">
-			<DESCRIPTION>if enabled triggers the class execution in another VM(disabled by default</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="jvm" REQUIRED="no">
-			<DESCRIPTION>the command used to invoke the Java Virtual Machine,default is 'java'.  The command is resolved by java.lang.Runtime.exec().Ignored if fork is disabled.</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="jvmargs" REQUIRED="no">
-			<DESCRIPTION>the arguments to pass to the forked VM (ignoredif fork is disabled). deprecated, use nested&lt;jvmarg&gt; elements instead</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="maxmemory" REQUIRED="no">
-			<DESCRIPTION>Max amount of memory to allocate to the forked VM(ignored if fork is disabled</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="failonerror" REQUIRED="no">
-			<DESCRIPTION>Stop the buildprocess if the command exits with areturncode other than 0. Default is &quot;false</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="dir" REQUIRED="no">
-			<DESCRIPTION>The directory to invoke the VM in.  (ignored iffork is disabled</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="output" REQUIRED="no">
-			<DESCRIPTION>Name of a file to write the output to</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="append" REQUIRED="no">
-			<DESCRIPTION>whether output should be appended to or overwritean existing file.  Defaults to false</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="newenvironment" REQUIRED="no">
-			<DESCRIPTION>Do not propagate old environment when newenvironment variables are specified. Default is &quot;false&quot;(ignored if fork is disabled)</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="timeout" REQUIRED="no">
-			<DESCRIPTION>Stop the command if it doesn't finish within thespecified time (given in milliseconds).  It is highlyrecommended to use this feature only if fork is enabled</DESCRIPTION>
-		</ATTRIBUTE>
-	</TASK>
-	<TASK NAME="javac">
-		<DESCRIPTION>&lt;p&gt;Compiles a Java source tree.&lt;/p&gt;
-&lt;p&gt;The source and destination directory will be recursively scanned for Java
-source files to compile. Only Java files that have no corresponding
-&lt;code&gt;.class&lt;/code&gt; file
-or where the class file is older than the
-&lt;code&gt;.java&lt;/code&gt; file will be compiled.&lt;/p&gt;
-&lt;p&gt;Note: Ant uses only the names of the source and class files to find
-the classes that need a rebuild. It will not scan the source and therefore
-will have no knowledge about nested classes, classes that are named different
-from the source file, and so on. See the
-&lt;a href=&quot;../OptionalTasks/depend.html&quot;&gt;&lt;code&gt;&amp;lt;depend&amp;gt;&lt;/code&gt;&lt;/a&gt; task
-for dependency checking based on other than just
-existence/modification times.&lt;/p&gt;
-&lt;p&gt;When the source files are part of a package, the directory structure of
-the source tree should follow the package
-hierarchy.&lt;/p&gt;
-&lt;p&gt;It is possible to refine the set of files that are being compiled.
-This can be done with the &lt;code&gt;includes&lt;/code&gt;, &lt;code&gt;includesfile&lt;/code&gt;,
-&lt;code&gt;excludes&lt;/code&gt;, and &lt;code&gt;excludesfile&lt;/code&gt;
-attributes. With the &lt;code&gt;includes&lt;/code&gt; or
-&lt;code&gt;includesfile&lt;/code&gt; attribute, you specify the files you want to
-have included.
-The &lt;code&gt;exclude&lt;/code&gt; or &lt;code&gt;excludesfile&lt;/code&gt; attribute is used
-to specify
-the files you want to have excluded. In both cases, the list of files 
-can be specified by either the filename, relative to the directory(s) specified
-in the &lt;code&gt;srcdir&lt;/code&gt; attribute or nested &lt;code&gt;&amp;lt;src&amp;gt;&lt;/code&gt;
-element(s), or by using wildcard patterns. See the section on
-&lt;a href=&quot;../dirtasks.html#directorybasedtasks&quot;&gt;directory-based tasks&lt;/a&gt;,
-for information on how the
-inclusion/exclusion of files works, and how to write wildcard patterns.&lt;/p&gt;
-&lt;p&gt;It is possible to use different compilers. This can be specified by
-either setting the global &lt;code&gt;build.compiler&lt;/code&gt; property, which will
-affect all &lt;code&gt;&amp;lt;javac&amp;gt;&lt;/code&gt; tasks throughout the build, or by
-setting the &lt;code&gt;compiler&lt;/code&gt; attribute, specific to the current
-&lt;code&gt;&amp;lt;javac&amp;gt;&lt;/code&gt; task.
-&lt;a name=&quot;compilervalues&quot;&gt;Valid values for either the
-&lt;code&gt;build.compiler&lt;/code&gt; property or the &lt;code&gt;compiler&lt;/code&gt;
-attribute are:&lt;/a&gt;&lt;/p&gt;
-&lt;ul&gt;
-&lt;li&gt;&lt;code&gt;classic&lt;/code&gt; (the standard compiler of JDK 1.1/1.2) &amp;ndash;
-&lt;code&gt;javac1.1&lt;/code&gt; and
-&lt;code&gt;javac1.2&lt;/code&gt; can be used as aliases.&lt;/li&gt;
-&lt;li&gt;&lt;code&gt;modern&lt;/code&gt; (the standard compiler of JDK 1.3/1.4) &amp;ndash;
-&lt;code&gt;javac1.3&lt;/code&gt; and
-&lt;code&gt;javac1.4&lt;/code&gt; can be used as aliases.&lt;/li&gt;
-&lt;li&gt;&lt;code&gt;jikes&lt;/code&gt; (the &lt;a
-href=&quot;http://oss.software.ibm.com/developerworks/opensource/jikes/&quot; target=&quot;_top&quot;&gt;Jikes&lt;/a&gt;
-compiler).&lt;/li&gt;
-&lt;li&gt;&lt;code&gt;jvc&lt;/code&gt; (the Command-Line Compiler from Microsoft's SDK
-for Java / Visual J++) &amp;ndash; &lt;code&gt;microsoft&lt;/code&gt; can be used
-as an alias.&lt;/li&gt;
-&lt;li&gt;&lt;code&gt;kjc&lt;/code&gt; (the &lt;a href=&quot;http://www.dms.at/kopi/&quot; target=&quot;_top&quot;&gt;kopi&lt;/a&gt;
-compiler).&lt;/li&gt;
-&lt;li&gt;&lt;code&gt;gcj&lt;/code&gt; (the gcj compiler from gcc).&lt;/li&gt;
-&lt;li&gt;&lt;code&gt;sj&lt;/code&gt; (Symantec java compiler) &amp;ndash;
-&lt;code&gt;symantec&lt;/code&gt; can be used as an alias.&lt;/li&gt;
-&lt;li&gt;&lt;code&gt;extJavac&lt;/code&gt; (run either modern or classic in a JVM of
-its own).&lt;/li&gt;
-&lt;/ul&gt;
-&lt;p&gt;The default is &lt;code&gt;javac1.x&lt;/code&gt; with &lt;code&gt;x&lt;/code&gt; depending
-on the JDK version you use while you are running Ant.
-If you wish to use a different compiler interface than those
-supplied, you can write a class that implements the CompilerAdapter interface
-(&lt;code&gt;package org.apache.tools.ant.taskdefs.compilers&lt;/code&gt;). Supply the full
-classname in the &lt;code&gt;build.compiler&lt;/code&gt; property or the
-&lt;code&gt;compiler&lt;/code&gt; attribute.
-&lt;/p&gt;
-&lt;p&gt;The fork attribute overrides the &lt;code&gt;build.compiler&lt;/code&gt; property
-or &lt;code&gt;compiler&lt;/code&gt; attribute setting and
-expects a JDK1.1 or higher to be set in &lt;code&gt;JAVA_HOME&lt;/code&gt;.
-&lt;/p&gt;
-&lt;p&gt;You can also use the &lt;code&gt;compiler&lt;/code&gt; attribute to tell Ant
-which JDK version it shall assume when it puts together the command
-line switches - even if you set &lt;code&gt;fork=&amp;quot;true&amp;quot;&lt;/code&gt;.
-This is useful if you want to run the compiler of JDK 1.1 while you
-current JDK is 1.2+.  If you use
-&lt;code&gt;compiler=&amp;quot;javac1.1&amp;quot;&lt;/code&gt; and (for example)
-&lt;code&gt;depend=&amp;quot;true&amp;quot;&lt;/code&gt; Ant will use the command line
-switch &lt;code&gt;-depend&lt;/code&gt; instead of &lt;code&gt;-Xdepend&lt;/code&gt;.&lt;/p&gt;
-&lt;p&gt;This task will drop all entries that point to non-existent
-files/directories from the classpath it passes to the compiler.&lt;/p&gt;
-&lt;p&gt;&lt;strong&gt;Windows Note:&lt;/strong&gt;When the modern compiler is used
-in unforked mode on Windows, it locks up the files present in the
-classpath of the &lt;code&gt;&amp;lt;javac&amp;gt;&lt;/code&gt; task, and does not release them.
-The side effect of this is that you will not be able to delete or move
-those files later on in the build.  The workaround is to fork when
-invoking the compiler.&lt;/p&gt;
-</DESCRIPTION>
-		<ATTRIBUTE NAME="srcdir" REQUIRED="yes, unless nested &lt;src&gt; elements are present.">
-			<DESCRIPTION>Location of the java files. (See thenote below.</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="destdir" REQUIRED="no">
-			<DESCRIPTION>Location to store the class files</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="includes" REQUIRED="no">
-			<DESCRIPTION>Comma- or space-separated list of files (may be specified usingwildcard patterns) that must beincluded; all .java files are included when omitted</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="includesfile" REQUIRED="no">
-			<DESCRIPTION>The name of a file that contains a list of files toinclude (may be specified using wildcard patterns)</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="excludes" REQUIRED="no">
-			<DESCRIPTION>Comma- or space-separated list of files (may be specified usingwildcard patterns) that must be excluded; no files (except defaultexcludes) are excluded when omitted</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="excludesfile" REQUIRED="no">
-			<DESCRIPTION>The name of a file that contains a list of files toexclude (may be specified using wildcard patterns)</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="classpath" REQUIRED="no">
-			<DESCRIPTION>The classpath to use</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="sourcepath" REQUIRED="no">
-			<DESCRIPTION>The sourcepath to use; defaults to the value of the srcdir attribute (or nested &lt;src&gt; elements).To suppress the sourcepath switch, use sourcepath=&quot;&quot;</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="bootclasspath" REQUIRED="no">
-			<DESCRIPTION>Location of bootstrap class files</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="classpathref" REQUIRED="no">
-			<DESCRIPTION>The classpath to use, given as areference to a path defined elsewhere</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="sourcepathref" REQUIRED="no">
-			<DESCRIPTION>The sourcepath to use, given as areference to a path defined elsewhere</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="bootclasspathref" REQUIRED="no">
-			<DESCRIPTION>Location of bootstrap class files, given as areference to a path defined elsewhere</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="extdirs" REQUIRED="no">
-			<DESCRIPTION>Location of installed extensions</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="encoding" REQUIRED="no">
-			<DESCRIPTION>Encoding of source files. (Note: gcj doesn't supportthis option yet.</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="nowarn" REQUIRED="no">
-			<DESCRIPTION>Indicates whether the -nowarn switchshould be passed to the compiler; defaults to off</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="debug" REQUIRED="no">
-			<DESCRIPTION>Indicates whether source should be compiled with debuginformation; defaults to off</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="debuglevel" REQUIRED="no">
-			<DESCRIPTION>Keyword list to be appended to the -gcommand-line switch.  This will be ignored by all implementations exceptmodern and classic(ver &gt;= 1.2).Legal values are none or a comma-separated list of thefollowing keywords:lines, vars, and source.If debuglevel is not specified, by default,:none will beappended to -g.  If debug is not turned on,this attribute will be ignored.</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="optimize" REQUIRED="no">
-			<DESCRIPTION>Indicates whether source should be compiled withoptimization; defaults to off</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="deprecation" REQUIRED="no">
-			<DESCRIPTION>Indicates whether source should be compiled withdeprecation information; defaults to off</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="target" REQUIRED="no">
-			<DESCRIPTION>Generate class files for specific VM version(e.g., 1.1 or 1.2). Note that thedefault value depends on the JVM that is running Ant.  Inparticular, if you use JDK 1.4 the generated classes will not beusable for a 1.1 Java VM unless you explicitly set this attributeto the value 1.1 (which is the default value for JDK 1.1 to1.3)</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="verbose" REQUIRED="no">
-			<DESCRIPTION>Asks the compiler for verbose output</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="depend" REQUIRED="no">
-			<DESCRIPTION>Enables dependency-trackingfor compilers that support this (jikes andclassic)</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="includeantruntime" REQUIRED="no">
-			<DESCRIPTION>Whether to include the Ant run-time libraries in theclasspath; defaults to yes</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="includejavaruntime" REQUIRED="no">
-			<DESCRIPTION>Whether to include the default run-timelibraries from the executing VM in the classpath;defaults to yes</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="fork" REQUIRED="no">
-			<DESCRIPTION>Whether to execute javac using theJDK compiler externally; defaults to no</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="executable" REQUIRED="no">
-			<DESCRIPTION>Complete path to the javacexecutable to use in case of fork=&quot;yes&quot;.Defaults to the compiler of the Java version that is currentlyrunning Ant.  Ignored if fork=&quot;no</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="memoryinitialsize" REQUIRED="no">
-			<DESCRIPTION>The initial size of the memory for the underlying VM,if javac is run externally; ignored otherwise. Defaultsto the standard VM memory setting.(Examples: 83886080, 81920k, or80m</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="memorymaximumsize" REQUIRED="no">
-			<DESCRIPTION>The maximum size of the memory for the underlying VM,if javac is run externally; ignored otherwise. Defaultsto the standard VM memory setting.(Examples: 83886080, 81920k, or80m</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="failonerror" REQUIRED="no">
-			<DESCRIPTION>Indicates whether the build will continue even if there are compilation errors; defaults to true.</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="source" REQUIRED="no">
-			<DESCRIPTION>Value of the -source command-lineswitch; will be ignored by all implementations exceptjavac1.4 (or modern when Ant is notrunning in a 1.3 VM) and jikesIf you use thisattribute together with jikes, you must make surethat your version of jikes supports the -sourceswitchLegal values are 1.3 and 1.4&amp;ndash; by default, no -source argument will be usedat all</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="compiler" REQUIRED="no">
-			<DESCRIPTION>The compiler implementation to use.If this attribute is not set, the value of thebuild.compiler property, if set, will be used.Otherwise, the default compiler for the current VM will be used.(See the above list of validcompilers.</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="listfiles" REQUIRED="no">
-			<DESCRIPTION>Indicates whether the source files to be compiled willbe listed; defaults to no</DESCRIPTION>
-		</ATTRIBUTE>
-	</TASK>
-	<TASK NAME="javadoc">
-		<DESCRIPTION>&lt;p&gt;Generates code documentation using the javadoc tool.&lt;/p&gt;
-&lt;p&gt;The source directory will be recursively scanned for Java source files to process
-but only those matching the inclusion rules, and not matching the exclusions rules
-will be passed to the javadoc tool. This
-allows wildcards to be used to choose between package names, reducing verbosity
-and management costs over time. This task, however, has no notion of
-&amp;quot;changed&amp;quot; files, unlike the &lt;a href=&quot;javac.html&quot;&gt;javac&lt;/a&gt; task. This means
-all packages will be processed each time this task is run. In general, however,
-this task is used much less frequently.&lt;/p&gt;
-&lt;p&gt;This task works seamlessly between different javadoc versions (1.1,
-1.2 and 1.4), with the obvious restriction that the 1.2 attributes
-will be ignored if run in a 1.1 VM.&lt;/p&gt;
-&lt;p&gt;NOTE: since javadoc calls System.exit(), javadoc cannot be run inside the
-same VM as ant without breaking functionality. For this reason, this task 
-always forks the VM. This overhead is not significant since javadoc is normally a heavy
-application and will be called infrequently.&lt;/p&gt;
-&lt;p&gt;NOTE: the packagelist attribute allows you to specify the list of packages to 
-document outside of the Ant file. It's a much better practice to include everything 
-inside the build.xml file. This option was added in order to make it easier to 
-migrate from regular makefiles, where you would use this option of javadoc. 
-The packages listed in packagelist are not checked, so the task performs even 
-if some packages are missing or broken. Use this option if you wish to convert from 
-an existing makefile. Once things are running you should then switch to the regular 
-notation. &lt;/p&gt;
-&lt;p&gt;&lt;i&gt;&lt;b&gt;DEPRECATION:&lt;/b&gt; the javadoc2 task simply points to the javadoc task and it's
-there for back compatibility reasons. Since this task will be removed in future
-versions, you are strongly encouraged to use &lt;a href=&quot;javadoc.html&quot;&gt;javadoc&lt;/a&gt;
-instead.&lt;/i&gt;&lt;/p&gt;
-&lt;p&gt;In the table below, 1.1 means available if your current Java VM is
-a 1.1 VM, 1.2 for either 1.2 or 1.3 and 1.4 for a 1.4 Java VM.  1.2+
-means any VM of at least version 1.2.&lt;/p&gt;
-</DESCRIPTION>
-		<ATTRIBUTE NAME="sourcepath" REQUIRED="at least one of the three or nested
-     &lt;sourcepath&gt;, &lt;fileset&gt; or
-     &lt;packageset&gt;">
-			<DESCRIPTION>Specify where to find source file</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="sourcepathref" REQUIRED="">
-			<DESCRIPTION>Specify where to find source files by reference to a PATH defined elsewhere</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="sourcefiles" REQUIRED="">
-			<DESCRIPTION>Comma separated list of source file</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="destdir" REQUIRED="yes, unless a doclet has been specified.">
-			<DESCRIPTION>Destination directory for output file</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="maxmemory" REQUIRED="no">
-			<DESCRIPTION>Max amount of memory to allocate to the javadoc V</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="packagenames" REQUIRED="no">
-			<DESCRIPTION>Comma separated list of package files (with terminatingwildcard</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="packagelist" REQUIRED="no">
-			<DESCRIPTION>The name of a file containing the packages to proces</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="classpath" REQUIRED="no">
-			<DESCRIPTION>Specify where to find user class file</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="bootclasspath" REQUIRED="no">
-			<DESCRIPTION>Override location of class files loaded by the bootstrapclass loade</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="classpathref" REQUIRED="no">
-			<DESCRIPTION>Specify where to find user class files by reference to a PATH defined elsewhere</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="bootclasspathref" REQUIRED="no">
-			<DESCRIPTION>Override location of class files loaded by thebootstrap class loader by reference to aPATH defined elsewhere</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="extdirs" REQUIRED="no">
-			<DESCRIPTION>Override location of installed extension</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="overview" REQUIRED="no">
-			<DESCRIPTION>Read overview documentation from HTML fil</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="access" REQUIRED="no (default protected)">
-			<DESCRIPTION>Access mode: one of public, protected,package, or privat</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="public" REQUIRED="no">
-			<DESCRIPTION>Show only public classes and member</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="protected" REQUIRED="no">
-			<DESCRIPTION>Show protected/public classes and members (default</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="package" REQUIRED="no">
-			<DESCRIPTION>Show package/protected/public classes and member</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="private" REQUIRED="no">
-			<DESCRIPTION>Show all classes and member</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="old" REQUIRED="no">
-			<DESCRIPTION>Generate output using JDK 1.1 emulating docle</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="verbose" REQUIRED="no">
-			<DESCRIPTION>Output messages about what Javadoc is doin</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="locale" REQUIRED="no">
-			<DESCRIPTION>Locale to be used, e.g. en_US or en_US_WI</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="encoding" REQUIRED="no">
-			<DESCRIPTION>Source file encoding nam</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="version" REQUIRED="no">
-			<DESCRIPTION>Include @version paragraph</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="use" REQUIRED="no">
-			<DESCRIPTION>Create class and package usage page</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="author" REQUIRED="no">
-			<DESCRIPTION>Include @author paragraph</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="splitindex" REQUIRED="no">
-			<DESCRIPTION>Split index into one file per lette</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="windowtitle" REQUIRED="no">
-			<DESCRIPTION>Browser window title for the documentation (text</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="doctitle" REQUIRED="no">
-			<DESCRIPTION>Include title for the package index(first) page (html-code</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="header" REQUIRED="no">
-			<DESCRIPTION>Include header text for each page (html-code</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="footer" REQUIRED="no">
-			<DESCRIPTION>Include footer text for each page (html-code</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="bottom" REQUIRED="no">
-			<DESCRIPTION>Include bottom text for each page (html-code</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="link" REQUIRED="no">
-			<DESCRIPTION>Create links to javadoc output at the given UR</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="linkoffline" REQUIRED="no">
-			<DESCRIPTION>Link to docs at &lt;url&gt; using package list at&lt;url2&gt; - separate the URLs by using a space character</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="group" REQUIRED="no">
-			<DESCRIPTION>Group specified packages together in overviewpage.  The format is as described below</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="nodeprecated" REQUIRED="no">
-			<DESCRIPTION>Do not include @deprecated informatio</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="nodeprecatedlist" REQUIRED="no">
-			<DESCRIPTION>Do not generate deprecated lis</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="notree" REQUIRED="no">
-			<DESCRIPTION>Do not generate class hierarch</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="noindex" REQUIRED="no">
-			<DESCRIPTION>Do not generate inde</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="nohelp" REQUIRED="no">
-			<DESCRIPTION>Do not generate help lin</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="nonavbar" REQUIRED="no">
-			<DESCRIPTION>Do not generate navigation ba</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="serialwarn" REQUIRED="no">
-			<DESCRIPTION>Generate warning about @serial ta</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="helpfile" REQUIRED="no">
-			<DESCRIPTION>Specifies the HTML help file to us</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="stylesheetfile" REQUIRED="no">
-			<DESCRIPTION>Specifies the CSS stylesheet to us</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="charset" REQUIRED="no">
-			<DESCRIPTION>Charset for cross-platform viewing of generateddocumentatio</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="docencoding" REQUIRED="no">
-			<DESCRIPTION>Output file encoding nam</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="doclet" REQUIRED="no">
-			<DESCRIPTION>Specifies the class file that starts the doclet used in generating the documentation</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="docletpath" REQUIRED="no">
-			<DESCRIPTION>Specifies the path to the doclet class file that is specified with the -doclet option</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="docletpathref" REQUIRED="no">
-			<DESCRIPTION>Specifies the path to the doclet class file thatis specified with the -doclet option by reference to a PATH defined elsewhere</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="additionalparam" REQUIRED="no">
-			<DESCRIPTION>Lets you add additional parameters to the javadoccommand line. Useful for doclets. Parameters containingspaces need to be quoted using &amp;quot;</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="failonerror" REQUIRED="no">
-			<DESCRIPTION>Stop the buildprocess if the command exits with areturncode other than 0</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="excludepackagenames" REQUIRED="no">
-			<DESCRIPTION>comma separated list of packages you don't wantdocs for</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="defaultexcludes" REQUIRED="no">
-			<DESCRIPTION>indicates whether default excludes should be used(yes | no); default excludes are used when omitted</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="useexternalfile" REQUIRED="no">
-			<DESCRIPTION>indicates whether the sourcefile name specifiedin srcfiles or as nested source elements should be written to atemporary file to make the command line shorter. Also applies tothe package names specified via the packagenames attribute ornested package elements.(yes | no). Default is no</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="source" REQUIRED="no">
-			<DESCRIPTION>Necessary to enable javadoc to handle assertionspresent in J2SE v 1.4 source code. Set this to &quot;1.4&quot; todocuments code that compiles using &quot;javac -source1.4&quot;.  Will be ignored if you use a customdoclet</DESCRIPTION>
-		</ATTRIBUTE>
-	</TASK>
-	<TASK NAME="loadfile">
-		<DESCRIPTION>&lt;p&gt;
-Load a text file into a single property. Unless an encoding is specified,
-the encoding of the current locale is used.
-&lt;/p&gt;
-</DESCRIPTION>
-		<ATTRIBUTE NAME="srcfile" REQUIRED="yes">
-			<DESCRIPTION>source fil</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="property" REQUIRED="yes">
-			<DESCRIPTION>property to save t</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="encoding" REQUIRED="no">
-			<DESCRIPTION>encoding to use when loading the fil</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="failonerror" REQUIRED="no, default &quot;true&quot;">
-			<DESCRIPTION>Whether to halt the build on failur</DESCRIPTION>
-		</ATTRIBUTE>
-	</TASK>
-	<TASK NAME="loadproperties">
-		<DESCRIPTION>&lt;p&gt;
-Load a file's contents as Ant properties.  This is equivalent
-to &amp;lt;property file=&amp;quot;...&amp;quot;/&amp;gt; except that it
-supports nested &amp;lt;filterchain&amp;gt; elements and it cannot be
-specified outside a target.
-&lt;/p&gt;
-</DESCRIPTION>
-		<ATTRIBUTE NAME="srcfile" REQUIRED="yes">
-			<DESCRIPTION>source fil</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="encoding" REQUIRED="no">
-			<DESCRIPTION>encoding to use when loading the fil</DESCRIPTION>
-		</ATTRIBUTE>
-	</TASK>
-	<TASK NAME="mail">
-		<DESCRIPTION>&lt;p&gt;A task to send SMTP email. This task can send mail using either plain
-text, UU encoding, or MIME format mail, depending on what is available.
-Attachments may be sent using nested
-&lt;a href=&quot;../CoreTypes/fileset.html&quot;&gt;fileset&lt;/a&gt; elements.&lt;/p&gt;
-&lt;p&gt;&lt;strong&gt;Note:&lt;/strong&gt; This task may depend on external libraries
-that are not included
-in the Ant distribution.  See &lt;a href=&quot;../install.html#librarydependencies&quot;&gt;
-Library Dependencies&lt;/a&gt; for more information.
-&lt;/p&gt;
-</DESCRIPTION>
-		<ATTRIBUTE NAME="from" REQUIRED="either a from attribute, or a &lt;from&gt;
-     element.">
-			<DESCRIPTION>Email address of sender</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="tolist" REQUIRED="at least one of these, or the
-        equivalent elements.">
-			<DESCRIPTION>Comma-separated list of recipients</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="cclist" REQUIRED="">
-			<DESCRIPTION>Comma-separated list of recipients to carbon cop</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="bcclist" REQUIRED="">
-			<DESCRIPTION>Comma-separated list of recipients to carbon cop</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="message" REQUIRED="one of these or a
-     &lt;message&gt; element.">
-			<DESCRIPTION>Message to send in the body of the email</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="messagefile" REQUIRED="">
-			<DESCRIPTION>File to send as the body of the email. Propertyvalues in the file will be expanded</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="messagemimetype" REQUIRED="no">
-			<DESCRIPTION>The content type of the message.  The default istext/plain</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="files" REQUIRED="no">
-			<DESCRIPTION>Files to send as attachments to the email.  Separate multiplefile names using a comma.  You can also use &lt;fileset&gt;elements to specify files</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="failonerror" REQUIRED="no.">
-			<DESCRIPTION>flag to indicate whether to halt the build onany error.  The default value is true</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="includefilenames" REQUIRED="no">
-			<DESCRIPTION>Include filename(s) before file contents.Valid only when the plain encoding is used.  The defaultvalue is false</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="mailhost" REQUIRED="no">
-			<DESCRIPTION>Host name of the SMTP server.  The default value islocalhost</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="mailport" REQUIRED="no">
-			<DESCRIPTION>TCP port of the SMTP server.  The default value is 25</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="encoding" REQUIRED="no">
-			<DESCRIPTION>Specifies the encoding to use for the content of the email.Values are mime, uu, plain, orauto.  The default value is auto</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="subject" REQUIRED="no">
-			<DESCRIPTION>Email subject line</DESCRIPTION>
-		</ATTRIBUTE>
-	</TASK>
-	<TASK NAME="manifest">
-		<DESCRIPTION>&lt;p&gt;Creates a manifest file.&lt;/p&gt;
-&lt;p&gt;This task can be used to write a Manifest file, optionally
-replacing or updating an existing file.&lt;/p&gt;
-&lt;p&gt;Manifests are processed according to the 
-&lt;a href=&quot;http://java.sun.com/j2se/1.3/docs/guide/jar/jar.html&quot;&gt;Jar
-file specification.&lt;/a&gt;. Specifically, a manifest element consists of
-a set of attributes and sections. These sections in turn may contain
-attributes. Note in particular that this may result in manifest lines
-greater than 72 bytes being wrapped and continued on the next
-line.&lt;/p&gt;
-</DESCRIPTION>
-		<ATTRIBUTE NAME="file" REQUIRED="yes">
-			<DESCRIPTION>the manifest-file to create/update</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="mode" REQUIRED="no">
-			<DESCRIPTION>One of &quot;update&quot; or &quot;replace&quot;, default is &quot;replace&quot;</DESCRIPTION>
-		</ATTRIBUTE>
-	</TASK>
-	<TASK NAME="mkdir">
-		<DESCRIPTION>&lt;p&gt;Creates a directory. Also non-existent parent directories are created, when
-necessary.&lt;/p&gt;
-</DESCRIPTION>
-		<ATTRIBUTE NAME="dir" REQUIRED="yes">
-			<DESCRIPTION>the directory to create</DESCRIPTION>
-		</ATTRIBUTE>
-	</TASK>
-	<TASK NAME="move">
-		<DESCRIPTION>&lt;p&gt;Moves a file to a new file or directory, or sets of files to
-a new directory.  By default, the
-destination file is overwritten if it already exists.  When &lt;var&gt;overwrite&lt;/var&gt; is
-turned off, then files are only moved if the source file is newer than
-the destination file, or when the destination file does not exist.&lt;/p&gt;
-&lt;p&gt;&lt;a href=&quot;../CoreTypes/fileset.html&quot;&gt;FileSet&lt;/a&gt;s are used to select sets of files
-to move to the &lt;var&gt;todir&lt;/var&gt; directory.&lt;/p&gt;
-</DESCRIPTION>
-		<ATTRIBUTE NAME="file" REQUIRED="one of file or
-      at least one nested fileset element">
-			<DESCRIPTION>the file to mov</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="tofile" REQUIRED="with the file attribute,
-     either tofile or todir can be used.  with nested filesets,
-     if the fileset size is greater than 1 or if the only entry in the fileset is a
-     directory or if the file attribute is already specified, only
-     todir is allowed">
-			<DESCRIPTION>the file to move t</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="todir" REQUIRED="">
-			<DESCRIPTION>the directory to move t</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="overwrite" REQUIRED="no">
-			<DESCRIPTION>overwrite existing files even if the destinationfiles are newer (default is &quot;true&quot;</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="filtering" REQUIRED="no">
-			<DESCRIPTION>indicates whether token filtering should take place duringthe move.  See the filter task for a description ofhow filters work</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="flatten" REQUIRED="no">
-			<DESCRIPTION>ignore directory structure of source directory,copy all files into a single directory, specified by the todirattribute (default is &quot;false&quot;).Note that you can achieve thesame effect by using a flatten mappe</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="includeemptydirs" REQUIRED="no">
-			<DESCRIPTION>Copy empty directories included with the nested FileSet(s).Defaults to &quot;yes&quot;</DESCRIPTION>
-		</ATTRIBUTE>
-	</TASK>
-	<TASK NAME="parallel">
-		<DESCRIPTION>&lt;p&gt;Parallel is a container task - it can contain other Ant tasks. Each nested
-task within the parallel task will be executed in its own thread. &lt;/p&gt;
-&lt;p&gt;Parallel tasks have a number of uses in an Ant buildfile including:&lt;/p&gt;
-&lt;ul&gt;
-&lt;li&gt;Taking advantage of available processing resources to reduce build time&lt;/li&gt;
-&lt;li&gt;Testing servers, where the server can be run in one thread and the test
-harness is run in another thread.&lt;/li&gt;
-&lt;/ul&gt;
-&lt;p&gt;Care must be taken when using multithreading to ensure the tasks within the
-threads do not interact. For example, two javac compile tasks which write 
-classes into the same destination directory may interact where one tries to
-read a class for dependency information while the other task is writing the 
-class file. Be sure to avoid these types of interactions within a 
-&amp;lt;parallel&amp;gt; task&lt;/p&gt;
-&lt;p&gt;The parallel task has no attributes and does not support any nested 
-elements apart from Ant tasks. Any valid Ant task may be embedded within a 
-parallel task, including other parallel tasks.&lt;/p&gt;
-&lt;p&gt;Note that while the tasks within the parallel task are being run, the main 
-thread will be blocked waiting for all the child threads to complete.&lt;/p&gt;  
-&lt;p&gt;If any of the tasks within the &amp;lt;parallel&amp;gt; task fails, the remaining 
-tasks in other threads will continue to run until all threads have completed. 
-In this situation, the parallel task will also fail.&lt;/p&gt;
-&lt;p&gt;The parallel task may be combined with the &lt;a href=&quot;sequential.html&quot;&gt;
-sequential&lt;/a&gt; task to define sequences of tasks to be executed on each thread
-within the parallel block&lt;/p&gt;
-&lt;h3&gt;Examples&lt;/h3&gt;
-&lt;pre&gt;
-&amp;lt;parallel&amp;gt;
-&amp;lt;wlrun ... &amp;gt;
-&amp;lt;sequential&amp;gt;
-&amp;lt;sleep seconds=&amp;quot;30&amp;quot;/&amp;gt;
-&amp;lt;junit ... &amp;gt;
-&amp;lt;wlstop/&amp;gt;
-&amp;lt;/sequential&amp;gt;
-&amp;lt;/parallel&amp;gt;
-&lt;/pre&gt;
-&lt;p&gt;This example represents a typical pattern for testing a server application. 
-In one thread the server is started (the wlrun task). The other thread consists 
-of a three tasks which are performed in sequence. The sleep task is used to 
-give the server time to come up. Another task which is capable of validating 
-that the server is available could be used in place of the sleep task. The 
-test harness is then run. Once the tests are complete, the server is stopped 
-(using wlstop in this example), allowing both threads to complete. The 
-parallel task will also complete at this time and the build will then 
-continue.&lt;/p&gt;
-&lt;pre&gt;
-&amp;lt;parallel&amp;gt;
-&amp;lt;javac ...&amp;gt; &amp;lt;!-- compiler servlet code --&amp;gt;
-&amp;lt;wljspc ...&amp;gt; &amp;lt;!-- precompile JSPs --&amp;gt;
-&amp;lt;/parallel&amp;gt;
-&lt;/pre&gt;
-&lt;p&gt;This example shows two independent tasks being run to achieve better 
-resource utilization during the build. In this instance, some servlets are being
-compiled in one thead and a set of JSPs is being precompiled in another. As 
-noted above, you need to be careful that the two tasks are independent, both in 
-terms of their dependencies and in terms of their potential interactions in
-Ant's external environment.&lt;/p&gt;
-&lt;hr&gt;
-&lt;p align=&quot;center&quot;&gt;Copyright &amp;copy; 2001-2002 Apache Software Foundation. All rights
-Reserved.&lt;/p&gt;
-&lt;/body&gt;
-&lt;/html&gt;
-</DESCRIPTION>	</TASK>
-	<TASK NAME="patch">
-		<DESCRIPTION>&lt;p&gt;Applies a diff file to originals. ; requires &quot;patch&quot; to be
-on the execution path.  &lt;/p&gt;
-</DESCRIPTION>
-		<ATTRIBUTE NAME="patchfile" REQUIRED="yes">
-			<DESCRIPTION>the file that includes the diff outpu</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="originalfile" REQUIRED="no, tries to guess it from the diff 
-       file">
-			<DESCRIPTION>the file to patc</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="backups" REQUIRED="no">
-			<DESCRIPTION>Keep backups of the unpatched file</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="quiet" REQUIRED="no">
-			<DESCRIPTION>Work silently unless an error occur</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="reverse" REQUIRED="no">
-			<DESCRIPTION>Assume patch was created with old and new files swapped</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="ignorewhitespace" REQUIRED="no">
-			<DESCRIPTION>Ignore whitespace differences</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="strip" REQUIRED="no">
-			<DESCRIPTION>Strip the smallest prefix containing num leading slashes from filenames</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="dir" REQUIRED="no, default is the project's basedir.">
-			<DESCRIPTION>The directory in which to run the patch command</DESCRIPTION>
-		</ATTRIBUTE>
-	</TASK>
-	<TASK NAME="pathconvert">
-		<DESCRIPTION>&lt;p&gt;Converts a nested &lt;code&gt;&amp;lt;path&amp;gt;&lt;/code&gt; or reference to a Path,
-FileSet, DirSet, or FileList into a path
-form for a particular platform, and stores the result in a given property.
-It can also be used when you need
-to convert a Path, FileSet, or DirSet into a list, separated by a given
-character, such as a comma or space, or, conversely, to convert a list
-of files in a FileList into a path.
-&lt;/p&gt;
-&lt;p&gt;Nested &lt;code&gt;&amp;lt;map&amp;gt;&lt;/code&gt; elements can be specified to map Windows
-drive letters to Unix paths, and vice-versa.&lt;/p&gt;
-</DESCRIPTION>
-		<ATTRIBUTE NAME="targetos" REQUIRED="yes, unless pathsep and/or
-        dirsep are specified.
-     ">
-			<DESCRIPTION>The target architecture.  Must be one of 'unix', 'windows', 'netware' or 'os/2'.This is a shorthand mechanism for specifying bothpathsep and dirsepaccording to the specified target architecture.</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="dirsep" REQUIRED="no, defaults to current jvm file.separator">
-			<DESCRIPTION>The character(s) to use as the directory separator in thegenerated paths.</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="pathsep" REQUIRED="no, defaults to current jvm file.pathseparator">
-			<DESCRIPTION>The character(s) to use as the path-element separator in thegenerated paths.</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="property" REQUIRED="yes">
-			<DESCRIPTION>The name of the property in which to place the converted path</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="refid" REQUIRED="no; if omitted, a nested
-         &lt;path&gt; element must be supplied.">
-			<DESCRIPTION>What to convert, given as areference to a&lt;path&gt;, &lt;fileset&gt;,&lt;dirset&gt;, or &lt;fileset&gt;defined elsewher</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="setonempty" REQUIRED="no; default is &quot;true&quot;.
-   ">
-			<DESCRIPTION>Should the property be set, even if the resultis the empty string?</DESCRIPTION>
-		</ATTRIBUTE>
-	</TASK>
-	<TASK NAME="property">
-		<DESCRIPTION>&lt;p&gt;Sets a property (by name and value), or set of properties (from file or
-resource) in the project.  Properties are case sensitive.&lt;/p&gt;
-Properties are immutable: whoever sets a property first freezes it for the
-rest of the build; they are most definately not variable. 
-&lt;p&gt;There are five ways to set properties:&lt;/p&gt;
-&lt;ul&gt;
-&lt;li&gt;By supplying both the &lt;i&gt;name&lt;/i&gt; and &lt;i&gt;value&lt;/i&gt; attribute.&lt;/li&gt;
-&lt;li&gt;By supplying both the &lt;i&gt;name&lt;/i&gt; and &lt;i&gt;refid&lt;/i&gt; attribute.&lt;/li&gt;
-&lt;li&gt;By setting the &lt;i&gt;file&lt;/i&gt; attribute with the filename of the property
-file to load. This property file has the format as defined by the file used
-in the class java.util.Properties.&lt;/li&gt;
-&lt;li&gt;By setting the &lt;i&gt;resource&lt;/i&gt; attribute with the resource name of the
-property file to load. This property file has the format as defined by the
-file used in the class java.util.Properties.&lt;/li&gt;
-&lt;li&gt;By setting the &lt;i&gt;environment&lt;/i&gt; attribute with a prefix to use.
-Properties will be defined for every environment variable by
-prefixing the supplied name and a period to the name of the variable.&lt;/li&gt;
-&lt;/ul&gt;
-&lt;p&gt;Although combinations of these ways are possible, only one should be used
-at a time. Problems might occur with the order in which properties are set, for
-instance.&lt;/p&gt;
-&lt;p&gt;The value part of the properties being set, might contain references to other
-properties. These references are resolved at the time these properties are set.
-This also holds for properties loaded from a property file.&lt;/p&gt;
-&lt;p&gt;A list of predefined properties can be found &lt;a
-href=&quot;../using.html#built-in-props&quot;&gt;here&lt;/a&gt;.&lt;/p&gt;
-</DESCRIPTION>
-		<ATTRIBUTE NAME="name" REQUIRED="no">
-			<DESCRIPTION>the name of the property to set</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="value" REQUIRED="one of these, when using the
-        name attribute">
-			<DESCRIPTION>the value of the property</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="location" REQUIRED="">
-			<DESCRIPTION>Sets the property to the absolute filename of thegiven file. If the value of this attribute is an absolute path, itis left unchanged (with / and \ characters converted to thecurrent platforms conventions). Otherwise it is taken as a pathrelative to the project's basedir and expanded</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="refid" REQUIRED="">
-			<DESCRIPTION>Reference to an objectdefined elsewhere. Only yields reasonable results for referencesto PATH like structures or properties</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="resource" REQUIRED="one of these, when
-       not using the name attribute">
-			<DESCRIPTION>the resource name of the property file</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="file" REQUIRED="">
-			<DESCRIPTION>the filename of the property file </DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="environment" REQUIRED="">
-			<DESCRIPTION>the prefix to use when retrieving environment variables. Thusif you specify environment=&quot;myenv&quot; you will be able to access OS-specific environment variables via property names &quot;myenv.PATH&quot; or &quot;myenv.TERM&quot;. Note that if you supply a property name with a final &quot;.&quot; it will not be doubled. ie environment=&quot;myenv.&quot; will still allow access of environment variables through &quot;myenv.PATH&quot; and &quot;myenv.TERM&quot;. This functionality is currently only implemented on select platforms. Feel free to send patches to increase the number of platformsthis functionality is supported on ;)Note also that properties are case sensitive, even if theenvironment variables on your operating system are not, e.g. itwill be ${env.Path} not ${env.PATH} on Windows 2000</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="classpath" REQUIRED="no">
-			<DESCRIPTION>the classpath to use when looking up a resource</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="classpathref" REQUIRED="no">
-			<DESCRIPTION>the classpath to use when looking up a resource,given as reference to a &lt;path&gt; definedelsewhere.</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="prefix" REQUIRED="no">
-			<DESCRIPTION>Prefix to apply to properties loaded using fileor resource. A &quot;.&quot; is appended to the prefix if not specified</DESCRIPTION>
-		</ATTRIBUTE>
-	</TASK>
-	<TASK NAME="recorder">
-		<DESCRIPTION>&lt;p&gt;A recorder is a listener to the current build process that records the
-output to a file.&lt;/p&gt;
-&lt;p&gt;Several recorders can exist at the same time.  Each recorder is
-associated with a file.  The filename is used as a unique identifier for
-the recorders.  The first call to the recorder task with an unused filename
-will create a recorder (using the parameters provided) and add it to the
-listeners of the build.  All subsequent calls to the recorder task using
-this filename will modify that recorders state (recording or not) or other
-properties (like logging level).&lt;/p&gt;
-&lt;p&gt;Some technical issues: the file's print stream is flushed for &amp;quot;finished&amp;quot;
-events (buildFinished, targetFinished and taskFinished), and is closed on
-a buildFinished event.&lt;/p&gt;
-</DESCRIPTION>
-		<ATTRIBUTE NAME="name" REQUIRED="yes">
-			<DESCRIPTION>The name of the file this logger is associated with</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="action" REQUIRED="no">
-			<DESCRIPTION>This tells the logger what to do: should it startrecording or stop?  The first time that the recorder task is called forthis logfile, and if this attribute is not provided, then the defaultfor this attribute is &quot;start&quot;.  If this attribute is not provided onsubsequent calls, then the state remains as previous.[Values = {start|stop}, Default = no state change</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="append" REQUIRED="no">
-			<DESCRIPTION>Should the recorder append to a file, or create a newone? This is only applicable the first time this task is called forthis file.  [Values = {yes|no}, Default=yes</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="emacsmode" REQUIRED="no, default is false">
-			<DESCRIPTION>Removes [task] banners like Ant's-emacs command line switch if set totrue</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="loglevel" REQUIRED="no">
-			<DESCRIPTION>At what logging level should this recorder instancerecord to?  This is not a once only parameter (like appendis) -- you can increase or decrease the logging level as the build processcontinues.  [Values= {error|warn|info|verbose|debug}, Default = no change]</DESCRIPTION>
-		</ATTRIBUTE>
-	</TASK>
-	<TASK NAME="rename">
-		<DESCRIPTION>&lt;p&gt;Renames a given file.&lt;/p&gt;
-</DESCRIPTION>
-		<ATTRIBUTE NAME="src" REQUIRED="yes">
-			<DESCRIPTION>file to rename</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="dest" REQUIRED="yes">
-			<DESCRIPTION>new name of the file</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="replace" REQUIRED="no">
-			<DESCRIPTION>Enable replacing of existing file (default: on)</DESCRIPTION>
-		</ATTRIBUTE>
-	</TASK>
-	<TASK NAME="replace">
-		<DESCRIPTION>&lt;p&gt;Replace is a directory based task for replacing the occurrence of a given string with another string 
-in selected file.&lt;/p&gt;
-&lt;p&gt;If you want to replace a text that crosses line boundaries, you
-must use a nested &lt;code&gt;&amp;lt;replacetoken&amp;gt;&lt;/code&gt; element.&lt;/p&gt;
-</DESCRIPTION>
-		<ATTRIBUTE NAME="file" REQUIRED="exactly one of the two.">
-			<DESCRIPTION>file for which the token should be replaced</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="dir" REQUIRED="">
-			<DESCRIPTION>The base directory to use when replacing a token in multiple files</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="encoding" REQUIRED="no - defaults to default jvm encoding">
-			<DESCRIPTION>The encoding of the files upon which replace operates</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="token" REQUIRED="yes, unless a nested
-     replacetoken element or the replacefilterfile
-     attribute is used.">
-			<DESCRIPTION>the token which must be replaced</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="value" REQUIRED="no">
-			<DESCRIPTION>the new value for the token. When omitted, an empty string(&quot;&quot;) is used</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="summary" REQUIRED="no, by default no summary is produced">
-			<DESCRIPTION>Indicates whether a summary of the replace operation should be produced, detailing how many token occurrences and files were processed</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="propertyfile" REQUIRED="yes only if property attribute of &lt;replacefilter&gt; is used.">
-			<DESCRIPTION>valid property file from which properties specified using nested &lt;replacefilter&gt; elements are drawn</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="replacefilterfile" REQUIRED="no.">
-			<DESCRIPTION>valid property file.  Each property will betreated as a replacefilter where token is the name ofthe property and value is the properties value.</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="includes" REQUIRED="no">
-			<DESCRIPTION>comma- or space-separated list of patterns of files that must beincluded. All files are included when omitted</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="includesfile" REQUIRED="no">
-			<DESCRIPTION>the name of a file. Each line of this file istaken to be an include patter</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="excludes" REQUIRED="no">
-			<DESCRIPTION>comma- or space-separated list of patterns of files that must beexcluded. No files (except default excludes) are excluded when omitted</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="excludesfile" REQUIRED="no">
-			<DESCRIPTION>the name of a file. Each line of this file istaken to be an exclude patter</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="defaultexcludes" REQUIRED="no">
-			<DESCRIPTION>indicates whether default excludes should be used or not(&quot;yes&quot;/&quot;no&quot;). Default excludes are used when omitted</DESCRIPTION>
-		</ATTRIBUTE>
-	</TASK>
-	<TASK NAME="rmic">
-		<DESCRIPTION>&lt;p&gt;Runs the rmic compiler for a certain class.&lt;/p&gt;
-&lt;p&gt;Rmic can be run on a single class (as specified with the classname
-attribute) or a number of classes at once (all classes below base that
-are neither _Stub nor _Skel classes).  If you want to rmic a single
-class and this class is a class nested into another class, you have to
-specify the classname in the form &lt;code&gt;Outer$$Inner&lt;/code&gt; instead of
-&lt;code&gt;Outer.Inner&lt;/code&gt;.&lt;/p&gt;
-&lt;p&gt;It is possible to refine the set of files that are being rmiced. This can be
-done with the &lt;i&gt;includes&lt;/i&gt;, &lt;i&gt;includesfile&lt;/i&gt;, &lt;i&gt;excludes&lt;/i&gt;, &lt;i&gt;excludesfile&lt;/i&gt; and &lt;i&gt;defaultexcludes&lt;/i&gt;
-attributes. With the &lt;i&gt;includes&lt;/i&gt; or &lt;i&gt;includesfile&lt;/i&gt; attribute you specify the files you want to
-have included by using patterns. The &lt;i&gt;exclude&lt;/i&gt; or &lt;i&gt;excludesfile&lt;/i&gt; attribute is used to specify
-the files you want to have excluded. This is also done with patterns. And
-finally with the &lt;i&gt;defaultexcludes&lt;/i&gt; attribute, you can specify whether you
-want to use default exclusions or not. See the section on &lt;a
-href=&quot;../dirtasks.html#directorybasedtasks&quot;&gt;directory based tasks&lt;/a&gt;, on how the
-inclusion/exclusion of files works, and how to write patterns.&lt;/p&gt;
-&lt;p&gt;This task forms an implicit &lt;a href=&quot;../CoreTypes/fileset.html&quot;&gt;FileSet&lt;/a&gt; and
-supports all attributes of &lt;code&gt;&amp;lt;fileset&amp;gt;&lt;/code&gt;
-(&lt;code&gt;dir&lt;/code&gt; becomes &lt;code&gt;base&lt;/code&gt;) as well as the nested
-&lt;code&gt;&amp;lt;include&amp;gt;&lt;/code&gt;, &lt;code&gt;&amp;lt;exclude&amp;gt;&lt;/code&gt; and
-&lt;code&gt;&amp;lt;patternset&amp;gt;&lt;/code&gt; elements.&lt;/p&gt;
-&lt;p&gt;It is possible to use different compilers. This can be selected
-with the &amp;quot;build.rmic&amp;quot; property or the &lt;code&gt;compiler&lt;/code&gt;
-attribute. &lt;a name=&quot;compilervalues&quot;&gt;There are three choices&lt;/a&gt;:&lt;/p&gt;
-&lt;ul&gt;
-&lt;li&gt;sun (the standard compiler of the JDK)&lt;/li&gt;
-&lt;li&gt;kaffe (the standard compiler of &lt;a href=&quot;http://www.kaffe.org&quot; target=&quot;_top&quot;&gt;Kaffe&lt;/a&gt;)&lt;/li&gt;
-&lt;li&gt;weblogic&lt;/li&gt;
-&lt;/ul&gt;
-&lt;p&gt;The &lt;a href=&quot;http://dione.zcu.cz/~toman40/miniRMI/&quot;&gt;miniRMI&lt;/a&gt;
-project contains a compiler implementation for this task as well,
-please consult miniRMI's documentation to learn how to use it.&lt;/p&gt;
-</DESCRIPTION>
-		<ATTRIBUTE NAME="base" REQUIRED="yes">
-			<DESCRIPTION>the location to store the compiled files</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="classname" REQUIRED="no">
-			<DESCRIPTION>the class for which to run rmic</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="filtering" REQUIRED="no">
-			<DESCRIPTION>indicates whether token filtering should take plac</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="sourcebase" REQUIRED="no">
-			<DESCRIPTION>Pass the &quot;-keepgenerated&quot; flag to rmic andmove the generated source file to the base directory</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="stubversion" REQUIRED="no">
-			<DESCRIPTION>Specify the JDK version for the generated stub code.Specify &quot;1.1&quot; to pass the &quot;-v1.1&quot; option to rmic</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="classpath" REQUIRED="no">
-			<DESCRIPTION>The classpath to use during compilatio</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="classpathref" REQUIRED="no">
-			<DESCRIPTION>The classpath to use during compilation, given as reference to a PATH defined elsewher</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="includes" REQUIRED="no">
-			<DESCRIPTION>comma- or space-separated list of patterns of files that must beincluded. All files are included when omitted</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="includesfile" REQUIRED="no">
-			<DESCRIPTION>the name of a file. Each line of this file istaken to be an include patter</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="excludes" REQUIRED="no">
-			<DESCRIPTION>comma- or space-separated list of patterns of files that must beexcluded. No files (except default excludes) are excluded when omitted</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="excludesfile" REQUIRED="no">
-			<DESCRIPTION>the name of a file. Each line of this file istaken to be an exclude patter</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="defaultexcludes" REQUIRED="no">
-			<DESCRIPTION>indicates whether default excludes should be used or not(&quot;yes&quot;/&quot;no&quot;). Default excludes are used when omitted</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="verify" REQUIRED="no">
-			<DESCRIPTION>check that classes implement Remote before handing them to rmic (default is false</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="iiop" REQUIRED="no">
-			<DESCRIPTION>indicates that portable (RMI/IIOP) stubs should be generate</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="iiopopts" REQUIRED="no">
-			<DESCRIPTION>additional arguments for IIOP class generatio</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="idl" REQUIRED="no">
-			<DESCRIPTION>indicates that IDL output files should be generate</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="idlopts" REQUIRED="no">
-			<DESCRIPTION>additional arguments for IDL file generatio</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="debug" REQUIRED="no">
-			<DESCRIPTION>generate debug info (passes -g to rmic). Defaults to false</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="includeantruntime" REQUIRED="no">
-			<DESCRIPTION>whether to include the Ant run-time libraries;defaults to yes</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="includejavaruntime" REQUIRED="no">
-			<DESCRIPTION>whether to include the default run-timelibraries from the executing VM; defaults to no</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="extdirs" REQUIRED="no">
-			<DESCRIPTION>location of installed extensions</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="compiler" REQUIRED="no">
-			<DESCRIPTION>The compiler implementation to use.If this attribute is not set, the value of thebuild.rmic property, if set, will be used.Otherwise, the default compiler for the current VM will be used.(See the above list of validcompilers.</DESCRIPTION>
-		</ATTRIBUTE>
-	</TASK>
-	<TASK NAME="sequential">
-		<DESCRIPTION>&lt;p&gt;Sequential is a container task - it can contain other Ant tasks. The nested 
-tasks are simply executed in sequence. Sequential's primary use is to support 
-the sequential execution of a subset of tasks within the 
-&lt;a href=&quot;parallel.html&quot;&gt;parallel&lt;/a&gt; task&lt;/p&gt;
-&lt;p&gt;The sequential task has no attributes and does not support any nested 
-elements apart from Ant tasks. Any valid Ant task may be embedded within the 
-sequential task.&lt;/p&gt;
-&lt;h3&gt;Example&lt;/h3&gt;
-&lt;pre&gt;
-&amp;lt;parallel&amp;gt;
-&amp;lt;wlrun ... &amp;gt;
-&amp;lt;sequential&amp;gt;
-&amp;lt;sleep seconds=&amp;quot;30&amp;quot;/&amp;gt;
-&amp;lt;junit ... &amp;gt;
-&amp;lt;wlstop/&amp;gt;
-&amp;lt;/sequential&amp;gt;
-&amp;lt;/parallel&amp;gt;
-&lt;/pre&gt;
-&lt;p&gt;This example shows how the sequential task is used to execute three tasks in
-sequence, while another task is being executed in a separate thread. &lt;/p&gt;
-&lt;hr&gt;
-&lt;p align=&quot;center&quot;&gt;Copyright &amp;copy; 2001-2002 Apache Software Foundation. All rights
-Reserved.&lt;/p&gt;
-&lt;/body&gt;
-&lt;/html&gt;
-</DESCRIPTION>	</TASK>
-	<TASK NAME="signjar">
-		<DESCRIPTION>&lt;p&gt;Signs jar or zip files with the javasign command line tool. The
-tool detailed dependency checking: files are only signed if they
-are not signed. The &lt;tt&gt;signjar&lt;/tt&gt; attribute can point to the file to
-generate; if this file exists then
-its modification date is used as a cue as to whether to resign any JAR file.
-&lt;br&gt;  
-&lt;strong&gt;Note:&lt;/strong&gt; Requires Java 1.2 or later. &lt;/p&gt;
-</DESCRIPTION>
-		<ATTRIBUTE NAME="jar" REQUIRED="yes.">
-			<DESCRIPTION>the jar file to sig</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="alias" REQUIRED="yes.">
-			<DESCRIPTION>the alias to sign unde</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="storepass" REQUIRED="yes.">
-			<DESCRIPTION>password for keystore integrity</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="keystore" REQUIRED="no">
-			<DESCRIPTION>keystore locatio</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="storetype" REQUIRED="no">
-			<DESCRIPTION>keystore typ</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="keypass" REQUIRED="no">
-			<DESCRIPTION>password for private key (if different</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="sigfile" REQUIRED="no">
-			<DESCRIPTION>name of .SF/.DSA fil</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="signedjar" REQUIRED="no">
-			<DESCRIPTION>name of signed JAR fil</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="verbose" REQUIRED="no; default false">
-			<DESCRIPTION>(true | false) verbose output when signin</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="internalsf" REQUIRED="no; default false">
-			<DESCRIPTION>(true | false) include the .SF file inside the signaturebloc</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="sectionsonly" REQUIRED="no; default false">
-			<DESCRIPTION>(true | false) don't compute hash of entire manifes</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="lazy" REQUIRED="no; default false">
-			<DESCRIPTION>flag to control whether the presence of a signaturefile means a JAR is signe</DESCRIPTION>
-		</ATTRIBUTE>
-	</TASK>
-	<TASK NAME="sleep">
-		<DESCRIPTION>&lt;p&gt; A task for sleeping a short period of time, useful when a build or deployment 
-process requires an interval between tasks.&lt;/p&gt;
-</DESCRIPTION>
-		<ATTRIBUTE NAME="hours" REQUIRED="no">
-			<DESCRIPTION>hours to to add to the sleep tim</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="minutes" REQUIRED="no">
-			<DESCRIPTION>minutes to add to the sleep tim</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="seconds" REQUIRED="no">
-			<DESCRIPTION>seconds to add to the sleep tim</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="milliseconds" REQUIRED="no">
-			<DESCRIPTION>milliseconds to add to the sleep tim</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="failonerror" REQUIRED="no">
-			<DESCRIPTION>flag controlling whether to break the build on an error. </DESCRIPTION>
-		</ATTRIBUTE>
-	</TASK>
-	<TASK NAME="sql">
-		<DESCRIPTION>&lt;p&gt;Executes a series of SQL statements via JDBC to a database. Statements can 
-either be read in from a text file using the &lt;i&gt;src&lt;/i&gt; attribute or from 
-between the enclosing SQL tags.&lt;/p&gt;
-&lt;p&gt;Multiple statements can be provided, separated by semicolons (or the 
-defined &lt;i&gt;delimiter&lt;/i&gt;). Individual lines within the statements can be 
-commented using either --, // or REM at the start of the line.&lt;/p&gt;
-&lt;p&gt;The &lt;i&gt;autocommit&lt;/i&gt; attribute specifies whether auto-commit should be 
-turned on or off whilst executing the statements. If auto-commit is turned 
-on each statement will be executed and committed. If it is turned off the 
-statements will all be executed as one transaction.&lt;/p&gt;
-&lt;p&gt;The &lt;i&gt;onerror&lt;/i&gt; attribute specifies how to proceed when an error occurs 
-during the execution of one of the statements. 
-The possible values are: &lt;b&gt;continue&lt;/b&gt; execution, only show the error;
-&lt;b&gt;stop&lt;/b&gt; execution and commit transaction;
-and &lt;b&gt;abort&lt;/b&gt; execution and transaction and fail task.&lt;/p&gt;
-</DESCRIPTION>
-		<ATTRIBUTE NAME="driver" REQUIRED="yes">
-			<DESCRIPTION>Class name of the jdbc drive</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="url" REQUIRED="yes">
-			<DESCRIPTION>Database connection ur</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="userid" REQUIRED="yes">
-			<DESCRIPTION>Database user nam</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="password" REQUIRED="yes">
-			<DESCRIPTION>Database passwor</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="src" REQUIRED="yes, unless statements enclosed within tags">
-			<DESCRIPTION>File containing SQL statement</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="encoding" REQUIRED="no - defaults to default jvm encoding">
-			<DESCRIPTION>The encoding of the files containing SQL statement</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="delimiter" REQUIRED="no, default &quot;;&quot;">
-			<DESCRIPTION>String that separates SQL statement</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="autocommit" REQUIRED="no, default &quot;false&quot;">
-			<DESCRIPTION>Auto commit flag for database connection (default false</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="print" REQUIRED="no, default &quot;false&quot;">
-			<DESCRIPTION>Print result sets from the statements (default false</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="showheaders" REQUIRED="no, default &quot;true&quot;">
-			<DESCRIPTION>Print headers for result sets from the statements (default true</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="output" REQUIRED="no (print to system.out by default)">
-			<DESCRIPTION>Output file for result sets (defaults to System.out</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="append" REQUIRED="no">
-			<DESCRIPTION>whether output should be appended to or overwritean existing file.  Defaults to false</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="classpath" REQUIRED="no (use system classpath)">
-			<DESCRIPTION>Classpath used to load drive</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="classpathref" REQUIRED="no (use system classpath)">
-			<DESCRIPTION>The classpath to use, given as a reference to a path defined elsewhere</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="onerror" REQUIRED="no, default &quot;abort&quot;">
-			<DESCRIPTION>Action to perform when statement fails: continue, stop, abor</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="rdbms" REQUIRED="no (no restriction)">
-			<DESCRIPTION>Execute task only if this rdbm</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="version" REQUIRED="no (no restriction)">
-			<DESCRIPTION>Execute task only if rdbms version matc</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="caching" REQUIRED="no (default=true)">
-			<DESCRIPTION>Should the task cache loaders and the driver</DESCRIPTION>
-		</ATTRIBUTE>
-	</TASK>
-	<TASK NAME="tar">
-		<DESCRIPTION>&lt;p&gt;Creates a tar archive.&lt;/p&gt;
-&lt;p&gt;The &lt;i&gt;basedir&lt;/i&gt; attribute is the reference directory from where to tar.&lt;/p&gt;
-&lt;p&gt;This task is a &lt;a href=&quot;../dirtasks.html#directorybasedtasks&quot;&gt;directory based task&lt;/a&gt;
-and, as such, forms an implicit &lt;a href=&quot;../CoreTypes/fileset.html&quot;&gt;Fileset&lt;/a&gt;. This
-defines which files, relative to the &lt;i&gt;basedir&lt;/i&gt;, will be included in the
-archive. The tar task supports all the attributes of Fileset to refine the
-set of files to be included in the implicit fileset.&lt;/p&gt;
-&lt;p&gt;In addition to the implicit fileset, the tar task supports nested filesets. These
-filesets are extended to allow control over the access mode, username and groupname
-to be applied to the tar entries. This is useful, for example, when preparing archives for
-Unix systems where some files need to have execute permission.&lt;/p&gt;
-&lt;p&gt;Early versions of tar did not support path lengths greater than 100
-characters. Modern versions of tar do so, but in incompatible ways.
-The behaviour of the tar task when it encounters such paths is
-controlled by the &lt;i&gt;longfile&lt;/i&gt; attribute.
-If the longfile attribute is set to &lt;code&gt;fail&lt;/code&gt;, any long paths will
-cause the tar task to fail.  If the longfile attribute is set to
-&lt;code&gt;truncate&lt;/code&gt;, any long paths will be truncated to the 100 character
-maximum length prior to adding to the archive. If the value of the longfile
-attribute is set to &lt;code&gt;omit&lt;/code&gt; then files containing long paths will be
-omitted from the archive.  Either option ensures that the archive can be
-untarred by any compliant version of tar. If the loss of path or file
-information is not acceptable, and it rarely is, longfile may be set to the
-value &lt;code&gt;gnu&lt;/code&gt;. The tar task will then produce a GNU tar file which
-can have arbitrary length paths. Note however, that the resulting archive will
-only be able to be untarred with GNU tar.  The default for the longfile
-attribute is &lt;code&gt;warn&lt;/code&gt; which behaves just like the gnu option except
-that it produces a warning for each file path encountered that does not match
-the limit.&lt;/p&gt;
-&lt;p&gt;This task can perform compression by setting the compression attribute to &quot;gzip&quot;
-or &quot;bzip2&quot;.&lt;/p&gt;
-</DESCRIPTION>
-		<ATTRIBUTE NAME="destfile" REQUIRED="yes">
-			<DESCRIPTION>the tar-file to create</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="basedir" REQUIRED="no">
-			<DESCRIPTION>the directory from which to tar the files</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="longfile" REQUIRED="no">
-			<DESCRIPTION>Determines how long files (&gt;100 chars) are to behandled.  Allowable values are &quot;truncate&quot;, &quot;fail&quot;,&quot;warn&quot;, &quot;omit&quot; and &quot;gnu&quot;.  Default is&quot;warn&quot;</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="includes" REQUIRED="no">
-			<DESCRIPTION>comma- or space-separated list of patterns of files that must beincluded. All files are included when omitted</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="includesfile" REQUIRED="no">
-			<DESCRIPTION>the name of a file. Each line of this file istaken to be an include patter</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="excludes" REQUIRED="no">
-			<DESCRIPTION>comma- or space-separated list of patterns of files that must beexcluded. No files (except default excludes) are excluded when omitted</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="excludesfile" REQUIRED="no">
-			<DESCRIPTION>the name of a file. Each line of this file istaken to be an exclude patter</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="defaultexcludes" REQUIRED="no">
-			<DESCRIPTION>indicates whether default excludes should be used or not(&quot;yes&quot;/&quot;no&quot;). Default excludes are used when omitted</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="compression" REQUIRED="no">
-			<DESCRIPTION>compression method.  Allowable values are &quot;none&quot;, &quot;gzip&quot; and &quot;bzip2&quot;.  Default is&quot;none&quot;</DESCRIPTION>
-		</ATTRIBUTE>
-	</TASK>
-	<TASK NAME="taskdef">
-		<DESCRIPTION>&lt;p&gt;Adds a task definition to the current project, such that this new task can be
-used in the current project. Two attributes are needed, the name that identifies
-this task uniquely, and the full name of the class (including the packages) that
-implements this task.&lt;/p&gt;
-&lt;p&gt;You can also define a group of tasks at once using the file or
-resource attributes.  These attributes point to files in the format of
-Java property files.  Each line defines a single task in the
-format:&lt;/p&gt;
-&lt;pre&gt;
-taskname=fully.qualified.java.classname
-&lt;/pre&gt;
-&lt;p&gt;Taskdef should be used to add your own tasks to the system. See also &amp;quot;&lt;a
-href=&quot;../develop.html#writingowntask&quot;&gt;Writing your own task&lt;/a&gt;&amp;quot;.&lt;/p&gt;
-</DESCRIPTION>
-		<ATTRIBUTE NAME="name" REQUIRED="yes, unless file or resource have
-     been specified.">
-			<DESCRIPTION>the name of the tas</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="classname" REQUIRED="yes, unless file or resource have
-     been specified.">
-			<DESCRIPTION>the full class name implementing the tas</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="file" REQUIRED="no">
-			<DESCRIPTION>Name of the property file to loadtaskname/classname pairs from</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="resource" REQUIRED="no">
-			<DESCRIPTION>Name of the property resource to loadtaskname/classname pairs from</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="classpath" REQUIRED="no">
-			<DESCRIPTION>the classpath touse when looking up classname orresource</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="classpathref" REQUIRED="no">
-			<DESCRIPTION>Reference to a classpath touse when looking up classname orresource</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="loaderref" REQUIRED="no">
-			<DESCRIPTION>the name of the loader that isused to load the class, constructed from the specified classpath. Use this toallow multiple tasks/types to be loaded with the same loader, so they can calleach other. ( introduced in ant1.5 </DESCRIPTION>
-		</ATTRIBUTE>
-	</TASK>
-	<TASK NAME="touch">
-		<DESCRIPTION>&lt;p&gt;Changes the modification time of a file and possibly creates it at
-the same time. In addition to working with a single file, this Task
-can also work a &lt;a href=&quot;../CoreTypes/fileset.html&quot;&gt;Fileset&lt;/a&gt; (which
-also includes directories).&lt;/p&gt;
-&lt;p&gt;For JDK 1.1 only the creation of new files with a modification time
-of now works, all other cases will emit a warning.&lt;/p&gt;
-</DESCRIPTION>
-		<ATTRIBUTE NAME="file" REQUIRED="unless a nested fileset element
-        has been specified.">
-			<DESCRIPTION>the name of the fil</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="millis" REQUIRED="no">
-			<DESCRIPTION>specifies the new modification time of the filein milliseconds since midnight Jan 1 197</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="datetime" REQUIRED="no">
-			<DESCRIPTION>specifies the new modification time of the filein the format MM/DD/YYYY HH:MM AM_or_PM</DESCRIPTION>
-		</ATTRIBUTE>
-	</TASK>
-	<TASK NAME="tstamp">
-		<DESCRIPTION>&lt;p&gt;Sets the &lt;code&gt;DSTAMP&lt;/code&gt;, &lt;code&gt;TSTAMP&lt;/code&gt;, and &lt;code&gt;TODAY&lt;/code&gt;
-properties in the current project. By default,
-the &lt;code&gt;DSTAMP&lt;/code&gt; property is in the
-format &amp;quot;yyyyMMdd&amp;quot;, &lt;code&gt;TSTAMP&lt;/code&gt; is in the
-format &amp;quot;hhmm&amp;quot;, and &lt;code&gt;TODAY&lt;/code&gt; is in the
-format &amp;quot;MMMM dd yyyy&amp;quot;. Use the nested &amp;lt;format&amp;gt; element
-to specify a different format.&lt;/p&gt;
-&lt;p&gt;These properties can be used in the build-file, for instance, to create
-time-stamped filenames, or used to replace placeholder tags inside documents
-to indicate, for example, the release date. The best place for this task is
-probably in an initialization target.&lt;/p&gt;
-</DESCRIPTION>
-		<ATTRIBUTE NAME="prefix" REQUIRED="no">
-			<DESCRIPTION>Prefix used for all properties set. The default is no prefix</DESCRIPTION>
-		</ATTRIBUTE>
-	</TASK>
-	<TASK NAME="typedef">
-		<DESCRIPTION>&lt;p&gt;Adds a data type definition to the current project, such that this
-new type can be used in the current project. Two attributes are
-needed, the name that identifies this data type uniquely, and the full
-name of the class (including the packages) that implements this
-type.&lt;/p&gt;
-&lt;p&gt;You can also define a group of data types at once using the file or
-resource attributes.  These attributes point to files in the format of
-Java property files.  Each line defines a single data type in the
-format:&lt;/p&gt;
-&lt;pre&gt;
-typename=fully.qualified.java.classname
-&lt;/pre&gt;
-&lt;p&gt;Typedef should be used to add your own types to the system. Data
-types are things like &lt;a href=&quot;../using.html#path&quot;&gt;paths&lt;/a&gt; or &lt;a
-href=&quot;../CoreTypes/fileset.html&quot;&gt;filesets&lt;/a&gt; that can be defined at
-the project level and referenced via their ID attribute.&lt;/p&gt;
-&lt;p&gt;Custom data types usually need custom tasks to put them to good use.&lt;/p&gt;
-</DESCRIPTION>
-		<ATTRIBUTE NAME="name" REQUIRED="yes, unless file or resource have
-     been specified.">
-			<DESCRIPTION>the name of the data typ</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="classname" REQUIRED="yes, unless file or resource have
-     been specified.">
-			<DESCRIPTION>the full class name implementing the data typ</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="file" REQUIRED="no">
-			<DESCRIPTION>Name of the property file to loadtypename/classname pairs from</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="resource" REQUIRED="no">
-			<DESCRIPTION>Name of the property resource to loadtypename/classname pairs from</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="classpath" REQUIRED="no">
-			<DESCRIPTION>the classpath touse when looking up classname</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="loaderref" REQUIRED="no">
-			<DESCRIPTION>the name of the loader that isused to load the class, constructed from the specified classpath. Use this toallow multiple tasks/types to be loaded with the same loader, so they can calleach other. ( introduced in ant1.5 </DESCRIPTION>
-		</ATTRIBUTE>
-	</TASK>
-	<TASK NAME="unzip">
-		<DESCRIPTION>&lt;p&gt;Unzips a zip-, war-, tar- or jarfile.&lt;/p&gt;
-&lt;p&gt;For JDK 1.1 &amp;quot;last modified time&amp;quot; field is set to current time instead of being
-carried from the archive file.&lt;/p&gt;
-&lt;p&gt;&lt;a href=&quot;../CoreTypes/patternset.html&quot;&gt;PatternSet&lt;/a&gt;s are used to select files to extract
-&lt;I&gt;from&lt;/I&gt; the archive.  If no patternset is used, all files are extracted.
-&lt;/p&gt;
-&lt;p&gt;&lt;a href=&quot;../CoreTypes/fileset.html&quot;&gt;FileSet&lt;/a&gt;s may be used used to select archived files
-to perform unarchival upon.
-&lt;/p&gt;
-&lt;p&gt;File permissions will not be restored on extracted files.&lt;/p&gt;
-&lt;p&gt;The untar task recognizes the long pathname entries used by GNU tar.&lt;p&gt;
-</DESCRIPTION>
-		<ATTRIBUTE NAME="src" REQUIRED="yes, if filesets are not used.">
-			<DESCRIPTION>archive file to expand</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="dest" REQUIRED="yes">
-			<DESCRIPTION>directory where to store the expanded files</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="overwrite" REQUIRED="no">
-			<DESCRIPTION>Overwrite files, even if they are newer than thecorresponding entries in the archive (true or false, default istrue)</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="compression" REQUIRED="no">
-			<DESCRIPTION>compression method for untar.  Allowable values are&quot;none&quot;, &quot;gzip&quot; and &quot;bzip2&quot;.  Default is&quot;none&quot;</DESCRIPTION>
-		</ATTRIBUTE>
-	</TASK>
-	<TASK NAME="uptodate">
-		<DESCRIPTION>&lt;p&gt;Sets a property if a target file or set of target files is more up-to-date
-than a source file or set of source files. A single source file is specified
-using the &lt;code&gt;srcfile&lt;/code&gt; attribute. A set of source files is specified
-using the nested &lt;code&gt;&amp;lt;srcfiles&amp;gt;&lt;/code&gt;
-elements. These are &lt;a href=&quot;../CoreTypes/fileset.html&quot;&gt;FileSet&lt;/a&gt;s,
-whereas multiple target files are specified using a nested
-&lt;a href=&quot;../CoreTypes/mapper.html&quot;&gt;&lt;code&gt;&amp;lt;mapper&amp;gt;&lt;/code&gt;&lt;/a&gt; element.&lt;/p&gt;
-&lt;p&gt;By default, the value of the property is set to &lt;code&gt;true&lt;/code&gt; if
-the timestamp of the target file(s) is more recent than the timestamp of
-the corresponding source file(s). You can set the value to something other
-than the default by specifying the &lt;code&gt;value&lt;/code&gt; attribute.&lt;/p&gt;
-&lt;p&gt;If a &lt;code&gt;&amp;lt;srcfiles&amp;gt;&lt;/code&gt; element is used, without also specifying
-a &lt;code&gt;&amp;lt;mapper&amp;gt;&lt;/code&gt; element, the default behavior is to use a
-&lt;a href=&quot;../CoreTypes/mapper.html#merge-mapper&quot;&gt;merge mapper&lt;/a&gt;, with the
-&lt;code&gt;to&lt;/code&gt; attribute set to the value of the
-&lt;code&gt;targetfile&lt;/code&gt; attribute.&lt;/p&gt;
-&lt;p&gt;Normally, this task is used to set properties that are useful to avoid
-target execution depending on the relative age of the specified files.&lt;/p&gt;
-</DESCRIPTION>
-		<ATTRIBUTE NAME="property" REQUIRED="yes">
-			<DESCRIPTION>The name of the property to set</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="value" REQUIRED="no; defaults to true.">
-			<DESCRIPTION>The value to set the property to</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="srcfile" REQUIRED="yes, unless a nested
-       &lt;srcfiles&gt; element is present.">
-			<DESCRIPTION>The file to check against the target file(s)</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="targetfile" REQUIRED="yes, unless a nested
-       &lt;mapper&gt; element is present.">
-			<DESCRIPTION>The file for which we want to determine the status</DESCRIPTION>
-		</ATTRIBUTE>
-	</TASK>
-	<TASK NAME="waitfor">
-		<DESCRIPTION>&lt;p&gt;Blocks execution until a set of specified conditions become true. This is intended
-to be used with the &lt;a href=&quot;parallel.html&quot;&gt;parallel&lt;/a&gt; task to
-synchronize a set of processes.&lt;/p&gt;
-&lt;p&gt;The conditions to wait for are defined in &lt;a href=&quot;waitfor.html#nested&quot;&gt;nested elements&lt;/a&gt;,
-if multiple conditions are specified, then the task will wait until all conditions are true..&lt;/p&gt;
-&lt;p&gt;&lt;/p&gt;
-&lt;p&gt;If both maxwait and maxwaitunit are not specified, the maxwait is 3 minutes (180000 milliseconds).&lt;/p&gt;
-&lt;p&gt;If the &lt;code&gt;timeoutproperty&lt;/code&gt; attribute has been set, a
-property of that name will be created if the condition didn't come
-true within the specified time.&lt;/p&gt;
-</DESCRIPTION>
-		<ATTRIBUTE NAME="maxwait" REQUIRED="no">
-			<DESCRIPTION>The maximum amount of time to wait for all the required conditionsto become true before failing the task. Defaults to 180000 maxwaitunits</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="maxwaitunit" REQUIRED="no">
-			<DESCRIPTION>The unit of time that must be used to interpret the value of themaxwait attribute.  Defaults to millisecond.Valid Values aremillisecondsecondminutehourdayweek</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="checkevery" REQUIRED="no">
-			<DESCRIPTION>The amount of time to wait between each test of the conditions.Defaults to 500 checkeveryunits</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="checkeveryunit" REQUIRED="no">
-			<DESCRIPTION>The unit of time that must be used to interpret the value of thecheckevery attribute.  Defaults to millisecond.Valid Values aremillisecondsecondminutehourdayweek</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="timeoutproperty" REQUIRED="no">
-			<DESCRIPTION>the name of the property to set if maxwait hasbeen exceeded</DESCRIPTION>
-		</ATTRIBUTE>
-	</TASK>
-	<TASK NAME="war">
-		<DESCRIPTION>&lt;p&gt;An extension of the &lt;a href=&quot;jar.html&quot;&gt;Jar&lt;/a&gt; task with special
-treatment for files that should end up in the
-&lt;code&gt;WEB-INF/lib&lt;/code&gt;, &lt;code&gt;WEB-INF/classes&lt;/code&gt; or
-&lt;code&gt;WEB-INF&lt;/code&gt; directories of the Web Application Archive.&lt;/p&gt;
-&lt;p&gt;(The War task is a shortcut for specifying the particular layout of a WAR file. 
-The same thing can be accomplished by using the &lt;i&gt;prefix&lt;/i&gt; and &lt;i&gt;fullpath&lt;/i&gt;
-attributes of zipfilesets in a Zip or Jar task.)&lt;/p&gt;
-&lt;p&gt;The extended zipfileset element from the zip task (with attributes &lt;i&gt;prefix&lt;/i&gt;, &lt;i&gt;fullpath&lt;/i&gt;, and &lt;i&gt;src&lt;/i&gt;) is available in the War task.&lt;/p&gt;
-</DESCRIPTION>
-		<ATTRIBUTE NAME="destfile" REQUIRED="yes">
-			<DESCRIPTION>the WAR file to create</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="warfile" REQUIRED="no">
-			<DESCRIPTION>Deprecated name of the file to create-use destfile instead</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="webxml" REQUIRED="yes, unless update is set to true">
-			<DESCRIPTION>The deployment descriptor to use (WEB-INF/web.xml)</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="basedir" REQUIRED="no">
-			<DESCRIPTION>the directory from which to jar the files</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="compress" REQUIRED="no">
-			<DESCRIPTION>Not only store data but also compress them, defaults to tru</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="encoding" REQUIRED="no">
-			<DESCRIPTION>The character encoding to use for filenamesinside the archive.  Defaults to UTF8. It is notrecommended to change this value as the created archive will mostlikely be unreadable for Java otherwise</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="filesonly" REQUIRED="no">
-			<DESCRIPTION>Store only file entries, defaults to fals</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="includes" REQUIRED="no">
-			<DESCRIPTION>comma- or space-separated list of patterns of files that must beincluded. All files are included when omitted</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="includesfile" REQUIRED="no">
-			<DESCRIPTION>the name of a file. Each line of this file istaken to be an include patter</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="excludes" REQUIRED="no">
-			<DESCRIPTION>comma- or space-separated list of patterns of files that must beexcluded. No files (except default excludes) are excluded when omitted</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="excludesfile" REQUIRED="no">
-			<DESCRIPTION>the name of a file. Each line of this file istaken to be an exclude patter</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="defaultexcludes" REQUIRED="no">
-			<DESCRIPTION>indicates whether default excludes should be used or not(&quot;yes&quot;/&quot;no&quot;). Default excludes are used when omitted</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="manifest" REQUIRED="no">
-			<DESCRIPTION>the manifest file to use</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="update" REQUIRED="no">
-			<DESCRIPTION>indicates whether to update or overwritethe destination file if it already exists</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="duplicate" REQUIRED="no">
-			<DESCRIPTION>behavior when a duplicate file is found.  Valid values are &quot;add&quot;, &quot;preserve&quot;, and &quot;fail&quot;.  The default value is &quot;add&quot;. </DESCRIPTION>
-		</ATTRIBUTE>
-	</TASK>
-	<TASK NAME="xmlproperty">
-		<DESCRIPTION>&lt;p&gt;
-Loads property values from a valid xml file.
-&lt;/p&gt;
-</DESCRIPTION>
-		<ATTRIBUTE NAME="file" REQUIRED="yes">
-			<DESCRIPTION>The XML file to parse</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="prefix" REQUIRED="no">
-			<DESCRIPTION>The prefix to prepend to each propert</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="keeproot" REQUIRED="no, default is true.">
-			<DESCRIPTION>If false, it doesn't include the xml root tag as a firstvalue in the property name</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="validate" REQUIRED="no, default is false.">
-			<DESCRIPTION>If true, it enables validation</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="collapseattributes" REQUIRED="no, default is false.">
-			<DESCRIPTION>If true, it treats attributes as nested elements</DESCRIPTION>
-		</ATTRIBUTE>
-	</TASK>
-	<TASK NAME="xslt">
-		<DESCRIPTION>&lt;p&gt;Process a set of documents via XSLT.&lt;/p&gt;
-&lt;p&gt;This is useful for building views of XML based documentation,
-or for generating code.&lt;/p&gt;
-&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This task depends on external libraries not included in the Ant distribution.
-See &lt;a href=&quot;../install.html#librarydependencies&quot;&gt;Library Dependencies&lt;/a&gt; for more information.&lt;/p&gt;
-&lt;p&gt;It is possible to refine the set of files that are being processed. This can be
-done with the &lt;i&gt;includes&lt;/i&gt;, &lt;i&gt;includesfile&lt;/i&gt;, &lt;i&gt;excludes&lt;/i&gt;, &lt;i&gt;excludesfile&lt;/i&gt; and &lt;i&gt;defaultexcludes&lt;/i&gt;
-attributes. With the &lt;i&gt;includes&lt;/i&gt; or &lt;i&gt;includesfile&lt;/i&gt; attribute you specify the files you want to
-have included by using patterns. The &lt;i&gt;exclude&lt;/i&gt; or &lt;i&gt;excludesfile&lt;/i&gt; attribute is used to specify
-the files you want to have excluded. This is also done with patterns. And
-finally with the &lt;i&gt;defaultexcludes&lt;/i&gt; attribute, you can specify whether you
-want to use default exclusions or not. See the section on &lt;a
-href=&quot;../dirtasks.html#directorybasedtasks&quot;&gt;directory based tasks&lt;/a&gt;, on how the
-inclusion/exclusion of files works, and how to write patterns.&lt;/p&gt;
-&lt;p&gt;This task forms an implicit &lt;a href=&quot;../CoreTypes/fileset.html&quot;&gt;FileSet&lt;/a&gt; and supports all
-attributes of &lt;code&gt;&amp;lt;fileset&amp;gt;&lt;/code&gt; (&lt;code&gt;dir&lt;/code&gt; becomes &lt;code&gt;basedir&lt;/code&gt;)
-as well as the nested &lt;code&gt;&amp;lt;include&amp;gt;&lt;/code&gt;, &lt;code&gt;&amp;lt;exclude&amp;gt;&lt;/code&gt;
-and &lt;code&gt;&amp;lt;patternset&amp;gt;&lt;/code&gt; elements.&lt;/p&gt;
-&lt;p&gt;This task supports the use of a nested &amp;lt;param&amp;gt; element which is used to pass values
-to an &amp;lt;xsl:param&amp;gt; declaration.&lt;/p&gt;
-&lt;p&gt;This task supports the use of a nested &lt;a href=&quot;../CoreTypes/xmlcatalog.html&quot;&gt;xmlcatalog&lt;/a&gt;
-element which is used to perform Entity and URI resolution&lt;/p&gt;
-&lt;p&gt;&lt;i&gt;&amp;lt;style&amp;gt; and &amp;lt;xslt&amp;gt; refer to the same Ant task and can be used interchangeably.&lt;/i&gt;&lt;/p&gt;
-&lt;p&gt;If you want to use Xalan-J 1 or XSL:P, you also need Ant's optional.jar&lt;/p&gt;
-</DESCRIPTION>
-		<ATTRIBUTE NAME="basedir" REQUIRED="no">
-			<DESCRIPTION>where to find the source XML file, default is theproject's basedir</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="destdir" REQUIRED="yes, unless in and out have been
-       specified.">
-			<DESCRIPTION>directory in which to store the results</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="extension" REQUIRED="no">
-			<DESCRIPTION>desired file extension to be used for the targets. If notspecified, the default is &quot;.html&quot;</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="style" REQUIRED="yes">
-			<DESCRIPTION>name of the stylesheet to use - given either relativeto the project's basedir or as an absolute pathDEPRECATED - can be specified as a path relativeto the basedir attribute of this task as well.</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="classpath" REQUIRED="no">
-			<DESCRIPTION>the classpath to use when looking up the XSLTprocessor</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="classpathref" REQUIRED="no">
-			<DESCRIPTION>the classpath to use, given as reference to a path defined elsewhere</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="force" REQUIRED="no; default is false">
-			<DESCRIPTION>Recreate target files, even if they are newerthan their corresponding source files or the stylesheet</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="processor" REQUIRED="no">
-			<DESCRIPTION>name of the XSLT processor to use.  Permissible values are&quot;trax&quot; for a TraX compliant processor (ie JAXP interfaceimplementation such as Xalan 2 or Saxon),&quot;xslp&quot; for the XSL:P processor, &quot;xalan&quot; forthe Apache XML Xalan (version 1) processor the name of anarbitrary XSLTLiaison class. Defaults to trax, followed by xalanand then xslp (in that order). The first one found in your classpath is the one that is used.DEPRECATED - XSL:P and xalan are deprecated and nomore supported..</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="includes" REQUIRED="no">
-			<DESCRIPTION>comma- or space-separated list of patterns of files that must be included.All files are included when omitted</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="includesfile" REQUIRED="no">
-			<DESCRIPTION>the name of a file. Each line of this file is taken to bean include patter</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="excludes" REQUIRED="no">
-			<DESCRIPTION>comma- or space-separated list of patterns of files that must be excluded.No files (except default excludes) are excluded when omitted</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="excludesfile" REQUIRED="no">
-			<DESCRIPTION>the name of a file. Each line of this file is taken to bean exclude patter</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="defaultexcludes" REQUIRED="no">
-			<DESCRIPTION>indicates whether default excludes should be used or not(&quot;yes&quot;/&quot;no&quot;). Default excludes are used when omitted</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="in" REQUIRED="no">
-			<DESCRIPTION>specifies a single XML document to be styled. Should be usedwith the out attribute</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="out" REQUIRED="no">
-			<DESCRIPTION>specifies the output name for the styled result from thein attribute</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="scanincludeddirectories" REQUIRED="no">
-			<DESCRIPTION>If any directories are matched by theincludes/excludes patterns, try to transform all files in thesedirectories.  Default is tru</DESCRIPTION>
-		</ATTRIBUTE>
-	</TASK>
-	<TASK NAME="zip">
-		<DESCRIPTION>&lt;p&gt;Creates a zipfile.&lt;/p&gt;
-&lt;p&gt;The &lt;i&gt;basedir&lt;/i&gt; attribute is the reference directory from where to zip.&lt;/p&gt;
-&lt;p&gt;Note that file permissions will not be stored in the resulting zipfile.&lt;/p&gt;
-&lt;p&gt;It is possible to refine the set of files that are being zipped. This can be
-done with the &lt;i&gt;includes&lt;/i&gt;, &lt;i&gt;includesfile&lt;/i&gt;, &lt;i&gt;excludes&lt;/i&gt;, &lt;i&gt;excludesfile&lt;/i&gt; and &lt;i&gt;defaultexcludes&lt;/i&gt;
-attributes. With the &lt;i&gt;includes&lt;/i&gt; or &lt;i&gt;includesfile&lt;/i&gt; attribute you specify the files you want to
-have included by using patterns. The &lt;i&gt;exclude&lt;/i&gt; or &lt;i&gt;excludesfile&lt;/i&gt; attribute is used to specify
-the files you want to have excluded. This is also done with patterns. And
-finally with the &lt;i&gt;defaultexcludes&lt;/i&gt; attribute, you can specify whether you
-want to use default exclusions or not. See the section on &lt;a
-href=&quot;../dirtasks.html#directorybasedtasks&quot;&gt;directory based tasks&lt;/a&gt;, on how the
-inclusion/exclusion of files works, and how to write patterns. &lt;/p&gt;
-&lt;p&gt;This task forms an implicit &lt;a href=&quot;../CoreTypes/fileset.html&quot;&gt;FileSet&lt;/a&gt; and
-supports all attributes of &lt;code&gt;&amp;lt;fileset&amp;gt;&lt;/code&gt;
-(&lt;code&gt;dir&lt;/code&gt; becomes &lt;code&gt;basedir&lt;/code&gt;) as well as the nested
-&lt;code&gt;&amp;lt;include&amp;gt;&lt;/code&gt;, &lt;code&gt;&amp;lt;exclude&amp;gt;&lt;/code&gt; and
-&lt;code&gt;&amp;lt;patternset&amp;gt;&lt;/code&gt; elements.&lt;/p&gt;
-&lt;p&gt;Or, you may place within it nested file sets, or references to file sets.
-In this case &lt;code&gt;basedir&lt;/code&gt; is optional; the implicit file set is &lt;i&gt;only used&lt;/i&gt;
-if &lt;code&gt;basedir&lt;/code&gt; is set. You may use any mixture of the implicit file set
-(with &lt;code&gt;basedir&lt;/code&gt; set, and optional attributes like &lt;code&gt;includes&lt;/code&gt;
-and optional subelements like &lt;code&gt;&amp;lt;include&amp;gt;&lt;/code&gt;); explicit nested
-&lt;code&gt;&amp;lt;fileset&amp;gt;&lt;/code&gt; elements so long as at least one fileset total is specified. The ZIP file will
-only reflect the relative paths of files &lt;i&gt;within&lt;/i&gt; each fileset. The Zip task and its derivatives know a special form of a fileset named zipfileset that has additional attributes (described below). &lt;/p&gt;
-&lt;p&gt;The Zip task also supports the merging of multiple zip files into the zip file. 
-This is possible through either the &lt;i&gt;src&lt;/i&gt; attribute of any nested filesets 
-or by using the special nested fileset &lt;i&gt;zipgroupfileset&lt;/i&gt;.&lt;/p&gt;
-&lt;p&gt;The &lt;code&gt;update&lt;/code&gt; parameter controls what happens if the
-ZIP file already exists. When set to &lt;code&gt;yes&lt;/code&gt;, the ZIP file is
-updated with the files specified. (New files are added; old files are
-replaced with the new versions.) When set to &lt;code&gt;no&lt;/code&gt; (the
-default) the ZIP file is overwritten.&lt;/p&gt;
-&lt;p&gt;The &lt;code&gt;whenempty&lt;/code&gt; parameter controls what happens when no files match.
-If &lt;code&gt;skip&lt;/code&gt; (the default), the ZIP is not created and a warning is issued.
-If &lt;code&gt;fail&lt;/code&gt;, the ZIP is not created and the build is halted with an error.
-If &lt;code&gt;create&lt;/code&gt;, an empty ZIP file (explicitly zero entries) is created,
-which should be recognized as such by compliant ZIP manipulation tools.&lt;/p&gt;
-&lt;p&gt;This task will now use the platform's default character encoding
-for filenames - this is consistent with the command line ZIP tools,
-but causes problems if you try to open them from within Java and your
-filenames contain non US-ASCII characters. Use the encoding attribute
-and set it to UTF8 to create zip files that can safely be read by
-Java.&lt;/p&gt;
-</DESCRIPTION>
-		<ATTRIBUTE NAME="destfile" REQUIRED="yes">
-			<DESCRIPTION>the zip-file to create</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="zipfile" REQUIRED="yes">
-			<DESCRIPTION>the deprecated old name of destfile</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="basedir" REQUIRED="no">
-			<DESCRIPTION>the directory from which to zip the files</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="compress" REQUIRED="no">
-			<DESCRIPTION>Not only store data but also compress them, defaults to tru</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="encoding" REQUIRED="no">
-			<DESCRIPTION>The character encoding to use for filenamesinside the zip file.  For a list of possible values see http://java.sun.com/products/jdk/1.2/docs/guide/internat/encoding.doc.html.Defaults to the platform's default character encoding</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="filesonly" REQUIRED="no">
-			<DESCRIPTION>Store only file entries, defaults to fals</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="includes" REQUIRED="no">
-			<DESCRIPTION>comma- or space-separated list of patterns of files that must beincluded. All files are included when omitted</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="includesfile" REQUIRED="no">
-			<DESCRIPTION>the name of a file. Each line of this file istaken to be an include patter</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="excludes" REQUIRED="no">
-			<DESCRIPTION>comma- or space-separated list of patterns of files that must beexcluded. No files (except default excludes) are excluded when omitted</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="excludesfile" REQUIRED="no">
-			<DESCRIPTION>the name of a file. Each line of this file istaken to be an exclude patter</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="defaultexcludes" REQUIRED="no">
-			<DESCRIPTION>indicates whether default excludes should be used or not(&quot;yes&quot;/&quot;no&quot;). Default excludes are used when omitted</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="update" REQUIRED="no">
-			<DESCRIPTION>indicates whether to update or overwritethe destination file if it already exists</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="whenempty" REQUIRED="no">
-			<DESCRIPTION>behavior when no files match.  Valid values are &quot;fail&quot;, &quot;skip&quot;, and &quot;create&quot;.  Default is &quot;skip&quot;</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="duplicate" REQUIRED="no">
-			<DESCRIPTION>behavior when a duplicate file is found.  Valid values are &quot;add&quot;, &quot;preserve&quot;, and &quot;fail&quot;. The default value is &quot;add&quot;. </DESCRIPTION>
-		</ATTRIBUTE>
-	</TASK>
-	<TASK NAME="antlr">
-		<DESCRIPTION>&lt;p&gt;
-Invokes the &lt;a HREF=&quot;http://www.antlr.org/&quot; target=&quot;_top&quot;&gt;ANTLR&lt;/a&gt; Translator generator
-on a grammar file.
-&lt;/p&gt;
-&lt;p&gt;
-To use the ANTLR task, set the &lt;i&gt;target&lt;/i&gt; attribute to the name of the
-grammar file to process.  Optionally, you can also set the
-&lt;i&gt;outputdirectory&lt;/i&gt; to write the generated file to a specific directory.
-Otherwise ANTLR writes the generated files to the directory containing
-the grammar file.
-&lt;/p&gt;
-&lt;p&gt;
-This task only invokes ANTLR if the grammar file is newer than the generated
-files.
-&lt;/p&gt;
-&lt;p&gt;
-&lt;i&gt;
-To successfully run ANTLR, your best option is probably to build the whole
-jar with the provided script &lt;b&gt;mkalljar&lt;/b&gt; and drop the resulting jar (about 300KB)
-into ${ant.home}/lib. Dropping the default jar (70KB) is probably not enough
-for most needs and your only option will be to add ANTLR home directory
-to your classpath as described in ANTLR &lt;tt&gt;install.html&lt;/tt&gt; document.
-&lt;/i&gt;
-&lt;/p&gt;
-</DESCRIPTION>
-		<ATTRIBUTE NAME="target" REQUIRED="yes">
-			<DESCRIPTION>The grammar file to process</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="outputdirectory" REQUIRED="no">
-			<DESCRIPTION>The directory to write the generated files to.  If not set, the filesare written to the directory containing the grammar file.</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="glib" REQUIRED="no">
-			<DESCRIPTION>An optional super grammar file that the target grammar overrides.  Thisfeature is only needed for advanced vocabularies.</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="debug" REQUIRED="no">
-			<DESCRIPTION>When set to &quot;yes&quot;, this flag adds code to the generated parser that willlaunch the ParseView debugger upon invocation.  The default is &quot;no&quot;.Note: ParseView is a separate component that needs to be installed or yourgrammar will have compilation errors.</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="html" REQUIRED="no">
-			<DESCRIPTION>Emit an html version of the grammar with hyperlinked actions.</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="diagnostic" REQUIRED="no">
-			<DESCRIPTION>Generates a text file with debugging infomation based on the target grammar.</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="trace" REQUIRED="no">
-			<DESCRIPTION>Forces all rules to call traceIn/traceOut if set to &quot;yes&quot;.The default is &quot;no&quot;.</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="traceparser" REQUIRED="no">
-			<DESCRIPTION>Only forces parser rules to call traceIn/traceOut if set to &quot;yes&quot;.The default is &quot;no&quot;.</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="tracelexer" REQUIRED="no">
-			<DESCRIPTION>Only forces lexer rules to call traceIn/traceOut if set to &quot;yes&quot;.The default is &quot;no&quot;.</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="tracetreewalker" REQUIRED="no">
-			<DESCRIPTION>Only forces tree walker rules to call traceIn/traceOut if set to&quot;yes&quot;.  The default is &quot;no&quot;.</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="dir" REQUIRED="no">
-			<DESCRIPTION>The directory to invoke the VM in.</DESCRIPTION>
-		</ATTRIBUTE>
-	</TASK>
-	<TASK NAME="borlandgenerateclient">
-		<DESCRIPTION>&lt;p&gt;The BorlandGenerateClient is a task dedicated to Borland Application Server
-v 4.5. It offers to generate the client jar file corresponding to an ejb jar
-file.&lt;/p&gt;
-</DESCRIPTION>
-		<ATTRIBUTE NAME="ejbjar" REQUIRED="yes">
-			<DESCRIPTION>ejb jar fil</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="debug" REQUIRED="no">
-			<DESCRIPTION>If true, turn on the debug mode for each borlandtools (java2iiop, iastool ...) default = fals</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="clientjar" REQUIRED="no">
-			<DESCRIPTION>client jar file name. If missing the client jarfile name is build using the ejbjar file name: ejbjar = hellobean-ejb.jar=&gt; hellobean-ejbclient.ja</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="mode" REQUIRED="no">
-			<DESCRIPTION>choose the command launching mode. Two values:java or fork. default = fork. java is not supported for version=5.Possibility to specify a classpath</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="version" REQUIRED="no, defaults to 4">
-			<DESCRIPTION>set the Borland Application Version.4 means B.A.S (Borland Application Server 4.x)5 means B.E.S (Borland Application Server 5.x)</DESCRIPTION>
-		</ATTRIBUTE>
-	</TASK>
-	<TASK NAME="cab">
-		<DESCRIPTION>&lt;p&gt;The cab task creates Microsoft cab archive files.  It is invoked
-similar to the &lt;a href=&quot;../CoreTasks/jar.html&quot;&gt;jar&lt;/a&gt; or &lt;a href=&quot;../CoreTasks/zip.html&quot;&gt;zip&lt;/a&gt; tasks.
-This task will work on Windows using the external cabarc tool (provided by Microsoft)
-which must be located in your executable path.&lt;/p&gt;
-&lt;p&gt;To use this task on other platforms you need to download and compile libcabinet from
-&lt;a href=&quot;http://trill.cis.fordham.edu/~barbacha/cabinet_library/&quot;&gt;
-http://trill.cis.fordham.edu/~barbacha/cabinet_library/&lt;/a&gt;.&lt;/p&gt;
-&lt;p&gt;See the section on &lt;a href=&quot;../dirtasks.html#directorybasedtasks&quot;&gt;directory based
-tasks&lt;/a&gt;, on how the inclusion/exclusion of files works, and how to
-write patterns.&lt;/p&gt;
-&lt;p&gt;This task forms an implicit &lt;a href=&quot;../CoreTypes/fileset.html&quot;&gt;FileSet&lt;/a&gt; and
-supports all attributes of &lt;code&gt;&amp;lt;fileset&amp;gt;&lt;/code&gt;
-(&lt;code&gt;dir&lt;/code&gt; becomes &lt;code&gt;basedir&lt;/code&gt;) as well as the nested
-&lt;code&gt;&amp;lt;include&amp;gt;&lt;/code&gt;, &lt;code&gt;&amp;lt;exclude&amp;gt;&lt;/code&gt; and
-&lt;code&gt;&amp;lt;patternset&amp;gt;&lt;/code&gt; elements.&lt;/p&gt;
-</DESCRIPTION>
-		<ATTRIBUTE NAME="cabfile" REQUIRED="yes">
-			<DESCRIPTION>the name of the cab file to create</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="basedir" REQUIRED="yes">
-			<DESCRIPTION>the directory to start archiving files from</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="verbose" REQUIRED="no">
-			<DESCRIPTION>set to &quot;yes&quot; if you want to see the output fromthe cabarc tool.  defaults to &quot;no&quot;</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="compress" REQUIRED="no">
-			<DESCRIPTION>set to &quot;no&quot; to store files without compressing.defaults to &quot;yes&quot;</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="options" REQUIRED="no">
-			<DESCRIPTION>use to set additional command-line options forthe cabarc tool.  should not normally be necessary</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="includes" REQUIRED="no">
-			<DESCRIPTION>comma- or space-separated list of patterns of files thatmust be included. All files are included when omitted</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="includesfile" REQUIRED="no">
-			<DESCRIPTION>the name of a file. Each line of this file istaken to be an include patter</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="excludes" REQUIRED="no">
-			<DESCRIPTION>comma- or space-separated list of patterns of files thatmust be excluded. No files (except default excludes) are excludedwhen omitted</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="excludesfile" REQUIRED="no">
-			<DESCRIPTION>the name of a file. Each line of this file istaken to be an exclude patter</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="defaultexcludes" REQUIRED="no">
-			<DESCRIPTION>indicates whether default excludes should be usedor not (&quot;yes&quot;/&quot;no&quot;). Default excludes are used when omitted</DESCRIPTION>
-		</ATTRIBUTE>
-	</TASK>
-	<TASK NAME="depend">
-		<DESCRIPTION>&lt;p&gt;
-The depend task works by determining which classes are out of date with
-respect to their source and then removing the class files of any other
-classes which depend on the out-of-date classes.
-&lt;/p&gt;
-&lt;p&gt; To determine the class dependencies, the depend task analyses the class 
-files of all class files passed to it. Depend does not parse your source code in 
-any way but relies upon the class references encoded into the class files by the 
-compiler. This is generally faster than parsing the Java source.&lt;/p&gt;
-&lt;p&gt;
-To learn more about how this information is obtained from the class files, 
-please refer to &lt;a href=&quot;http://java.sun.com/docs/books/vmspec/&quot;&gt;the Java 
-Virtual Machine Specification&lt;/a&gt;
-&lt;/p&gt;
-&lt;p&gt; Since a class' dependencies only change when the class itself changes, the 
-depend task is able to cache dependency information. Only those class files 
-which have changed will have their dependency information re-analysed. Note that 
-if you change a class' dependencies by changing the source, it will be 
-recompiled anyway. You can examine the dependency files created to understand 
-the  dependencies of your classes. Please do not rely, however, on the format of 
-the information, as it may change in a later release. &lt;/p&gt;
-&lt;p&gt; Once depend discovers all of the class dependencies, it &amp;quot;inverts&amp;quot; 
-this relation to determine, for each class, which other classes are dependent 
-upon it. This &amp;quot;affects&amp;quot; list is used to discover which classes are 
-invalidated by the out of date class. The class files of the invalidated 
-classes are removed, triggering the compilation of the affected classes. &lt;/p&gt;
-&lt;p&gt; The depend task supports an attribute, &amp;quot;closure&amp;quot; which controls 
-whether depend will only consider direct class-class relationships or whether it 
-will also consider transitive, indirect relationships. For example, say there 
-are three classes, A, which depends on B, which in-turn depend on C. Now say 
-that class C is out of date. Without closure, only class B would be removed by 
-depend. With closure set, class A would also be removed. Normally direct 
-relationships are sufficient - it is unusual for a class to depend on another 
-without having a direct relationship. With closure set, you will notice that 
-depend typically removes far more class files. &lt;/p&gt;
-&lt;p&gt;The classpath attribute for &lt;code&gt;&amp;lt;depend&amp;gt;&lt;/code&gt; is optional. If it is present, 
-depend will check class dependencies against classes and jars on this classpath.
-Any classes which depend on an element from this classpath and which are older 
-than that element will be deleted. A typical example where you would use this 
-facility would be where you are building a utility jar and want to make sure 
-classes which are out of date with respect to this jar are rebuilt. You should
-&lt;b&gt;not&lt;/b&gt; include jars in this classpath which you do not expect to change, 
-such as the JDK runtime jar or third party jars, since doing so will just slow 
-down the dependency check. This means that if you do use a classpath for the 
-depend task it may be different from the classpath necessary to actually 
-compile your code.&lt;/p&gt;
-&lt;h3&gt;Performance&lt;/h3&gt; 
-&lt;p&gt; The performance of the depend task is dependent on a 
-number of factors such as class relationship complexity and how many class files 
-are out of date. The decision about whether it is cheaper to just recompile all 
-classes or to use the depend task will depend on the size of your project and 
-how interrelated your classes are. &lt;/p&gt;
-&lt;h3&gt;Limitations&lt;/h3&gt;
-&lt;p&gt; There are some source dependencies which depend will not detect. &lt;/p&gt;
-&lt;ul&gt;
-&lt;li&gt;If the Java compiler optimizes away a class relationship, 
-there can be a source dependency without a class dependency. &lt;/li&gt;
-&lt;li&gt;Non public classes cause two problems. Firstly depend cannot relate
-the class file to a source file. In the future this may be addressed
-using the source file attribute in the classfile. Secondly, neither 
-depend nor the compiler tasks can detect when a non public class is
-missing. Inner classes are handled by the depend task.&lt;/li&gt;
-&lt;/ul&gt;
-The most obvious example of these limitations is that the task can't tell
-which classes to recompile when a constant primitive data type exported 
-by other classes is changed. For example, a change in the definition of
-something like
-&lt;pre&gt;
-public final class Constants {
-public final static boolean DEBUG=false;
-}
-&lt;/pre&gt; will not be picked up by other classes.
-</DESCRIPTION>
-		<ATTRIBUTE NAME="srcdir" REQUIRED="yes">
-			<DESCRIPTION>This is the directory where the source exists. dependwill examine this to determine which classes are out of date. If you use multiplesource directories you can pass this attribute a path of source directories</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="destdir" REQUIRED="no">
-			<DESCRIPTION>This is the root directory of the class files whichwill be analysed. If this is not present, the srcdir is used</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="cache" REQUIRED="no">
-			<DESCRIPTION>This is a directory in which depend can store andretrieve dependency information. If this is not present, depend will notuse a cache</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="closure" REQUIRED="no">
-			<DESCRIPTION>This attribute controls whether depend only removesclasses which directly depend on out of date classes. If this is set to true,depend will traverse the class dependency graph deleting all affectedclasses. Defaults to fals</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="dump" REQUIRED="no">
-			<DESCRIPTION>If true the dependency information will be written to the debug level log</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="classpath" REQUIRED="no">
-			<DESCRIPTION>The classpath containg jars and classes for which &lt;depend&gt; should alsocheck dependencie</DESCRIPTION>
-		</ATTRIBUTE>
-	</TASK>
-	<TASK NAME="echoproperties">
-		<DESCRIPTION>&lt;p&gt;Displays all the current properties in the project.  The output can be
-sent to a file if desired. You can also specify a subset of properties
-to save by naming a prefix: only properties starting with this
-prefix will be saved. This task can be used as a somewhat contrived
-means of returning data from an &lt;tt&gt;&amp;lt;ant&amp;gt;&lt;/tt&gt; invocation,
-but is really for debugging buildfiles.&lt;/p&gt;
-</DESCRIPTION>
-		<ATTRIBUTE NAME="destfile" REQUIRED="no">
-			<DESCRIPTION>If specified, the value indicates the name of thefile to send the output of the statement to.  The generated output fileis compatible for loading by any Java application as a property file.If not specified, then the output will go to the Ant log</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="prefix" REQUIRED="no">
-			<DESCRIPTION>a prefix which is used to filter the propertiesonly those properties starting with this prefix will be echoed.</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="failonerror" REQUIRED="no">
-			<DESCRIPTION>By default, the &quot;failonerror&quot; attribute is enabled.If an error occurs while writing the properties to a file, and thisattribute is enabled, then a BuildException will be thrown, causing thebuild to fail.  If disabled, then IO errors will be reported as a logstatement, and the build will continue without failure from this task</DESCRIPTION>
-		</ATTRIBUTE>
-	</TASK>
-	<TASK NAME="ftp">
-		<DESCRIPTION>&lt;p&gt;The ftp task implements a basic FTP client that can send, receive,
-list, delete files, and create directories.  See below for descriptions and examples of how
-to perform each task.&lt;/p&gt;
-&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This task depends on external libraries not included in the Ant distribution.
-See &lt;a href=&quot;../install.html#librarydependencies&quot;&gt;Library Dependencies&lt;/a&gt; for more information.&lt;/p&gt;
-&lt;p&gt;The ftp task makes no attempt to determine what file system syntax is
-required by the remote server, and defaults to Unix standards.
-&lt;i&gt;remotedir&lt;/i&gt; must be specified in the exact syntax required by the ftp
-server. If the usual Unix conventions are not supported by the server,
-&lt;i&gt;separator&lt;/i&gt; can be used to set the file separator that should be used
-instead.&lt;/p&gt;
-&lt;p&gt;See the section on &lt;a href=&quot;../dirtasks.html#directorybasedtasks&quot;&gt;directory based
-tasks&lt;/a&gt;, on how the inclusion/exclusion of files works, and how to
-write patterns.&lt;/p&gt;
-&lt;p&gt;
-&lt;b&gt;Warning: &lt;/b&gt; for the get and delete actions to work properly 
-with a Windows 2000 ftp server, it needs to be configured to generate
-Unix style listings, and not the default MS-DOS listing. Or someone needs to write
-the code to parse MS-DOS listings -any takers?
-</DESCRIPTION>
-		<ATTRIBUTE NAME="server" REQUIRED="yes">
-			<DESCRIPTION>the address of the remote ftp server</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="port" REQUIRED="no">
-			<DESCRIPTION>the port number of the remote ftp server.Defaults to port 21</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="userid" REQUIRED="yes">
-			<DESCRIPTION>the login id to use on the ftp server</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="password" REQUIRED="yes">
-			<DESCRIPTION>the login password to use on the ftp server</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="remotedir" REQUIRED="no">
-			<DESCRIPTION>the directory to which to upload files on the ftp server</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="action" REQUIRED="no">
-			<DESCRIPTION>the ftp action to perform, defaulting to &quot;send&quot;.  Currently supports &quot;put&quot;, &quot;get&quot;,&quot;del&quot;, &quot;list&quot;, &quot;chmod&quot; and &quot;mkdir&quot;</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="binary" REQUIRED="no">
-			<DESCRIPTION>selects binary-mode (&quot;yes&quot;) or text-mode (&quot;no&quot;) transfers.  Defaults to &quot;yes</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="passive" REQUIRED="no">
-			<DESCRIPTION>selects passive-mode (&quot;yes&quot;) transfers.  Defaults to &quot;no</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="verbose" REQUIRED="no">
-			<DESCRIPTION>displays information on each file transferred if set to &quot;yes&quot;. Defaults to &quot;no&quot;</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="depends" REQUIRED="no">
-			<DESCRIPTION>transfers only new or changed files if set to &quot;yes&quot;. Defaults to &quot;no&quot;</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="newer" REQUIRED="no">
-			<DESCRIPTION>a synonym for depends</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="separator" REQUIRED="no">
-			<DESCRIPTION>sets the file separator used on the ftp server.Defaults to &quot;/&quot;</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="umask" REQUIRED="no">
-			<DESCRIPTION>sets the default file permissions for new files,unix only</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="chmod" REQUIRED="no">
-			<DESCRIPTION>sets or changes file permissions for new or existing files,unix only. If used with a put action, chmod will be issued for each file</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="listing" REQUIRED="no">
-			<DESCRIPTION>the file to write results of the &quot;list&quot; action.Required for the &quot;list&quot; action, ignored otherwise</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="ignorenoncriticalerrors" REQUIRED="no">
-			<DESCRIPTION>flag which permits the task to ignore some non-fatal errorcodes sent by some servers during directory creation: wu-ftp in particular.Default: fals</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="skipfailedtransfers" REQUIRED="no">
-			<DESCRIPTION>flag which enables unsuccessful file put, deleteand get operations to be skipped with a warning and theremainder of the files still transferred. Default: fals</DESCRIPTION>
-		</ATTRIBUTE>
-	</TASK>
-	<TASK NAME="icontract">
-		<DESCRIPTION>&lt;P&gt;
-Instruments Java classes with &lt;a href=&quot;http://www.reliable-systems.com/tools/&quot;&gt;iContract&lt;/a&gt;
-DBC preprocessor.&lt;br&gt;
-The task can generate a properties file for &lt;a href=&quot;http://home.sol.no/~hellesoy/icplus.html&quot;&gt;iControl&lt;/a&gt;,
-a graphical user interface that lets you turn on/off assertions. iControl generates a control file that you can refer to
-from this task using the controlfile attribute.
-&lt;/p&gt;
-</DESCRIPTION>
-		<ATTRIBUTE NAME="srcdir" REQUIRED="yes">
-			<DESCRIPTION>Location of the java files</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="instrumentdir" REQUIRED="yes">
-			<DESCRIPTION>Indicates where the instrumented source files should go</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="repositorydir" REQUIRED="yes">
-			<DESCRIPTION>Indicates where the repository source files should go</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="builddir" REQUIRED="no">
-			<DESCRIPTION>Indicates where the compiled instrumented classes should go.Defaults to the value of instrumentdir.NOTE: Don't use the same directory for compiled instrumented classesand uninstrumented classes. It will break the dependency checking. (Classes willnot be reinstrumented if you change them)</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="repositorybuilddir" REQUIRED="no">
-			<DESCRIPTION>Indicates where the compiled repository classes should go.Defaults to the value of repositorydir</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="pre" REQUIRED="no">
-			<DESCRIPTION>Indicates whether or not to instrument for preconditions.Defaults to true unless controlfile is specified, in which case itdefaults to false</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="post" REQUIRED="no">
-			<DESCRIPTION>Indicates whether or not to instrument for postconditions.Defaults to true unless controlfile is specified, in which case itdefaults to false</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="invariant" REQUIRED="no">
-			<DESCRIPTION>Indicates whether or not to instrument for invariants.Defaults to true unless controlfile is specified, in which case itdefaults to false</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="failthrowable" REQUIRED="no">
-			<DESCRIPTION>The full name of the Throwable (Exception) that should bethrown when an assertion is violated. Defaults to java.lang.Erro</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="verbosity" REQUIRED="no">
-			<DESCRIPTION>Indicates the verbosity level of iContract. Any combinationof error*,warning*,note*,info*,progress*,debug* (comma separated) can beused. Defaults to error</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="quiet" REQUIRED="no">
-			<DESCRIPTION>Indicates if iContract should be quiet. Turn it off if many your classes extend uninstrumented classesand you don't want warnings about this. Defaults to fals</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="updateicontrol" REQUIRED="no">
-			<DESCRIPTION>If set to true, it indicates that the properties file foriControl in the current directory should be updated (or created if it doesn't exist).Defaults to false</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="controlfile" REQUIRED="only if updateicontrol=true">
-			<DESCRIPTION>The name of the control file to pass to iContract. Consider using iControl to generate the file.Default is not to pass a file.</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="classdir" REQUIRED="only if updateicontrol=true">
-			<DESCRIPTION>Indicates where compiled (unistrumented) classes are located.This is required in order to properly update the icontrol.properties file, notfor instrumentation</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="targets" REQUIRED="no">
-			<DESCRIPTION>Name of the file that will be generated by this task, which lists all theclasses that iContract will instrument. If specified, the file will not be deleted after execution.If not specified, a file will still be created, but it will be deleted after execution</DESCRIPTION>
-		</ATTRIBUTE>
-	</TASK>
-	<TASK NAME="jarlib-available">
-		<DESCRIPTION>&lt;p&gt;Check whether an extension is present in a fileset or an extensionSet.
-If the extension is present then a property is set.&lt;/p&gt;
-&lt;p&gt;Note that this task
-works with extensions as defined by the &quot;Optional Package&quot; specification.
-For more information about optional packages, see the document
-&lt;em&gt;Optional Package Versioning&lt;/em&gt; in the documentation bundle for your
-Java2 Standard Edition package, in file
-&lt;code&gt;guide/extensions/versioning.html&lt;/code&gt; or online at
-&lt;a href=&quot;http://java.sun.com/j2se/1.3/docs/guide/extensions/versioning.html&quot;&gt;
-http://java.sun.com/j2se/1.3/docs/guide/extensions/versioning.html&lt;/a&gt;.&lt;/p&gt;
-&lt;p&gt;See the Extension and ExtensionSet documentation for further details&lt;/p&gt;
-</DESCRIPTION>
-		<ATTRIBUTE NAME="property" REQUIRED="yes">
-			<DESCRIPTION>The name of property to set if extensions is available</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="file" REQUIRED="no, one of file, nested
-     extensionset or nested fileset must be present.">
-			<DESCRIPTION>The file to check for extensio</DESCRIPTION>
-		</ATTRIBUTE>
-	</TASK>
-	<TASK NAME="jarlib-display">
-		<DESCRIPTION>&lt;p&gt;Display the &quot;Optional Package&quot; and &quot;Package Specification&quot; information
-contained within the specified jars.&lt;/p&gt;
-&lt;p&gt;Note that this task
-works with extensions as defined by the &quot;Optional Package&quot; specification.
-For more information about optional packages, see the document
-&lt;em&gt;Optional Package Versioning&lt;/em&gt; in the documentation bundle for your
-Java2 Standard Edition package, in file
-&lt;code&gt;guide/extensions/versioning.html&lt;/code&gt; or online at
-&lt;a href=&quot;http://java.sun.com/j2se/1.3/docs/guide/extensions/versioning.html&quot;&gt;
-http://java.sun.com/j2se/1.3/docs/guide/extensions/versioning.html&lt;/a&gt;.&lt;/p&gt;
-&lt;p&gt;See the Extension and ExtensionSet documentation for further details&lt;/p&gt;
-</DESCRIPTION>
-		<ATTRIBUTE NAME="file" REQUIRED="no, but one of file or fileset must be
-     present.">
-			<DESCRIPTION>The file to display extension information about</DESCRIPTION>
-		</ATTRIBUTE>
-	</TASK>
-	<TASK NAME="jarlib-manifest">
-		<DESCRIPTION>&lt;p&gt;Task to generate a manifest that declares all the dependencies
-in manifest. The dependencies are determined by looking in the
-specified path and searching for Extension / &quot;Optional Package&quot;
-specifications in the manifests of the jars.&lt;/p&gt;
-&lt;p&gt;Note that this task
-works with extensions as defined by the &quot;Optional Package&quot; specification.
-For more information about optional packages, see the document
-&lt;em&gt;Optional Package Versioning&lt;/em&gt; in the documentation bundle for your
-Java2 Standard Edition package, in file
-&lt;code&gt;guide/extensions/versioning.html&lt;/code&gt; or online at
-&lt;a href=&quot;http://java.sun.com/j2se/1.3/docs/guide/extensions/versioning.html&quot;&gt;
-http://java.sun.com/j2se/1.3/docs/guide/extensions/versioning.html&lt;/a&gt;.&lt;/p&gt;
-&lt;p&gt;See the Extension and ExtensionSet documentation for further details&lt;/p&gt;
-</DESCRIPTION>
-		<ATTRIBUTE NAME="destfile" REQUIRED="yes.">
-			<DESCRIPTION>The file to generate Manifest int</DESCRIPTION>
-		</ATTRIBUTE>
-	</TASK>
-	<TASK NAME="jarlib-resolve">
-		<DESCRIPTION>&lt;p&gt;Try to locate a jar to satisfy an extension and place
-location of jar into property. The task allows you to
-add a number of resolvers that are capable of locating a
-library for a specifc extension. Each resolver will be attempted
-in specified order until library is found or no resolvers are left.
-If no resolvers are left and failOnError is true then a BuildException
-will be thrown.&lt;/p&gt;
-&lt;p&gt;Note that this task
-works with extensions as defined by the &quot;Optional Package&quot; specification.
-For more information about optional packages, see the document
-&lt;em&gt;Optional Package Versioning&lt;/em&gt; in the documentation bundle for your
-Java2 Standard Edition package, in file
-&lt;code&gt;guide/extensions/versioning.html&lt;/code&gt; or online at
-&lt;a href=&quot;http://java.sun.com/j2se/1.3/docs/guide/extensions/versioning.html&quot;&gt;
-http://java.sun.com/j2se/1.3/docs/guide/extensions/versioning.html&lt;/a&gt;.&lt;/p&gt;
-&lt;p&gt;See the Extension and ExtensionSet documentation for further details&lt;/p&gt;
-</DESCRIPTION>
-		<ATTRIBUTE NAME="property" REQUIRED="yes">
-			<DESCRIPTION>The name of property to set to library location</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="failonerror" REQUIRED="no, defaults to true.">
-			<DESCRIPTION>True if failure to locate library should result in build exception</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="checkextension" REQUIRED="no, defaults to true.">
-			<DESCRIPTION>True if librarys returned by nested resolvers should be checked to see ifthey supply extension</DESCRIPTION>
-		</ATTRIBUTE>
-	</TASK>
-	<TASK NAME="javacc">
-		<DESCRIPTION>&lt;p&gt;
-Invokes the &lt;a HREF=&quot;http://www.webgain.com/products/java_cc/&quot; target=&quot;_top&quot;&gt;JavaCC&lt;/a&gt; compiler 
-compiler on a grammar file.
-&lt;/p&gt;
-&lt;p&gt;
-To use the javacc task, set the &lt;i&gt;target&lt;/i&gt; attribute to the name of the 
-grammar file to process.  You also need to specify the directory containing 
-the JavaCC installation using the &lt;i&gt;javacchome&lt;/i&gt; attribute, so that ant 
-can find the JavaCC classes.  Optionally, you can also set the 
-&lt;i&gt;outputdirectory&lt;/i&gt; to write the generated file to a specific directory.
-Otherwise javacc writes the generated files to the directory containing
-the grammar file.
-&lt;/p&gt;
-&lt;p&gt;
-This task only invokes JavaCC if the grammar file is newer than the generated 
-Java files.  javacc assumes that the Java class name of the generated parser
-is the same as the name of the grammar file, ignoring the .jj.
-If this is not the case, the javacc task will still work, but it will always 
-generate the output files.
-&lt;/p&gt;
-</DESCRIPTION>
-		<ATTRIBUTE NAME="target" REQUIRED="yes">
-			<DESCRIPTION>The grammar file to process</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="javacchome" REQUIRED="yes">
-			<DESCRIPTION>The directory containing the JavaCC distribution</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="outputdirectory" REQUIRED="no">
-			<DESCRIPTION>The directory to write the generated files to.  If not set, the filesare written to the directory containing the grammar file.</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="buildparser" REQUIRED="no">
-			<DESCRIPTION>Sets the BUILD_PARSER grammar option.  This is a boolean option</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="buildtokenmanager" REQUIRED="no">
-			<DESCRIPTION>Sets the BUILD_TOKEN_MANAGER grammar option.  This is a boolean option</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="cachetokens" REQUIRED="no">
-			<DESCRIPTION>Sets the CACHE_TOKENS grammar option.  This is a boolean option</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="choiceambiguitycheck" REQUIRED="no">
-			<DESCRIPTION>Sets the CHOICE_AMBIGUITY_CHECK grammar option.  This is an integer option</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="commontokenaction" REQUIRED="no">
-			<DESCRIPTION>Sets the COMMON_TOKEN_ACTION grammar option.  This is a boolean option</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="debuglookahead" REQUIRED="no">
-			<DESCRIPTION>Sets the DEBUG_LOOKAHEAD grammar option.  This is a boolean option</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="debugparser" REQUIRED="no">
-			<DESCRIPTION>Sets the DEBUG_PARSER grammar option.  This is a boolean option</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="debugtokenmanager" REQUIRED="no">
-			<DESCRIPTION>Sets the DEBUG_TOKEN_MANAGER grammar option.  This is a boolean option</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="errorreporting" REQUIRED="no">
-			<DESCRIPTION>Sets the ERROR_REPORTING grammar option.  This is a boolean option</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="forcelacheck" REQUIRED="no">
-			<DESCRIPTION>Sets the FORCE_LA_CHECK grammar option.  This is a boolean option</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="ignorecase" REQUIRED="no">
-			<DESCRIPTION>Sets the IGNORE_CASE grammar option.  This is a boolean option</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="javaunicodeescape" REQUIRED="no">
-			<DESCRIPTION>Sets the JAVA_UNICODE_ESCAPE grammar option.  This is a boolean option</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="lookahead" REQUIRED="no">
-			<DESCRIPTION>Sets the LOOKAHEAD grammar option.  This is an integer option</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="optimizetokenmanager" REQUIRED="no">
-			<DESCRIPTION>Sets the OPTIMIZE_TOKEN_MANAGER grammar option.  This is a boolean option</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="otherambiguitycheck" REQUIRED="no">
-			<DESCRIPTION>Sets the OTHER_AMBIGUITY_CHECK grammar option.  This is an integer option</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="sanitycheck" REQUIRED="no">
-			<DESCRIPTION>Sets the SANITY_CHECK grammar option.  This is a boolean option</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="static" REQUIRED="no">
-			<DESCRIPTION>Sets the STATIC grammar option.  This is a boolean option</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="unicodeinput" REQUIRED="no">
-			<DESCRIPTION>Sets the UNICODE_INPUT grammar option.  This is a boolean option</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="usercharstream" REQUIRED="no">
-			<DESCRIPTION>Sets the USER_CHAR_STREAM grammar option.  This is a boolean option</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="usertokenmanager" REQUIRED="no">
-			<DESCRIPTION>Sets the USER_TOKEN_MANAGER grammar option.  This is a boolean option</DESCRIPTION>
-		</ATTRIBUTE>
-	</TASK>
-	<TASK NAME="javah">
-		<DESCRIPTION>&lt;p&gt;Generates JNI headers from a Java class.&lt;/p&gt;
-&lt;p&gt; When this task executes, it will generate the C header and source files that
-are needed to implement native methods. JNI operates differently depending on
-whether &lt;a href=&quot;http://java.sun.com/j2se/1.3/docs/tooldocs/win32/javah.html&quot;&gt;JDK1.2&lt;/a&gt;
-(or later) or &lt;a href=&quot;http://java.sun.com/products/jdk/1.1/docs/tooldocs/win32/javah.html&quot;&gt;pre-JDK1.2&lt;/a&gt;
-systems are used.&lt;/p&gt;
-</DESCRIPTION>
-		<ATTRIBUTE NAME="class" REQUIRED="yes">
-			<DESCRIPTION>the fully-qualified name of the class (or classes,separated by commas</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="outputfile" REQUIRED="yes">
-			<DESCRIPTION>concatenates the resulting header or source files for all the classes listed into this fil</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="destdir" REQUIRED="">
-			<DESCRIPTION>sets the directory where javah saves the header files or thestub files</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="force" REQUIRED="no">
-			<DESCRIPTION>specifies that output files should always be written (JDK1.2 only</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="old" REQUIRED="no">
-			<DESCRIPTION>specifies that old JDK1.0-style header files should be generated(otherwise output file contain JNI-style native method      function prototypes) (JDK1.2 only</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="stubs" REQUIRED="no">
-			<DESCRIPTION>generate C declarations from the Java object file (used with old</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="verbose" REQUIRED="no">
-			<DESCRIPTION>causes Javah to print a message concerning the status     of the generated file</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="classpath" REQUIRED="no">
-			<DESCRIPTION>the classpath to use</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="bootclasspath" REQUIRED="no">
-			<DESCRIPTION>location of bootstrap class files</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="extdirs" REQUIRED="no">
-			<DESCRIPTION>location of installed extensions</DESCRIPTION>
-		</ATTRIBUTE>
-	</TASK>
-	<TASK NAME="jdepend">
-		<DESCRIPTION>&lt;P&gt;Invokes the &lt;a href=&quot;http://www.clarkware.com/software/JDepend.html&quot;&gt;JDepend&lt;/a&gt; parser.&lt;/P&gt;
-&lt;P&gt;This parser &amp;quot;traverses a set of Java source file directories and generates design quality metrics for each Java package&amp;quot;.
-It allows to &amp;quot;automatically measure the quality of a design in terms of its extensibility, reusability, and maintainability to
-effectively manage and control package dependencies.&amp;quot;&lt;/P&gt;
-&lt;p&gt;Source file directories are defined by nested &lt;code&gt;&amp;lt;sourcespath&amp;gt;&lt;/code&gt;, see &lt;a href=&quot;#nested&quot;&gt;nested elements&lt;/a&gt;.&lt;/p&gt;
-&lt;p&gt;Optionally, you can also set the &lt;code&gt;outputfile&lt;/code&gt; name where the output is stored. By default the task writes its report to the standard output.&lt;/P&gt;
-&lt;p&gt; The task requires at least the JDepend 1.2 version. &lt;/p&gt;
-&lt;P&gt;Note: whereas the JDepend tool can be customized to exclude some packages, the current jdepend And Task does not have parameters to allow these exclusions. Read JDepend specific documentation for that purpose.&lt;/P&gt;
-</DESCRIPTION>
-		<ATTRIBUTE NAME="outputfile" REQUIRED="no">
-			<DESCRIPTION>The output file name. If not set, the output is printed on the standard output</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="format" REQUIRED="no">
-			<DESCRIPTION>The format to write the output in. The default is &quot;text&quot;, the alternative is &quot;xml</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="fork" REQUIRED="no, default is &quot;off&quot;">
-			<DESCRIPTION>Run the tests in a separate VM</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="haltonerror" REQUIRED="no, default is &quot;off&quot;">
-			<DESCRIPTION>Stop the build process if an error occurs during the jdepend analysis</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="timeout" REQUIRED="no">
-			<DESCRIPTION>Cancel the operation if it doesn't finish in the given time (measured in milliseconds). (Ignored if fork is disabled.</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="jvm" REQUIRED="no, default &quot;java&quot;">
-			<DESCRIPTION>The command used to invoke the Java Virtual Machine, default is 'java'. The command is resolved by java.lang.Runtime.exec(). (Ignored if fork is disabled.</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="dir" REQUIRED="no">
-			<DESCRIPTION>The directory to invoke the VM in. (Ignored if fork is disabled</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="classpathref" REQUIRED="no">
-			<DESCRIPTION>the classpath to use, given as reference to a PATH defined elsewhere</DESCRIPTION>
-		</ATTRIBUTE>
-	</TASK>
-	<TASK NAME="jjtree">
-		<DESCRIPTION>Invokes the &lt;a href=&quot;http://www.webgain.com/products/java_cc/&quot;&gt;JJTree&lt;/a&gt; preprocessor
-for the JavaCC compiler compiler. It inserts parse tree building actions
-at various places in the JavaCC source that it generates. The output of
-JJTree is run through JavaCC to create the parser.
-&lt;p&gt;To use the jjtree task, set the &lt;i&gt;target&lt;/i&gt; attribute to the name
-of the jjtree grammar file to process. You also need to specify the directory
-containing the JavaCC installation using the &lt;i&gt;javacchome&lt;/i&gt; attribute,
-so that ant can find the JavaCC classes. Optionally, you can also set the
-&lt;i&gt;outputdirectory&lt;/i&gt;
-to write the generated file to a specific directory. Otherwise jjtree writes
-the generated JavaCC grammar file to the directory containing the JJTree
-grammar file.&lt;/p&gt;
-&lt;p&gt;This task only invokes JJTree if the grammar file is newer than the
-generated JavaCC file.&lt;/p&gt;
-</DESCRIPTION>
-		<ATTRIBUTE NAME="target" REQUIRED="yes">
-			<DESCRIPTION>The jjtree grammar file to process</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="javacchome" REQUIRED="yes">
-			<DESCRIPTION>The directory containing the JavaCC distribution</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="outputdirectory" REQUIRED="no">
-			<DESCRIPTION>The directory to write the generated file to. If not set,the files are written to the directory containing the grammar file.</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="buildnodefiles" REQUIRED="no">
-			<DESCRIPTION>Sets the BUILD_NODE_FILES grammar option. This is a booleanoption</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="multi" REQUIRED="no">
-			<DESCRIPTION>Sets the MULTI grammar option. This is a boolean option</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="nodedefaultvoid" REQUIRED="no">
-			<DESCRIPTION>Sets the NODE_DEFAULT_VOID grammar option. This is a booleanoption</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="nodefactory" REQUIRED="no">
-			<DESCRIPTION>Sets the NODE_FACTORY grammar option. This is boolean option</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="nodescopehook" REQUIRED="no">
-			<DESCRIPTION>Sets the NODE_SCOPE_HOOK grammar option. This is a booleanoption</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="nodeusesparser" REQUIRED="no">
-			<DESCRIPTION>Sets the NODE_USES_PARSER grammar option. This is a booleanoption</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="static" REQUIRED="no">
-			<DESCRIPTION>Sets the STATIC grammar option. This is a boolean option</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="visitor" REQUIRED="no">
-			<DESCRIPTION>Sets the VISITOR grammar option. This is a boolean option</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="nodepackage" REQUIRED="no">
-			<DESCRIPTION>Sets the NODE_PACKAGE grammar option. This is a string option</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="visitorexception" REQUIRED="no">
-			<DESCRIPTION>Sets the VISITOR_EXCEPTION grammar option. This is a stringoption</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="nodeprefix" REQUIRED="no">
-			<DESCRIPTION>Sets the NODE_PREFIX grammar option. This is a string option</DESCRIPTION>
-		</ATTRIBUTE>
-	</TASK>
-	<TASK NAME="jlink">
-		<DESCRIPTION>&lt;p&gt;Links entries from sub-builds and libraries.&lt;/p&gt;
-&lt;p&gt;The jlink task can be used to build jar and zip files, similar to 
-the &lt;i&gt;jar&lt;/i&gt; task.
-However, jlink provides options for controlling the way entries from 
-input files
-are added to the output file. Specifically, capabilities for merging 
-entries from
-multiple zip or jar files is available.&lt;/p&gt;
-&lt;p&gt;If a mergefile is specified directly (eg. at the top level of a 
-&lt;i&gt;mergefiles&lt;/i&gt;
-pathelement) &lt;i&gt;and&lt;/i&gt; the mergefile ends in &amp;quot;.zip&amp;quot; or 
-&amp;quot;.jar&amp;quot;,
-entries in the mergefile will be merged into the outfile. A file with 
-any other extension
-will be added to the output file, even if it is specified in the 
-mergefiles element.
-Directories specified in either the mergefiles or addfiles element 
-are added to the
-output file as you would expect: all files in subdirectories are 
-recursively added to
-the output file with appropriate prefixes in the output file 
-(without merging).
-&lt;/p&gt;
-&lt;p&gt;
-In the case where duplicate entries and/or files are found among the 
-files to be merged or
-added, jlink merges or adds the first entry and ignores all subsequent entries.
-&lt;/p&gt;
-&lt;p&gt;
-jlink ignores META-INF directories in mergefiles. Users should supply their
-own manifest information for the output file.
-&lt;/p&gt;
-&lt;p&gt;It is possible to refine the set of files that are being jlinked. 
-This can be
-done with the &lt;i&gt;includes&lt;/i&gt;, &lt;i&gt;includesfile&lt;/i&gt;, &lt;i&gt;excludes&lt;/i&gt;, 
-&lt;i&gt;excludesfile&lt;/i&gt;,
-and &lt;i&gt;defaultexcludes&lt;/i&gt; attributes on the &lt;i&gt;addfiles&lt;/i&gt; and 
-&lt;i&gt;mergefiles&lt;/i&gt;
-nested elements. With the &lt;i&gt;includes&lt;/i&gt; or &lt;i&gt;includesfile&lt;/i&gt;
-attribute you specify the files you want to have included by using patterns.
-The &lt;i&gt;exclude&lt;/i&gt; or &lt;i&gt;excludesfile&lt;/i&gt; attribute is used to specify
-the files you want to have excluded. This is also done with patterns. And
-finally with the &lt;i&gt;defaultexcludes&lt;/i&gt; attribute, you can specify whether you
-want to use default exclusions or not. See the section on &lt;a
-href=&quot;../dirtasks.html#directorybasedtasks&quot;&gt;directory based tasks&lt;/a&gt;, on how the
-inclusion/exclusion of files works, and how to write patterns. The patterns are
-relative to the &lt;i&gt;base&lt;/i&gt; directory.&lt;/p&gt;
-</DESCRIPTION>
-		<ATTRIBUTE NAME="outfile" REQUIRED="yes">
-			<DESCRIPTION>the path of the output file</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="compress" REQUIRED="no">
-			<DESCRIPTION>whether or not the output should be compressed. true,yes, or on result in compressed output.If omitted, output will be uncompressed (inflated)</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="mergefiles" REQUIRED="at least one of 
- mergefiles or addfiles">
-			<DESCRIPTION>files to be merged into the output, if possible</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="addfiles" REQUIRED="">
-			<DESCRIPTION>files to be added to the output</DESCRIPTION>
-		</ATTRIBUTE>
-	</TASK>
-	<TASK NAME="jspc">
-		<DESCRIPTION>&lt;p&gt; Ant task to run the JSP compiler and turn JSP pages into Java source.
-&lt;p&gt;
-It can be used to precompile JSP pages for fast initial invocation
-of JSP pages, deployment on a server without the full JDK installed,
-or simply to syntax check the pages without deploying them.
-In most cases, a javac task is usually the next stage in the build process.
-The task does basic dependency checking to prevent unnecessary recompilation -this
-checking compares source and destination timestamps, and does not factor
-in class or taglib dependencies, or &amp;lt;jsp:include&amp;gt; references.
-&lt;p&gt;
-By default the task uses the Jasper JSP compiler. This
-means the task needs jasper.jar and jasper-runtime.jar, which come with
-builds of Tomcat 4/Catalina from the
-&lt;a href=&quot;http://jakarta.apache.org/tomcat/&quot;&gt;Jakarta Tomcat project&lt;/a&gt;
-</DESCRIPTION>
-		<ATTRIBUTE NAME="destdir" REQUIRED="yes">
-			<DESCRIPTION>Where to place the generated files. They are locatedunder here according to the given package name</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="srcdir" REQUIRED="yes">
-			<DESCRIPTION>Where to look for source jsp files</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="verbose" REQUIRED="no">
-			<DESCRIPTION>The verbosity integer to pass to the compiler. Default=&quot;0</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="package" REQUIRED="no">
-			<DESCRIPTION>Name of the destination package for generated javaclasses</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="compiler" REQUIRED="no">
-			<DESCRIPTION>class name of a JSP compiler adapte</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="ieplugin" REQUIRED="no">
-			<DESCRIPTION>Java Plugin classid for Internet Explorer</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="mapped" REQUIRED="no">
-			<DESCRIPTION>(boolean) Generate separate write() calls for each HTMLline in the JSP</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="classpath" REQUIRED="no">
-			<DESCRIPTION>The classpath to use to run the jsp compiler.This can also be specifiedby the nested element classpathPath)</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="classpathref" REQUIRED="no">
-			<DESCRIPTION>A Reference. Asper classpat</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="failonerror" REQUIRED="no">
-			<DESCRIPTION>flag to control action on compile failures: default=ye</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="uribase" REQUIRED="no">
-			<DESCRIPTION>The uri context of relative URIreferences in the JSP pages. If it does notexist then it is derived from the location of the filerelative to the declared or derived value of uriroot.</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="uriroot" REQUIRED="no">
-			<DESCRIPTION>The root directory that uri files should be resolvedagainst.</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="compiler" REQUIRED="no">
-			<DESCRIPTION>Class name of jsp compiler adapter to use.  Defaults tothe standard adapter for Jasper.</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="compilerclasspath" REQUIRED="no">
-			<DESCRIPTION>The classpath used to find the compiler adapter specifiedby the compiler attribute</DESCRIPTION>
-		</ATTRIBUTE>
-	</TASK>
-	<TASK NAME="junit">
-		<DESCRIPTION>&lt;p&gt;This task runs tests from the JUnit testing framework. The latest
-version of the framework can be found at
-&lt;a href=&quot;http://www.junit.org&quot;&gt;http://www.junit.org&lt;/a&gt;.
-This task has been tested with JUnit 3.0 up to JUnit 3.8.1; it won't
-work with versions prior to JUnit 3.0.&lt;/p&gt;
-&lt;p&gt;&lt;strong&gt;Note:&lt;/strong&gt; This task depends on external libraries not included
-in the Ant distribution.  See &lt;a href=&quot;../install.html#librarydependencies&quot;&gt;
-Library Dependencies&lt;/a&gt; for more information.
-&lt;/p&gt;
-&lt;p&gt;
-&lt;strong&gt;Note&lt;/strong&gt;:
-You must have &lt;code&gt;junit.jar&lt;/code&gt; and the class files for the
-&lt;code&gt;&amp;lt;junit&amp;gt;&lt;/code&gt; task in the same classpath.
-You can do one of:
-&lt;ol&gt;
-&lt;li&gt;
-Put both &lt;code&gt;junit.jar&lt;/code&gt; and the optional tasks jar file in
-&lt;code&gt;ANT_HOME/lib&lt;/code&gt;.
-&lt;/li&gt;
-&lt;li&gt;
-Do not put either in &lt;code&gt;ANT_HOME/lib&lt;/code&gt;, and instead
-include their locations in your &lt;code&gt;CLASSPATH&lt;/code&gt; environment variable.
-&lt;/li&gt;
-&lt;li&gt;
-Do neither of the above, and instead, specify their locations using
-a &lt;code&gt;&amp;lt;classpath&amp;gt;&lt;/code&gt; element in the buildfile.
-See &lt;a href=&quot;../../faq.html#delegating-classloader&quot; target=&quot;_top&quot;&gt;the
-FAQ&lt;/a&gt; for details.
-&lt;/ol&gt;
-&lt;/p&gt;
-&lt;p&gt;Tests are defined by nested &lt;code&gt;test&lt;/code&gt; or
-&lt;code&gt;batchtest&lt;/code&gt; tags (see &lt;a href=&quot;#nested&quot;&gt;nested
-elements&lt;/a&gt;).&lt;/p&gt;
-</DESCRIPTION>
-		<ATTRIBUTE NAME="printsummary" REQUIRED="no; default is off.">
-			<DESCRIPTION>Print one-line statistics for each testcase. Cantake the values on,off, andwithOutAndErr.withOutAndErr is the sameas on but also includes the output of the testas written to System.out and System.err</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="fork" REQUIRED="no; default is off.">
-			<DESCRIPTION>Run the tests in a separate VM</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="haltonerror" REQUIRED="no; default is off.">
-			<DESCRIPTION>Stop the build process if an error occurs during the testrun</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="errorproperty" REQUIRED="no">
-			<DESCRIPTION>The name of a property to set in the event of an error</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="haltonfailure" REQUIRED="no; default is off.">
-			<DESCRIPTION>Stop the build process if a test fails (errors areconsidered failures as well)</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="failureproperty" REQUIRED="no.">
-			<DESCRIPTION>The name of a property to set in the event of a failure(errors are considered failures as well)</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="filtertrace" REQUIRED="no; default is on.">
-			<DESCRIPTION>Filter out Junit and Ant stack frames from error and failure stack traces</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="timeout" REQUIRED="no">
-			<DESCRIPTION>Cancel the individual tests if they don't finishin the given time (measured in milliseconds).  Ignored iffork is disabled</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="maxmemory" REQUIRED="no">
-			<DESCRIPTION>Maximum amount of memory to allocate to the forked VM.Ignored if fork is disabled</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="jvm" REQUIRED="no; default is java.">
-			<DESCRIPTION>The command used to invoke the Java Virtual Machine,default is 'java'.  The command is resolved byjava.lang.Runtime.exec().Ignored if fork is disabled</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="dir" REQUIRED="no">
-			<DESCRIPTION>The directory in which to invoke the VM. Ignored iffork is disabled</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="newenvironment" REQUIRED="no; default is false.">
-			<DESCRIPTION>Do not propagate the old environment when newenvironment variables are specified. Ignored if fork isdisabled</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="includeantruntime" REQUIRED="no; default is true.">
-			<DESCRIPTION>Implicitly add the Ant classes required to runthe tests and JUnit to the classpath in forked mode</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="showoutput" REQUIRED="no">
-			<DESCRIPTION>Send any output generated by tests to Ant'slogging system as well as to the formatters.  By default only theformatters receive the output</DESCRIPTION>
-		</ATTRIBUTE>
-	</TASK>
-	<TASK NAME="maudit">
-		<DESCRIPTION>&lt;p&gt;
-Invokes the Metamata Audit/ Webgain Quality Analyzer on a set of Java files.
-&lt;/p&gt;
-&lt;p&gt;
-&lt;i&gt;maudit&lt;/i&gt; performs static analysis of the Java source code and byte code files to find and report
-errors of style and potential problems related to performance, maintenance and robustness.
-.  As a convenience, a stylesheet is given in &lt;tt&gt;etc&lt;/tt&gt; directory, so that an HTML report can be generated from the XML file.
-&lt;/p&gt;
-</DESCRIPTION>
-		<ATTRIBUTE NAME="tofile" REQUIRED="yes">
-			<DESCRIPTION>The XML file to which the Audit result should be written to</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="metamatahome" REQUIRED="yes">
-			<DESCRIPTION>The home directory containing the Metamata distribution</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="fix" REQUIRED="no.default to false.">
-			<DESCRIPTION>Automatically fix certain errors (those marked as fixable in the manual).</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="list" REQUIRED="no. default to false.">
-			<DESCRIPTION>Creates listing file for each audited file. A .maudit file will be generated in thesame location as the source file.</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="unused" REQUIRED="no. default to false.">
-			<DESCRIPTION>Finds declarations unused in search paths. It will look for unused global declarationsin the source code within a use domain specified by the searchpath element.</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="maxmemory" REQUIRED="no">
-			<DESCRIPTION>Set the maximum memory for the JVM. this is a convenientway to set the -mx or -Xmx argument</DESCRIPTION>
-		</ATTRIBUTE>
-	</TASK>
-	<TASK NAME="mimemail">
-		<DESCRIPTION>&lt;p&gt;Sends SMTP mail with MIME attachments.
-&lt;a href=&quot;http://java.sun.com/products/javamail/index.html&quot;&gt;JavaMail&lt;/a&gt;
-and &lt;a href=&quot;http://java.sun.com/products/javabeans/glasgow/jaf.html&quot;&gt;Java
-Activation Framework&lt;/a&gt; are required for this task.&lt;/p&gt;
-&lt;p&gt;Multiple files can be attached using &lt;a href=&quot;../CoreTypes/fileset.html&quot;&gt;FileSets.&lt;/a&gt;&lt;/p&gt;
-</DESCRIPTION>
-		<ATTRIBUTE NAME="message" REQUIRED="no, but only one of of 'message' or
-       'messagefile' may be specified. if not specified, a fileset must be
-       provided.">
-			<DESCRIPTION>The message bod</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="messagefile" REQUIRED="">
-			<DESCRIPTION>A filename to read and used as the message bod</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="messagemimetype" REQUIRED="no, defaults to &quot;text/plain&quot;">
-			<DESCRIPTION>MIME type to use for 'message' or 'messageFile' whenattached</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="tolist" REQUIRED="yes, at least one of 'tolist', 'cclist',
-       or 'bcclist' must be specified.">
-			<DESCRIPTION>Comma-separated list of To: recipient</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="cclist" REQUIRED="">
-			<DESCRIPTION>Comma-separated list of CC: recipient</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="bcclist" REQUIRED="">
-			<DESCRIPTION>Comma-separated list of BCC: recipient</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="mailhost" REQUIRED="no, default to &quot;localhost&quot;">
-			<DESCRIPTION>Host name of the mail server</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="subject" REQUIRED="no">
-			<DESCRIPTION>Email subject line</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="from" REQUIRED="yes">
-			<DESCRIPTION>Email address of sender</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="failonerror" REQUIRED="no, default to &quot;true&quot;">
-			<DESCRIPTION>Stop the build process if an error occurs sending thee-mail</DESCRIPTION>
-		</ATTRIBUTE>
-	</TASK>
-	<TASK NAME="mmetrics">
-		<DESCRIPTION>&lt;p&gt;
-Invokes the Metamata Metrics / WebGain Quality Analyzer source code 
-analyzer on a set of Java files.
-&lt;/p&gt;
-&lt;p&gt;
-&lt;i&gt;mmetrics&lt;/i&gt; will compute the metrics of a set of Java files and write the results to an XML
-file. As a convenience, a stylesheet is given in &lt;tt&gt;etc&lt;/tt&gt; directory, so that an HTML report can be generated from the XML file.
-&lt;/p&gt;
-</DESCRIPTION>
-		<ATTRIBUTE NAME="metamatahome" REQUIRED="yes">
-			<DESCRIPTION>The home directory containing the Metamata distribution</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="tofile" REQUIRED="yes">
-			<DESCRIPTION>The XML were the resulting metrics will be written to</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="granularity" REQUIRED="yes">
-			<DESCRIPTION>Metrics granularity of the source files. Must be eitherfiles (compilation-units), types (types and compilation-units) or methods(methods, types and compilation-units).</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="maxmemory" REQUIRED="no">
-			<DESCRIPTION>Set the maximum memory for the JVM. this is a convenientway to set the -mx or -Xmx argument</DESCRIPTION>
-		</ATTRIBUTE>
-	</TASK>
-	<TASK NAME="mparse">
-		<DESCRIPTION>&lt;p&gt;
-Invokes the Metamata &lt;a HREF=&quot;http://www.metamata.com/parse.html&quot;&gt;MParse&lt;/a&gt; compiler 
-compiler on a grammar file.
-&lt;/p&gt;
-&lt;p&gt;
-To use the &lt;i&gt;mparse&lt;/i&gt; task, set the &lt;i&gt;target&lt;/i&gt; attribute to the name of the 
-grammar file to process.  You also need to specify the directory containing 
-the Metamata installation using the &lt;i&gt;metamatahome&lt;/i&gt; attribute, so that Ant 
-can find the MParse classes.
-&lt;/p&gt;
-&lt;p&gt;
-This task only invokes MParse if the grammar file is newer than the generated 
-Java files. MParse assumes that the Java class name of the generated parser
-is the same as the name of the grammar file, less the .jj extension.
-&lt;/p&gt;
-&lt;p&gt;For additional information about MParse, please consult the online manual available &lt;a href=&quot;http://download.metamata.com/parse.pdf&quot;&gt;here&lt;/a&gt;
-(PDF)
-&lt;/p&gt;
-</DESCRIPTION>
-		<ATTRIBUTE NAME="target" REQUIRED="yes">
-			<DESCRIPTION>The .jj grammar file to process. It will only be processedif the grammar is newer than the corresponding .java file</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="metamatahome" REQUIRED="yes">
-			<DESCRIPTION>The home directory containing the Metamata distribution</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="verbose" REQUIRED="no">
-			<DESCRIPTION>Enable all messages</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="debugparser" REQUIRED="no">
-			<DESCRIPTION>Enables parser debugging</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="debugscanner" REQUIRED="no">
-			<DESCRIPTION>Enables scanner debugging</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="cleanup" REQUIRED="no. default to false">
-			<DESCRIPTION>Remove the intermediate SunJavaCC file created during the transformation of the grammar file</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="maxmemory" REQUIRED="no">
-			<DESCRIPTION>Set the maximum memory for the JVM. this is a convenientway to set the -mx or -Xmx argument</DESCRIPTION>
-		</ATTRIBUTE>
-	</TASK>
-	<TASK NAME="native2ascii">
-		<DESCRIPTION>&lt;p&gt;
-Converts files from native encodings to ASCII with escaped Unicode.
-A common usage is to convert source files maintained in a native
-operating system encoding, to ASCII prior to compilation.
-&lt;/p&gt;
-&lt;p&gt;
-Files in the directory &lt;em&gt;src&lt;/em&gt;
-are converted from a native encoding to ASCII.
-By default, all files in the directory are converted.
-However, conversion may be limited to selected files using
-&lt;em&gt;includes&lt;/em&gt; and &lt;em&gt;excludes&lt;/em&gt; attributes.
-For more information on file matching patterns,
-see the section on
-&lt;a href=&quot;../dirtasks.html#directorybasedtasks&quot;&gt;directory based tasks&lt;/a&gt;.
-If no &lt;em&gt;encoding&lt;/em&gt; is specified,
-the default encoding for the JVM is used.
-If &lt;em&gt;ext&lt;/em&gt; is specified, then output files are renamed
-to use it as a new extension.
-More sophisticated file name translations can be achieved using a nested
-&lt;em&gt;&amp;lt;mapper&amp;gt;&lt;/em&gt; element. By default an
-&lt;a href=&quot;../CoreTypes/mapper.html#identity-mapper&quot;&gt;identity mapper&lt;/a&gt; will be used.
-If &lt;em&gt;dest&lt;/em&gt; and &lt;em&gt;src&lt;/em&gt; point to the same directory,
-the &lt;em&gt;ext&lt;/em&gt; attribute or a nested &lt;em&gt;&amp;lt;mapper&amp;gt;&lt;/em&gt;
-is required.
-&lt;/p&gt;
-&lt;p&gt;
-This task forms an implicit &lt;a href=&quot;../CoreTypes/fileset.html&quot;&gt;File Set&lt;/a&gt;,
-and supports all attributes of &lt;code&gt;&amp;lt;fileset&amp;gt;&lt;/code&gt;
-(&lt;code&gt;dir&lt;/code&gt; becomes &lt;code&gt;src&lt;/code&gt;) as well as
-nested &lt;code&gt;&amp;lt;include&amp;gt;&lt;/code&gt;, &lt;code&gt;&amp;lt;exclude&amp;gt;&lt;/code&gt;,
-and &lt;code&gt;&amp;lt;patternset&amp;gt;&lt;/code&gt; elements.
-&lt;/p&gt;
-</DESCRIPTION>
-		<ATTRIBUTE NAME="reverse" REQUIRED="no">
-			<DESCRIPTION>Reverse the sense of the conversion,i.e. convert from ASCII to nativ</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="encoding" REQUIRED="no">
-			<DESCRIPTION>The native encoding the files are in(default is the default encoding for the JVM</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="src" REQUIRED="no">
-			<DESCRIPTION>The directory to find files in (default is basedir</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="dest" REQUIRED="yes">
-			<DESCRIPTION>The directory to output file t</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="ext" REQUIRED="no">
-			<DESCRIPTION>File extension to use in renaming output file</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="defaultexcludes" REQUIRED="no">
-			<DESCRIPTION>indicates whether default excludes should be used or not(&quot;yes&quot;/&quot;no&quot;).Default excludes are used when omitted.</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="includes" REQUIRED="no">
-			<DESCRIPTION>comma- or space-separated list of patterns of files that must beincluded. All files are included when omitted</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="includesfile" REQUIRED="no">
-			<DESCRIPTION>the name of a file. Each line of this file istaken to be an include patter</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="excludes" REQUIRED="no">
-			<DESCRIPTION>comma- or space-separated list of patterns of files that must be excluded.No files (except default excludes) are excluded when omitted</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="excludesfile" REQUIRED="no">
-			<DESCRIPTION>the name of a file. Each line of this file istaken to be an exclude patter</DESCRIPTION>
-		</ATTRIBUTE>
-	</TASK>
-	<TASK NAME="netrexxc">
-		<DESCRIPTION>&lt;p&gt;Compiles a &lt;a href=&quot;http://www2.hursley.ibm.com/netrexx&quot; target=&quot;_top&quot;&gt;NetRexx&lt;/a&gt;
-source tree within the running (Ant) VM.&lt;/p&gt;
-&lt;p&gt;The source and destination directory will be recursively scanned for
-NetRexx source files to compile.  Only NetRexx files that have no corresponding
-class file or where the class file is older than the java file will be compiled.&lt;/p&gt;
-&lt;p&gt;Files in the source tree are copied to the destination directory,
-allowing support files to be located properly in the classpath. The source
-files are copied because the NetRexx compiler cannot produce class files in a
-specific directory via parameters&lt;/p&gt;
-&lt;p&gt;The directory structure of the source tree should follow the package
-hierarchy.&lt;/p&gt;
-&lt;p&gt;It is possible to refine the set of files that are being compiled/copied.
-This can be done with the &lt;i&gt;includes&lt;/i&gt;, &lt;i&gt;includesfile&lt;/i&gt;, &lt;i&gt;excludes&lt;/i&gt;, &lt;i&gt;excludesfile&lt;/i&gt; and
-&lt;i&gt;defaultexcludes&lt;/i&gt; attributes. With the &lt;i&gt;includes&lt;/i&gt; or &lt;i&gt;includesfile&lt;/i&gt; attribute you
-specify the files you want to have included by using patterns. The
-&lt;i&gt;exclude&lt;/i&gt; or &lt;i&gt;excludesfile&lt;/i&gt; attribute is used to specify the files you want to have
-excluded.  This is also done with patterns.  And finally with the
-&lt;i&gt;defaultexcludes&lt;/i&gt; attribute, you can specify whether you
-want to use default exclusions or not. See the section on &lt;a
-href=&quot;../dirtasks.html#directorybasedtasks&quot;&gt;directory based tasks&lt;/a&gt;, on how the
-inclusion/exclusion of files works, and how to write patterns.&lt;/p&gt;
-&lt;p&gt;This task forms an implicit &lt;a href=&quot;../CoreTypes/fileset.html&quot;&gt;FileSet&lt;/a&gt; and
-supports all attributes of &lt;code&gt;&amp;lt;fileset&amp;gt;&lt;/code&gt;
-(&lt;code&gt;dir&lt;/code&gt; becomes &lt;code&gt;srcdir&lt;/code&gt;) as well as the nested
-&lt;code&gt;&amp;lt;include&amp;gt;&lt;/code&gt;, &lt;code&gt;&amp;lt;exclude&amp;gt;&lt;/code&gt; and
-&lt;code&gt;&amp;lt;patternset&amp;gt;&lt;/code&gt; elements.&lt;/p&gt;
-&lt;p&gt;All properties except classpath, srcdir and destDir are also available as properties in the form
-&lt;code&gt;ant.netrexxc.&lt;i&gt;attributename&lt;/i&gt;&lt;/code&gt;, eg.&lt;br&gt;
-&lt;code&gt;&amp;lt;property name=&quot;ant.netrexxc.verbose&quot; value=&quot;noverbose&quot;/&amp;gt;&lt;/code&gt;&lt;br&gt;
-or from the command line as&lt;br&gt;
-&lt;code&gt;ant -Dant.netrexxc.verbose=noverbose ...&lt;/code&gt;
-&lt;/p&gt;
-</DESCRIPTION>
-		<ATTRIBUTE NAME="binary" REQUIRED="no">
-			<DESCRIPTION>Whether literals are treated as the java binarytype rather than the NetRexx type</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="classpath" REQUIRED="no">
-			<DESCRIPTION>The classpath to use during compilatio</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="comments" REQUIRED="no">
-			<DESCRIPTION>Whether comments are passed through to thegenerated java sourc</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="compact" REQUIRED="no">
-			<DESCRIPTION>Whether error messages come out in compact orverbose format. Default is the compact format</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="compile" REQUIRED="no">
-			<DESCRIPTION>Whether the NetRexx compiler should compile thegenerated java cod</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="console" REQUIRED="no">
-			<DESCRIPTION>Whether or not messages should be displayed on the'console</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="crossref" REQUIRED="no">
-			<DESCRIPTION>Whether variable cross references are generate</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="decimal" REQUIRED="no">
-			<DESCRIPTION>Whether decimal arithmetic should be used for theNetRexx cod</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="defaultexcludes" REQUIRED="no">
-			<DESCRIPTION>indicates whether default excludes should be used or not(&quot;yes&quot;/&quot;no&quot;). Default excludes are used whenomitted</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="destdir" REQUIRED="yes">
-			<DESCRIPTION>the destination directory into which the NetRexxsource files should be copied and then compile</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="diag" REQUIRED="no">
-			<DESCRIPTION>Whether diagnostic information about the compile isgenerate</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="excludes" REQUIRED="no">
-			<DESCRIPTION>comma- or space-separated list of patterns of files that must beexcluded. No files (except default excludes) are excluded whenomitted</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="excludesfile" REQUIRED="no">
-			<DESCRIPTION>the name of a file. Each line of this file istaken to be an exclude patter</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="explicit" REQUIRED="no">
-			<DESCRIPTION>Whether variables must be declared explicitlybefore us</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="format" REQUIRED="no">
-			<DESCRIPTION>Whether the generated java code is formatted nicelyor left to match NetRexx line numbers for call stack debuggin</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="includes" REQUIRED="no">
-			<DESCRIPTION>comma- or space-separated list of patterns of files that must beincluded. All files are included when omitted</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="includesfile" REQUIRED="no">
-			<DESCRIPTION>the name of a file. Each line of this file istaken to be an include patter</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="java" REQUIRED="no">
-			<DESCRIPTION>Whether the generated java code is produce</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="keep" REQUIRED="no">
-			<DESCRIPTION>Sets whether the generated java source file should be keptafter compilation. The generated files will have an extension of.java.keep, not .jav</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="logo" REQUIRED="no">
-			<DESCRIPTION>Whether the compiler text logo is displayed whencompilin</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="replace" REQUIRED="no">
-			<DESCRIPTION>Whether the generated .java file should be replacedwhen compilin</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="savelog" REQUIRED="no">
-			<DESCRIPTION>Whether the compiler messages will be written toNetRexxC.log as well as to the consol</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="sourcedir" REQUIRED="no">
-			<DESCRIPTION>Tells the NetRexx compiler to store the class files in thesame directory as the source files. The alternative is the workingdirector</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="srcdir" REQUIRED="yes">
-			<DESCRIPTION>Set the source dir to find the source NetRexxfile</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="strictargs" REQUIRED="no">
-			<DESCRIPTION>Tells the NetRexx compiler that method calls alwaysneed parentheses, even if no arguments are needed, e.g.aStringVar.getBytes vs.aStringVar.getBytes(</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="strictassign" REQUIRED="no">
-			<DESCRIPTION>Tells the NetRexx compile that assignments mustmatch exactly on typ</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="strictcase" REQUIRED="no">
-			<DESCRIPTION>Specifies whether the NetRexx compiler should becase sensitive or no</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="strictimport" REQUIRED="no">
-			<DESCRIPTION>Whether classes need to be imported explicitly using animport statement.  By default the NetRexx compiler willimport certain packages automaticall</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="strictprops" REQUIRED="no">
-			<DESCRIPTION>Whether local properties need to be qualifiedexplicitly using thi</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="strictsignal" REQUIRED="no">
-			<DESCRIPTION>Whether the compiler should force catching ofexceptions by explicitly named type</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="symbols" REQUIRED="no">
-			<DESCRIPTION>Whether debug symbols should be generated into theclass fil</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="time" REQUIRED="no">
-			<DESCRIPTION>Asks the NetRexx compiler to print compilationtimes to the consol</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="trace" REQUIRED="no">
-			<DESCRIPTION>Turns on or off tracing and directs the resultanttrace outpu</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="utf8" REQUIRED="no">
-			<DESCRIPTION>Tells the NetRexx compiler that the source is in UTF</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="verbose" REQUIRED="no">
-			<DESCRIPTION>Whether lots of warnings and error messages shouldbe generate</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="suppressmethodargumentnotused" REQUIRED="no">
-			<DESCRIPTION>Tells whether we should filter out the&amp;Method argument not used&amp; messages in strictargs mode</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="suppressprivatepropertynotused" REQUIRED="no">
-			<DESCRIPTION>Tells whether we should filter out the&amp;Private Property defined, but not used&amp; messages in strictargs mode</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="suppressvariablenotused" REQUIRED="no">
-			<DESCRIPTION>Tells whether we should filter out the&amp;Variable set but not used&amp; messages in strictargs mode.Please be careful with this one, as you can hide errors behind it</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="suppressexceptionnotsignalled" REQUIRED="no">
-			<DESCRIPTION>Tells whether we should filter out the&amp;Exception is declared, but not signalled within the method&amp;messages in strictsignal mode</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="suppressdeprecation" REQUIRED="no">
-			<DESCRIPTION>Tells wether we should filter out any deprecation-messagesof the compiler out</DESCRIPTION>
-		</ATTRIBUTE>
-	</TASK>
-	<TASK NAME="pvcs">
-		<DESCRIPTION>The pvcs task is set to point at a PVCS repository and optionally a project
-within that repository, and can from that specification get the latest
-version of the files contained by the repository.
-</DESCRIPTION>
-		<ATTRIBUTE NAME="repository" REQUIRED="yes">
-			<DESCRIPTION>The location of the repository (see your PVCSmanuals</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="pvcsproject" REQUIRED="no">
-			<DESCRIPTION>The project within the PVCS repository to extractfiles from (&quot;/&quot; is root project and that is default if this attribute isn'tspecified</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="label" REQUIRED="no">
-			<DESCRIPTION>Only files marked with this label are extracted</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="promotiongroup" REQUIRED="no">
-			<DESCRIPTION>Only files within this promotion group are extracted. Usingboth the label and the promotiongroup tag will cause the files in thepromotion group and with that label to be extracted.</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="force" REQUIRED="no">
-			<DESCRIPTION>If set to yes all files that exists and are writable are overwritten. Default no causes the files that are writable to be ignored. This stops the PVCS command get to stop asking questions</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="workspace" REQUIRED="no">
-			<DESCRIPTION>By specifying a workspace, the files are extracted to that location. A PVCS workspace is aname for a location of the workfiles and isn't as such the location itself. You define the location for a workspaceusing the PVCS GUI clients. If this isn't specified the default workspace for the current user is used</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="pvcsbin" REQUIRED="no">
-			<DESCRIPTION>On some systems the PVCS executables pcliand get are not found in the PATH. In such cases this attributeshould be set to the bin directory of the PVCS installation containingthe executables mentioned before. If this attribute isn't specified thetag expects the executables to be found using the PATH environment variable</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="ignorereturncode" REQUIRED="no">
-			<DESCRIPTION>If set to true the return value from executingthe pvcs commands are ignored</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="updateonly" REQUIRED="no">
-			<DESCRIPTION>If set to true files are gotten only ifnewer than existing local files</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="filenameformat" REQUIRED="no">
-			<DESCRIPTION>The format of your folder names in aformat suitable for java.text.MessageFormat.Defaults to {0}-arc({1}).  Repositories wherethe archive extension is not  -arc should setthis</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="linestart" REQUIRED="no">
-			<DESCRIPTION>Used to parse the output of the pclicommand. It defaults to &quot;P:.  The parser alreadyknows about / and \\, this property is useful in cases where therepository is accessed on a Windows platform via a drive lettermapping</DESCRIPTION>
-		</ATTRIBUTE>
-	</TASK>
-	<TASK NAME="renameextensions">
-		<DESCRIPTION>&lt;p&gt;Renames files in the &lt;code&gt;srcDir&lt;/code&gt; directory ending with the
-&lt;code&gt;fromExtension&lt;/code&gt; string so that they end with the
-&lt;code&gt;toExtension&lt;/code&gt; string. Files are only replaced if
-&lt;code&gt;replace&lt;/code&gt; is true
-&lt;/p&gt;
-&lt;p&gt;See the section on
-&lt;a href=&quot;../dirtasks.html#directorybasedtasks&quot;&gt;directory based tasks&lt;/a&gt;, on how the
-inclusion/exclusion of files works, and how to write patterns.
-This task forms an implicit &lt;a href=&quot;../CoreTypes/fileset.html&quot;&gt;FileSet&lt;/a&gt; and
-supports all attributes of &lt;code&gt;&amp;lt;fileset&amp;gt;&lt;/code&gt;
-(&lt;code&gt;dir&lt;/code&gt; becomes &lt;code&gt;srcDir&lt;/code&gt;) as well as the nested
-&lt;code&gt;&amp;lt;include&amp;gt;&lt;/code&gt;, &lt;code&gt;&amp;lt;exclude&amp;gt;&lt;/code&gt; and
-&lt;code&gt;&amp;lt;patternset&amp;gt;&lt;/code&gt; elements.&lt;/p&gt;
-</DESCRIPTION>
-		<ATTRIBUTE NAME="defaultexcludes" REQUIRED="no">
-			<DESCRIPTION>indicates whether default excludes should be used or not(&quot;yes&quot;/&quot;no&quot;). Default excludes are used whenomitted</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="excludes" REQUIRED="no">
-			<DESCRIPTION>comma- or space-separated list of patterns of files that must beexcluded. No files (except default excludes) are excluded whenomitted</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="excludesfile" REQUIRED="no">
-			<DESCRIPTION>the name of a file. Each line of this file istaken to be an exclude patter</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="fromextention" REQUIRED="yes">
-			<DESCRIPTION>The string that files must end in to be rename</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="includes" REQUIRED="no">
-			<DESCRIPTION>comma- or space-separated list of patterns of files that must beincluded. All files are included when omitted</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="includesfile" REQUIRED="no">
-			<DESCRIPTION>the name of a file. Each line of this file istaken to be an include patter</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="replace" REQUIRED="no">
-			<DESCRIPTION>Whether the file being renamed to should bereplaced if it already exist</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="srcdir" REQUIRED="yes">
-			<DESCRIPTION>The starting directory for files to search i</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="toextension" REQUIRED="yes">
-			<DESCRIPTION>The string that renamed files will end with oncompletio</DESCRIPTION>
-		</ATTRIBUTE>
-	</TASK>
-	<TASK NAME="replaceregeexp">
-		<DESCRIPTION>&lt;p&gt;ReplaceRegExp is a directory based task for replacing the
-occurrence of a given regular expression with a substitution pattern
-in a selected file or set of files.&lt;/p&gt;
-&lt;p&gt;Similar to &lt;a href=&quot;../CoreTypes/mapper.html#regexp-mapper&quot;&gt;regexp
-type mappers&lt;/a&gt; this task needs a supporting regular expression
-library and an implementation of
-&lt;code&gt;org.apache.tools.ant.util.regexp.Regexp&lt;/code&gt;.  Ant comes with
-implementations for
-&lt;a href=&quot;http://java.sun.com/j2se/1.4/docs/api/java/util/regex/package-summary.html&quot; target=&quot;_top&quot;&gt;the java.util.regex package of JDK 1.4&lt;/a&gt;,
-&lt;a href=&quot;http://jakarta.apache.org/regexp/&quot; target=&quot;_top&quot;&gt;jakarta-regexp&lt;/a&gt;
-and &lt;a href=&quot;http://jakarta.apache.org/oro/&quot; target=&quot;_top&quot;&gt;jakarta-ORO&lt;/a&gt;,
-but you will still need the library itself.&lt;/p&gt;
-&lt;p&gt;
-&lt;i&gt;
-There are cross-platform issues for matches related to line terminator.
-For example if you use $ to anchor your regular expression on the end of a line
-the results might be very different depending on both your platform and the regular
-expression library you use. It is 'highly recommended' that you test your pattern on
-both Unix and Windows platforms before you rely on it.
-&lt;ul&gt;
-&lt;li&gt;Jakarta Oro defines a line terminator as '\n' and is consistent with Perl.&lt;/li&gt;
-&lt;li&gt;Jakarta RegExp uses a system-dependant line terminator.&lt;/li&gt;
-&lt;li&gt;JDK 1.4 uses '\n', '\r\n', '\u0085', '\u2028', '\u2029' as a default
-but is configured in the wrapper to use only '\n' (UNIX_LINE)&lt;/li&gt;
-&lt;/ul&gt;
-We &lt;b&gt;strongly&lt;/b&gt; recommend that you use Jakarta Oro.
-&lt;/i&gt;
-&lt;/p&gt;
-</DESCRIPTION>
-		<ATTRIBUTE NAME="file" REQUIRED="yes if no nested &lt;fileset&gt; is used">
-			<DESCRIPTION>file for which the regular expression should be replaced</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="match" REQUIRED="yes, if no nested &lt;regexp&gt; is used">
-			<DESCRIPTION>The regular expression pattern to match in the file(s</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="replace" REQUIRED="yes, if no nested &lt;substitution&gt; is used">
-			<DESCRIPTION>The substitution pattern to place in the file(s) in placeof the regular expression</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="flags" REQUIRED="no">
-			<DESCRIPTION>The flags to use when matching the regular expression.  For moreinformation, consult the Perl5 syntag : Global replacement.  Replace all occurences founi : Case Insensitive.  Do not consider case in the matcm : Multiline.  Treat the string as multiple lines of input, using &quot;^&quot; and &quot;$&quot; as the start or end of any line, respectively, rather than start or end of strings : Singleline.  Treat the string as a single line of input, using &quot;.&quot; to match any character, including a newline, which normally, it would not match</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="byline" REQUIRED="no">
-			<DESCRIPTION>Process the file(s) one line at a time, executing the replacementon one line at a time (true/false).  This is useful if youwant to only replace the first occurence of a regular expression oneach line, which is not easy to do when processing the file as a whole.Defaults to false</DESCRIPTION>
-		</ATTRIBUTE>
-	</TASK>
-	<TASK NAME="rpm">
-		<DESCRIPTION>&lt;p&gt;
-A basic task for invoking the rpm executable to build a Linux installation
-file. The task currently only works on Linux or other Unix platforms
-with rpm support.
-&lt;/p&gt;
-</DESCRIPTION>
-		<ATTRIBUTE NAME="specfile" REQUIRED="yes">
-			<DESCRIPTION>The name of the spec File to be used</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="topdir" REQUIRED="no">
-			<DESCRIPTION>this is the directory which will have the expectedsubdirectories, SPECS, SOURCES, BUILD, SRPMS.  If this isn't specified,the baseDir value is used</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="cleanbuilddir" REQUIRED="no">
-			<DESCRIPTION>This will remove the generated files in the BUILDdirectory</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="removespec" REQUIRED="no">
-			<DESCRIPTION>this will remove the spec file from SPEC</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="removesource" REQUIRED="no">
-			<DESCRIPTION>Flag (optional, default=false) to remove the sources after the build.See the the --rmsource  option of rpmbuild</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="command" REQUIRED="no">
-			<DESCRIPTION>very similar idea to the cvs task.  the default is &quot;-bb</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="output/error" REQUIRED="no">
-			<DESCRIPTION>where standard output and error g</DESCRIPTION>
-		</ATTRIBUTE>
-	</TASK>
-	<TASK NAME="script">
-		<DESCRIPTION>&lt;p&gt;Execute a script in a 
-&lt;a href=&quot;http://www-124.ibm.com/developerworks/projects/bsf&quot; target=&quot;_top&quot;&gt;BSF&lt;/a&gt; supported language.&lt;/p&gt;
-&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This task depends on external libraries not included in the Ant distribution.
-See &lt;a href=&quot;../install.html#librarydependencies&quot;&gt;Library Dependencies&lt;/a&gt; for more information.&lt;/p&gt;
-&lt;p&gt;All items (tasks, targets, etc) of the running project are
-accessible from the script, using either their &lt;code&gt;name&lt;/code&gt; or
-&lt;code&gt;id&lt;/code&gt; attributes (as long as their names are considered
-valid Java identifiers, that is). 
-The name &quot;project&quot; is a pre-defined reference to the Project, which can be
-used instead of the project name.&lt;/p&gt;
-&lt;p&gt;&lt;b&gt;BeanShell users:&lt;/b&gt; This task now natively supports the BeanShell
-scripting language, using language=&quot;beanshell&quot;. The BeanShell engine is
-still required.
-&lt;/p&gt;
-&lt;p&gt;Scripts can do almost anything a task written in Java could do.&lt;/p&gt;
-</DESCRIPTION>
-		<ATTRIBUTE NAME="language" REQUIRED="yes">
-			<DESCRIPTION>The programming language the script is written in.Must be a supported BSF languag</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="src" REQUIRED="no">
-			<DESCRIPTION>The location of the script as a file, if not inlin</DESCRIPTION>
-		</ATTRIBUTE>
-	</TASK>
-	<TASK NAME="serverdeploy">
-		<DESCRIPTION>&lt;p&gt;The &lt;code&gt;serverdeploy&lt;/code&gt; task is used to run a &quot;hot&quot; deployment tool for
-vendor-specific J2EE server. The task requires nested elements which define
-the attributes of the vendor-specific deployment tool being executed.
-Vendor-specific deployment tools elements may enforce rules for which
-attributes are required, depending on the tool.
-&lt;/p&gt;
-</DESCRIPTION>
-		<ATTRIBUTE NAME="action" REQUIRED="yes">
-			<DESCRIPTION>This is the action to be performed.  For most cases thiswill be &quot;deploy&quot;.  Some tools support additional actions, such as &quot;delete&quot;, &quot;list&quot;,&quot;undeploy&quot;, &quot;update&quot;..</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="source" REQUIRED="tool dependant">
-			<DESCRIPTION>A fully qualified path/filename of the component to be deployed.This may be an .ear, .jar, .war, or any other type that is supported by the server.</DESCRIPTION>
-		</ATTRIBUTE>
-	</TASK>
-	<TASK NAME="splash">
-		<DESCRIPTION>&lt;p&gt;This task creates a splash screen. The splash screen is displayed
-for the duration of the build and includes a handy progress bar as
-well. Use in conjunction with the sound task to provide interest
-whilst waiting for your builds to complete...&lt;/p&gt;
-</DESCRIPTION>
-		<ATTRIBUTE NAME="imageurl" REQUIRED="no">
-			<DESCRIPTION>A URL pointing to an image to display</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="showduration" REQUIRED="no">
-			<DESCRIPTION>Initial period to pause the build to show thesplash in milliseconds</DESCRIPTION>
-		</ATTRIBUTE>
-	</TASK>
-	<TASK NAME="stylebook">
-		<DESCRIPTION>&lt;p&gt;This executes the apache Stylebook documentation generator. 
-Unlike the commandline version of this tool, all three arguments
-are required to run stylebook.&lt;/p&gt;
-&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This task depends on external libraries not included in the Ant distribution.
-See &lt;a href=&quot;../install.html#librarydependencies&quot;&gt;Library Dependencies&lt;/a&gt; for more information.&lt;/p&gt;
-&lt;p&gt;
-Being extended from &amp;lt;Java&amp;gt;, all the parent's attributes
-and options are available. Do not set any apart from the &lt;tt&gt;classpath&lt;/tt&gt;
-as they are not guaranteed to be there in future.
-&lt;/p&gt;
-</DESCRIPTION>
-		<ATTRIBUTE NAME="book" REQUIRED="yes">
-			<DESCRIPTION>the book xml file that the documentation generation starts from</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="skindirectory" REQUIRED="yes">
-			<DESCRIPTION>the directory that contains the stylebook skin</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="targetdirectory" REQUIRED="yes">
-			<DESCRIPTION>the destination directory where the documentation is generated </DESCRIPTION>
-		</ATTRIBUTE>
-	</TASK>
-	<TASK NAME="telnet">
-		<DESCRIPTION>Task to automate a remote telnet session. The task uses 
-nested &lt;tt&gt;&amp;lt;read&amp;gt;&lt;/tt&gt; to indicate strings to wait for, and
-&lt;tt&gt;&amp;lt;write&amp;gt;&lt;/tt&gt; tags to specify text to send.  
-&lt;p&gt;If you do specify a userid and password, the system will 
-assume a common unix prompt to wait on. This behavior can be easily over-ridden.&lt;/p&gt;
-&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This task depends on external libraries not included in the Ant distribution.
-See &lt;a href=&quot;../install.html#librarydependencies&quot;&gt;Library Dependencies&lt;/a&gt; for more information.&lt;/p&gt;
-</DESCRIPTION>
-		<ATTRIBUTE NAME="userid" REQUIRED="only if password is specified">
-			<DESCRIPTION>the login id to use on the telnet server</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="password" REQUIRED="only if userid is specified">
-			<DESCRIPTION>the login password to use on the telnet server</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="server" REQUIRED="yes">
-			<DESCRIPTION>the address of the remote telnet server</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="port" REQUIRED="no">
-			<DESCRIPTION>the port number of the remote telnet server. Defaults to port 23</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="initialcr" REQUIRED="no">
-			<DESCRIPTION>send a cr after connecting (&quot;yes&quot;). Defaults to &quot;no&quot;</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="timeout" REQUIRED="no">
-			<DESCRIPTION>set a default timeout to wait for a response. Specified in seconds. Default is no timeout</DESCRIPTION>
-		</ATTRIBUTE>
-	</TASK>
-	<TASK NAME="test">
-		<DESCRIPTION>&lt;p&gt;This is a primitive task to execute a unit test in the org.apache.testlet framework.&lt;/p&gt;
-&lt;p&gt;&lt;strong&gt;Note:&lt;/strong&gt; This task depends on external libraries not included
-in the Ant distribution.  See &lt;a href=&quot;../install.html#librarydependencies&quot;&gt;
-Library Dependencies&lt;/a&gt; for more information.
-&lt;/p&gt;
-</DESCRIPTION>
-		<ATTRIBUTE NAME="showsuccess" REQUIRED="no">
-			<DESCRIPTION>a boolean value indicating whether tests should display a message on success</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="showbanner" REQUIRED="no">
-			<DESCRIPTION>a boolean value indicating whether a banner should be displayed when starting testlet engine</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="forceshowtrace" REQUIRED="no">
-			<DESCRIPTION>a boolean indicating that a stack trace is displayed on any failure</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="showtrace" REQUIRED="no">
-			<DESCRIPTION>a boolean indicating that a stack trace is displayed on error (but not normal failure)</DESCRIPTION>
-		</ATTRIBUTE>
-	</TASK>
-	<TASK NAME="translate">
-		<DESCRIPTION>&lt;p&gt;Identifies keys in files delimited by special tokens
-and translates them with values read from resource bundles.
-&lt;/p&gt;
-&lt;p&gt;
-A resource bundle contains locale-specific key-value pairs.
-A resource bundle is a hierarchical set of property files.
-A bundle name makes up its base family name.  Each file that
-makes up this bundle has this name plus its locale.  For example,
-if the resource bundle name is MyResources, the file that contains
-German text will take the name MyResources_de.  In addition to
-language, country and variant are also used to form the files in
-the bundle.
-&lt;/p&gt;
-&lt;p&gt;
-The resource bundle lookup searches for resource files with various
-suffixes on the basis of (1) the desired locale and (2) the default
-locale (basebundlename), in the following order from lower-level
-(more specific) to parent-level (less specific):
-&lt;/p&gt;
-&lt;pre&gt;
-basebundlename + &amp;quot;_&amp;quot; + language1 + &amp;quot;_&amp;quot; + country1 + &amp;quot;_&amp;quot; + variant1
-basebundlename + &amp;quot;_&amp;quot; + language1 + &amp;quot;_&amp;quot; + country1
-basebundlename + &amp;quot;_&amp;quot; + language1
-basebundlename
-basebundlename + &amp;quot;_&amp;quot; + language2 + &amp;quot;_&amp;quot; + country2 + &amp;quot;_&amp;quot; + variant2
-basebundlename + &amp;quot;_&amp;quot; + language2 + &amp;quot;_&amp;quot; + country2
-basebundlename + &amp;quot;_&amp;quot; + language2
-&lt;/pre&gt;
-&lt;p&gt;
-The file names generated thus are appended with the string &amp;quot;.properties&amp;quot;
-to make up the file names that are to be used.
-&lt;/p&gt;
-&lt;p&gt;
-File encoding is supported.  The encoding scheme of the source files,
-destination files and the bundle files can be specified.
-Destination files can be exlicitly overwritten using the
-&lt;var&gt;forceoverwrite&lt;/var&gt; attribute.  If &lt;var&gt;forceoverwrite&lt;/var&gt;
-is false, the destination file is overwritten only if either the
-source file or any of the files that make up the bundle have been
-modified after the destination file was last modified.
-&lt;/p&gt;
-&lt;p&gt;&lt;a href=&quot;../CoreTypes/fileset.html&quot;&gt;FileSet&lt;/a&gt;s are used to select files to
-translate.
-&lt;/p&gt;
-</DESCRIPTION>
-		<ATTRIBUTE NAME="todir" REQUIRED="yes">
-			<DESCRIPTION>Destination directory where destination files areto be created</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="starttoken" REQUIRED="yes">
-			<DESCRIPTION>The starting token to identify keys</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="endtoken" REQUIRED="yes">
-			<DESCRIPTION>The ending token to identify keys</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="bundle" REQUIRED="yes">
-			<DESCRIPTION>Family name of resource bundle</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="bundlelanguage" REQUIRED="no">
-			<DESCRIPTION>Locale specific language of resource bundle.  Defaults todefault locale's language.</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="bundlecountry" REQUIRED="no">
-			<DESCRIPTION>Locale specific country of resource bundle.  Defaults todefault locale's country.</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="bundlevariant" REQUIRED="no">
-			<DESCRIPTION>Locale specific variant of resource bundle.  Defaults tothe default variant of the country and language being used.</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="srcencoding" REQUIRED="no">
-			<DESCRIPTION>Source file encoding scheme.  Defaults tosystem default file encoding</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="destencoding" REQUIRED="no">
-			<DESCRIPTION>Destination file encoding scheme.  Defaults tosource file encoding</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="bundleencoding" REQUIRED="no">
-			<DESCRIPTION>Resource Bundle file encoding scheme.  Defaults tosource file encoding</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="forceoverwrite" REQUIRED="no">
-			<DESCRIPTION>Overwrite existing files even if the destinationfiles are newer. Defaults to &quot;no&quot;</DESCRIPTION>
-		</ATTRIBUTE>
-	</TASK>
-	<TASK NAME="wljspc">
-		<DESCRIPTION>&lt;p&gt;Class to precompile JSP's using weblogic's jsp compiler (weblogic.jspc)&lt;/p&gt;
-Tested only on Weblogic 4.5.1 - NT4.0 and Solaris 5.7,5.8&lt;br&gt;
-</DESCRIPTION>
-		<ATTRIBUTE NAME="src" REQUIRED="yes">
-			<DESCRIPTION>oot of source tree for JSP, ie, the document root for your weblogic serve</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="dest" REQUIRED="yes">
-			<DESCRIPTION>root of destination directory, what you have set as WorkingDir in the weblogic propertie</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="package" REQUIRED="yes">
-			<DESCRIPTION>start package name under which your JSP's would be compile</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="classpath" REQUIRED="yes">
-			<DESCRIPTION>Class path to use when compiling jsp'</DESCRIPTION>
-		</ATTRIBUTE>
-	</TASK>
-	<TASK NAME="xmlvalidate">
-		<DESCRIPTION>&lt;p&gt;This task checks xml files are valid (or only well formed). The
-task uses the SAX2 parser implementation provided by JAXP by default
-(probably the one that is used by Ant itself), but one can specify any
-SAX1/2 parser if needed.&lt;/p&gt;
-&lt;p&gt;This task supports the use of nested &lt;a
-href=&quot;../CoreTypes/xmlcatalog.html&quot;&gt;xmlcatalog&lt;/a&gt; elements and/or nested
-&lt;tt&gt;&amp;lt;dtd&amp;gt;&lt;/tt&gt; elements which are used to resolve DTDs and entities.&lt;/p&gt;
-</DESCRIPTION>
-		<ATTRIBUTE NAME="file" REQUIRED="no">
-			<DESCRIPTION>the file(s) you want to check. (optionally can use an embedded fileset</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="lenient" REQUIRED="no">
-			<DESCRIPTION>if true, only check the xml document is well formed(ignored if the specified parser is as SAX1 parser)</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="classname" REQUIRED="no">
-			<DESCRIPTION>the parser to use</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="classpathref" REQUIRED="no">
-			<DESCRIPTION>where to find the parser class. Optionally can use an embedded classpath element</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="failonerror" REQUIRED="no">
-			<DESCRIPTION>fails on a error if set to true (defaults to true)</DESCRIPTION>
-		</ATTRIBUTE>
-
-		<ATTRIBUTE NAME="warn" REQUIRED="no">
-			<DESCRIPTION>log parser warn events</DESCRIPTION>
-		</ATTRIBUTE>
-	</TASK>
-</TASKS>
diff --git a/ant/org.eclipse.ant.ui/Ant Editor/ant1.5b.dtd b/ant/org.eclipse.ant.ui/Ant Editor/ant1.5b.dtd
deleted file mode 100644
index 063acda..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/ant1.5b.dtd
+++ /dev/null
@@ -1,3903 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>

-<!ENTITY % boolean "(true|false|on|off|yes|no)">

-<!ENTITY % tasks "propertyfile | vsscheckin | sql | cvspass | p4reopen | csc | dirname | wlrun | p4label | p4revert | replaceregexp | get | jjtree | sleep | jarlib-display | dependset | zip | patch | jspc | style | test | tstamp | unwar | vsshistory | icontract | cvschangelog | p4submit | ccmcheckin | p4change | bzip2 | p4delete | vssadd | javadoc | translate | signjar | vajload | jarlib-available | WsdlToDotnet | buildnumber | jpcovmerge | ejbjar | war | rename | sequential | serverdeploy | property | move | copydir | cccheckin | wljspc | fixcrlf | sosget | pathconvert | record | p4sync | exec | p4edit | manifest | maudit | antlr | netrexxc | jpcovreport | execon | ccmcheckout | ant | xmlvalidate | xslt | iplanet-ejbc | ccmcheckintask | gzip | native2ascii | starteam | ear | input | rmic | checksum | mail | loadfile | vsscheckout | stylebook | soscheckin | mimemail | stlabel | gunzip | concat | cab | touch | parallel | splash | antcall | cccheckout | typedef | p4have | filter | xmlproperty | copy | antstructure | ccmcreatetask | rpm | delete | replace | mmetrics | waitfor | untar | loadproperties | available | echoproperties | junit | vajexport | stcheckout | bunzip2 | copyfile | vsscreate | ejbc | unjar | wsdltodotnet | mkdir | condition | cvs | tempfile | junitreport | taskdef | echo | ccupdate | java | renameext | vsslabel | basename | javadoc2 | vsscp | tar | vajimport | setproxy | wlstop | p4counter | ilasm | soscheckout | apply | ccuncheckout | jarlib-resolve | cvstagdiff | jlink | javacc | jarlib-manifest | pvcs | chmod | jar | sound | mparse | blgenclient | uptodate | genkey | javah | ccmreconfigure | fail | unzip | javac | p4add | soslabel | jpcoverage | depend | vssget | deltree | ddcreator">

-<!ENTITY % types "patternset | filterset | libfileset | filterreader | extension | fileset | dirset | filelist | filterchain | path | classfileset | description | xmlcatalog | selector | mapper | substitution | extensionSet | regexp">

-

-<!ELEMENT project (target | property | taskdef | typedef | %types;)*>

-<!ATTLIST project

-          name    CDATA #IMPLIED

-          default CDATA #REQUIRED

-          basedir CDATA #IMPLIED>

-

-<!ELEMENT target (%tasks; | %types;)*>

-

-<!ATTLIST target

-          id          ID    #IMPLIED

-          name        CDATA #REQUIRED

-          if          CDATA #IMPLIED

-          unless      CDATA #IMPLIED

-          depends     CDATA #IMPLIED

-          description CDATA #IMPLIED>

-

-<!ELEMENT patternset (include | patternset | exclude | excludesfile | includesfile)*>

-<!ATTLIST patternset

-          id ID #IMPLIED

-          includes CDATA #IMPLIED

-          refid IDREF #IMPLIED

-          excludesfile CDATA #IMPLIED

-          description CDATA #IMPLIED

-          includesfile CDATA #IMPLIED

-          excludes CDATA #IMPLIED>

-

-<!ELEMENT include EMPTY>

-<!ATTLIST include

-          id ID #IMPLIED

-          name CDATA #IMPLIED

-          unless CDATA #IMPLIED

-          if CDATA #IMPLIED>

-

-<!ELEMENT exclude EMPTY>

-<!ATTLIST exclude

-          id ID #IMPLIED

-          name CDATA #IMPLIED

-          unless CDATA #IMPLIED

-          if CDATA #IMPLIED>

-

-<!ELEMENT excludesfile EMPTY>

-<!ATTLIST excludesfile

-          id ID #IMPLIED

-          name CDATA #IMPLIED

-          unless CDATA #IMPLIED

-          if CDATA #IMPLIED>

-

-<!ELEMENT includesfile EMPTY>

-<!ATTLIST includesfile

-          id ID #IMPLIED

-          name CDATA #IMPLIED

-          unless CDATA #IMPLIED

-          if CDATA #IMPLIED>

-

-<!ELEMENT filterset (filterset | filter | filtersfile)*>

-<!ATTLIST filterset

-          id ID #IMPLIED

-          begintoken CDATA #IMPLIED

-          endtoken CDATA #IMPLIED

-          refid IDREF #IMPLIED

-          description CDATA #IMPLIED

-          filtersfile CDATA #IMPLIED>

-

-<!ELEMENT filter EMPTY>

-<!ATTLIST filter

-          id ID #IMPLIED

-          token CDATA #IMPLIED

-          value CDATA #IMPLIED>

-

-<!ELEMENT filtersfile EMPTY>

-<!ATTLIST filtersfile

-          id ID #IMPLIED

-          file CDATA #IMPLIED>

-

-<!ELEMENT libfileset (patternset | exclude | include | custom | none | present | not | or | contains | depend | size | majority | filename | selector | includesfile | date | excludesfile | depth | and)*>

-<!ATTLIST libfileset

-          id ID #IMPLIED

-          refid IDREF #IMPLIED

-          urlbase CDATA #IMPLIED

-          includeimpl %boolean; #IMPLIED

-          dir CDATA #IMPLIED

-          defaultexcludes %boolean; #IMPLIED

-          followsymlinks %boolean; #IMPLIED

-          includeurl %boolean; #IMPLIED

-          casesensitive %boolean; #IMPLIED

-          description CDATA #IMPLIED

-          excludes CDATA #IMPLIED

-          includesfile CDATA #IMPLIED

-          excludesfile CDATA #IMPLIED

-          includes CDATA #IMPLIED>

-

-<!ELEMENT custom (classpath | param)*>

-<!ATTLIST custom

-          id ID #IMPLIED

-          classpath CDATA #IMPLIED

-          error CDATA #IMPLIED

-          classpathref IDREF #IMPLIED

-          refid IDREF #IMPLIED

-          description CDATA #IMPLIED

-          classname CDATA #IMPLIED>

-

-<!ELEMENT classpath (fileset | dirset | filelist | pathelement | path)*>

-<!ATTLIST classpath

-          id ID #IMPLIED

-          location CDATA #IMPLIED

-          refid IDREF #IMPLIED

-          description CDATA #IMPLIED

-          path CDATA #IMPLIED>

-

-<!ELEMENT fileset (patternset | exclude | include | custom | none | present | not | or | contains | depend | size | majority | selector | includesfile | date | excludesfile | depth | and)*>

-<!ATTLIST fileset

-          id ID #IMPLIED

-          refid IDREF #IMPLIED

-          dir CDATA #IMPLIED

-          defaultexcludes %boolean; #IMPLIED

-          followsymlinks %boolean; #IMPLIED

-          casesensitive %boolean; #IMPLIED

-          description CDATA #IMPLIED

-          excludes CDATA #IMPLIED

-          includesfile CDATA #IMPLIED

-          excludesfile CDATA #IMPLIED

-          includes CDATA #IMPLIED>

-

-<!ELEMENT none (depend | filename | custom | not | date | contains | selector | depth | or | and | present | majority | none | size)*>

-<!ATTLIST none

-          id ID #IMPLIED

-          error CDATA #IMPLIED

-          refid IDREF #IMPLIED

-          description CDATA #IMPLIED>

-

-<!ELEMENT depend (mapper)*>

-<!ATTLIST depend

-          id ID #IMPLIED

-          targetdir CDATA #IMPLIED

-          error CDATA #IMPLIED

-          refid IDREF #IMPLIED

-          description CDATA #IMPLIED

-          granularity CDATA #IMPLIED>

-

-<!ELEMENT mapper (classpath)*>

-<!ATTLIST mapper

-          id ID #IMPLIED

-          classpath CDATA #IMPLIED

-          classpathref IDREF #IMPLIED

-          type (identity | flatten | glob | merge | regexp | package) #IMPLIED

-          refid IDREF #IMPLIED

-          description CDATA #IMPLIED

-          classname CDATA #IMPLIED

-          from CDATA #IMPLIED

-          to CDATA #IMPLIED>

-

-<!ELEMENT filename EMPTY>

-<!ATTLIST filename

-          id ID #IMPLIED

-          casesensitive %boolean; #IMPLIED

-          name CDATA #IMPLIED

-          error CDATA #IMPLIED

-          refid IDREF #IMPLIED

-          description CDATA #IMPLIED

-          negate %boolean; #IMPLIED>

-

-<!ELEMENT not (depend | filename | custom | not | date | contains | selector | depth | or | and | present | majority | none | size)*>

-<!ATTLIST not

-          id ID #IMPLIED

-          error CDATA #IMPLIED

-          refid IDREF #IMPLIED

-          description CDATA #IMPLIED>

-

-<!ELEMENT date EMPTY>

-<!ATTLIST date

-          id ID #IMPLIED

-          when (before | after | equal) #IMPLIED

-          error CDATA #IMPLIED

-          millis CDATA #IMPLIED

-          refid IDREF #IMPLIED

-          checkdirs %boolean; #IMPLIED

-          description CDATA #IMPLIED

-          granularity CDATA #IMPLIED

-          datetime CDATA #IMPLIED>

-

-<!ELEMENT contains EMPTY>

-<!ATTLIST contains

-          id ID #IMPLIED

-          casesensitive %boolean; #IMPLIED

-          error CDATA #IMPLIED

-          refid IDREF #IMPLIED

-          description CDATA #IMPLIED

-          text CDATA #IMPLIED>

-

-<!ELEMENT selector (depend | filename | custom | not | date | contains | selector | depth | or | and | present | majority | none | size)*>

-<!ATTLIST selector

-          id ID #IMPLIED

-          error CDATA #IMPLIED

-          refid IDREF #IMPLIED

-          description CDATA #IMPLIED>

-

-<!ELEMENT depth EMPTY>

-<!ATTLIST depth

-          id ID #IMPLIED

-          max CDATA #IMPLIED

-          error CDATA #IMPLIED

-          min CDATA #IMPLIED

-          refid IDREF #IMPLIED

-          description CDATA #IMPLIED>

-

-<!ELEMENT or (depend | filename | custom | not | date | contains | selector | depth | or | and | present | majority | none | size)*>

-<!ATTLIST or

-          id ID #IMPLIED

-          error CDATA #IMPLIED

-          refid IDREF #IMPLIED

-          description CDATA #IMPLIED>

-

-<!ELEMENT and (depend | filename | custom | not | date | contains | selector | depth | or | and | present | majority | none | size)*>

-<!ATTLIST and

-          id ID #IMPLIED

-          error CDATA #IMPLIED

-          refid IDREF #IMPLIED

-          description CDATA #IMPLIED>

-

-<!ELEMENT present (mapper)*>

-<!ATTLIST present

-          id ID #IMPLIED

-          targetdir CDATA #IMPLIED

-          error CDATA #IMPLIED

-          refid IDREF #IMPLIED

-          description CDATA #IMPLIED

-          present (srconly | both) #IMPLIED>

-

-<!ELEMENT majority (depend | filename | custom | not | date | contains | selector | depth | or | and | present | majority | none | size)*>

-<!ATTLIST majority

-          id ID #IMPLIED

-          error CDATA #IMPLIED

-          allowtie %boolean; #IMPLIED

-          refid IDREF #IMPLIED

-          description CDATA #IMPLIED>

-

-<!ELEMENT size EMPTY>

-<!ATTLIST size

-          id ID #IMPLIED

-          when (less | more | equal) #IMPLIED

-          units (K | k | kilo | KILO | Ki | KI | ki | kibi | KIBI | M | m | mega | MEGA | Mi | MI | mi | mebi | MEBI | G | g | giga | GIGA | Gi | GI | gi | gibi | GIBI | T | t | tera | TERA | Ti | TI | ti | tebi | TEBI) #IMPLIED

-          error CDATA #IMPLIED

-          refid IDREF #IMPLIED

-          description CDATA #IMPLIED

-          value CDATA #IMPLIED>

-

-<!ELEMENT dirset (patternset | exclude | include | custom | none | present | not | or | contains | depend | size | majority | filename | selector | includesfile | date | excludesfile | depth | and)*>

-<!ATTLIST dirset

-          id ID #IMPLIED

-          refid IDREF #IMPLIED

-          dir CDATA #IMPLIED

-          defaultexcludes %boolean; #IMPLIED

-          followsymlinks %boolean; #IMPLIED

-          casesensitive %boolean; #IMPLIED

-          description CDATA #IMPLIED

-          excludes CDATA #IMPLIED

-          includesfile CDATA #IMPLIED

-          excludesfile CDATA #IMPLIED

-          includes CDATA #IMPLIED>

-

-<!ELEMENT filelist EMPTY>

-<!ATTLIST filelist

-          id ID #IMPLIED

-          dir CDATA #IMPLIED

-          refid IDREF #IMPLIED

-          files CDATA #IMPLIED

-          description CDATA #IMPLIED>

-

-<!ELEMENT pathelement EMPTY>

-<!ATTLIST pathelement

-          id ID #IMPLIED

-          location CDATA #IMPLIED

-          path CDATA #IMPLIED>

-

-<!ELEMENT path (fileset | dirset | filelist | pathelement | path)*>

-<!ATTLIST path

-          id ID #IMPLIED

-          location CDATA #IMPLIED

-          refid IDREF #IMPLIED

-          description CDATA #IMPLIED

-          path CDATA #IMPLIED>

-

-<!ELEMENT param EMPTY>

-<!ATTLIST param

-          id ID #IMPLIED

-          name CDATA #IMPLIED

-          type CDATA #IMPLIED

-          value CDATA #IMPLIED>

-

-<!ELEMENT filterreader (classpath | param)*>

-<!ATTLIST filterreader

-          id ID #IMPLIED

-          classpath CDATA #IMPLIED

-          classpathref IDREF #IMPLIED

-          refid IDREF #IMPLIED

-          description CDATA #IMPLIED

-          classname CDATA #IMPLIED>

-

-<!ELEMENT extension EMPTY>

-<!ATTLIST extension

-          id ID #IMPLIED

-          refid IDREF #IMPLIED

-          implementationversion CDATA #IMPLIED

-          specificationversion CDATA #IMPLIED

-          extensionname CDATA #IMPLIED

-          implementationvendorid CDATA #IMPLIED

-          specificationvendor CDATA #IMPLIED

-          implementationurl CDATA #IMPLIED

-          description CDATA #IMPLIED

-          implementationvendor CDATA #IMPLIED>

-

-<!ELEMENT filterchain (linecontainsregexp | classconstants | headfilter | tabstospaces | striplinebreaks | tailfilter | stripjavacomments | expandproperties | linecontains | replacetokens | striplinecomments | prefixlines | filterreader)*>

-<!ATTLIST filterchain

-          id ID #IMPLIED

-          refid IDREF #IMPLIED

-          description CDATA #IMPLIED>

-

-<!ELEMENT linecontainsregexp (regexp)*>

-<!ATTLIST linecontainsregexp

-          id ID #IMPLIED>

-

-<!ELEMENT regexp EMPTY>

-<!ATTLIST regexp

-          id ID #IMPLIED

-          refid IDREF #IMPLIED

-          description CDATA #IMPLIED

-          pattern CDATA #IMPLIED>

-

-<!ELEMENT classconstants EMPTY>

-<!ATTLIST classconstants

-          id ID #IMPLIED>

-

-<!ELEMENT headfilter EMPTY>

-<!ATTLIST headfilter

-          id ID #IMPLIED

-          lines CDATA #IMPLIED>

-

-<!ELEMENT tabstospaces EMPTY>

-<!ATTLIST tabstospaces

-          id ID #IMPLIED

-          tablength CDATA #IMPLIED>

-

-<!ELEMENT striplinebreaks EMPTY>

-<!ATTLIST striplinebreaks

-          id ID #IMPLIED

-          linebreaks CDATA #IMPLIED>

-

-<!ELEMENT tailfilter EMPTY>

-<!ATTLIST tailfilter

-          id ID #IMPLIED

-          lines CDATA #IMPLIED>

-

-<!ELEMENT stripjavacomments EMPTY>

-<!ATTLIST stripjavacomments

-          id ID #IMPLIED>

-

-<!ELEMENT expandproperties EMPTY>

-<!ATTLIST expandproperties

-          id ID #IMPLIED>

-

-<!ELEMENT linecontains (contains)*>

-<!ATTLIST linecontains

-          id ID #IMPLIED>

-

-<!ELEMENT replacetokens (token)*>

-<!ATTLIST replacetokens

-          id ID #IMPLIED

-          begintoken CDATA #IMPLIED

-          endtoken CDATA #IMPLIED>

-

-<!ELEMENT token EMPTY>

-<!ATTLIST token

-          id ID #IMPLIED

-          key CDATA #IMPLIED

-          value CDATA #IMPLIED>

-

-<!ELEMENT striplinecomments (comment)*>

-<!ATTLIST striplinecomments

-          id ID #IMPLIED>

-

-<!ELEMENT comment EMPTY>

-<!ATTLIST comment

-          id ID #IMPLIED

-          value CDATA #IMPLIED>

-

-<!ELEMENT prefixlines EMPTY>

-<!ATTLIST prefixlines

-          id ID #IMPLIED

-          prefix CDATA #IMPLIED>

-

-<!ELEMENT classfileset (patternset | exclude | include | custom | rootfileset | none | present | not | or | contains | depend | size | majority | root | filename | selector | includesfile | date | excludesfile | depth | and)*>

-<!ATTLIST classfileset

-          id ID #IMPLIED

-          refid IDREF #IMPLIED

-          dir CDATA #IMPLIED

-          defaultexcludes %boolean; #IMPLIED

-          rootclass CDATA #IMPLIED

-          followsymlinks %boolean; #IMPLIED

-          casesensitive %boolean; #IMPLIED

-          description CDATA #IMPLIED

-          excludes CDATA #IMPLIED

-          includesfile CDATA #IMPLIED

-          excludesfile CDATA #IMPLIED

-          includes CDATA #IMPLIED>

-

-<!ELEMENT rootfileset (patternset | exclude | include | custom | none | present | not | or | contains | depend | size | majority | filename | selector | includesfile | date | excludesfile | depth | and)*>

-<!ATTLIST rootfileset

-          id ID #IMPLIED

-          refid IDREF #IMPLIED

-          dir CDATA #IMPLIED

-          defaultexcludes %boolean; #IMPLIED

-          followsymlinks %boolean; #IMPLIED

-          casesensitive %boolean; #IMPLIED

-          description CDATA #IMPLIED

-          excludes CDATA #IMPLIED

-          includesfile CDATA #IMPLIED

-          excludesfile CDATA #IMPLIED

-          includes CDATA #IMPLIED>

-

-<!ELEMENT root EMPTY>

-<!ATTLIST root

-          id ID #IMPLIED

-          classname CDATA #IMPLIED>

-

-<!ELEMENT description (#PCDATA)>

-<!ATTLIST description

-          id ID #IMPLIED

-          refid IDREF #IMPLIED

-          description CDATA #IMPLIED>

-

-<!ELEMENT xmlcatalog (entity | classpath | dtd | xmlcatalog)*>

-<!ATTLIST xmlcatalog

-          id ID #IMPLIED

-          classpath CDATA #IMPLIED

-          classpathref IDREF #IMPLIED

-          refid IDREF #IMPLIED

-          description CDATA #IMPLIED>

-

-<!ELEMENT entity EMPTY>

-<!ATTLIST entity

-          id ID #IMPLIED

-          location CDATA #IMPLIED

-          publicid CDATA #IMPLIED>

-

-<!ELEMENT dtd EMPTY>

-<!ATTLIST dtd

-          id ID #IMPLIED

-          location CDATA #IMPLIED

-          publicid CDATA #IMPLIED>

-

-<!ELEMENT substitution EMPTY>

-<!ATTLIST substitution

-          id ID #IMPLIED

-          refid IDREF #IMPLIED

-          description CDATA #IMPLIED

-          expression CDATA #IMPLIED>

-

-<!ELEMENT extensionSet (fileset | libfileset | extension)*>

-<!ATTLIST extensionSet

-          id ID #IMPLIED

-          refid IDREF #IMPLIED

-          description CDATA #IMPLIED>

-

-<!ELEMENT propertyfile (entry)*>

-<!ATTLIST propertyfile

-          id ID #IMPLIED

-          taskname CDATA #IMPLIED

-          file CDATA #IMPLIED

-          description CDATA #IMPLIED

-          comment CDATA #IMPLIED>

-

-<!ELEMENT entry EMPTY>

-<!ATTLIST entry

-          id ID #IMPLIED

-          operation CDATA #IMPLIED

-          default CDATA #IMPLIED

-          key CDATA #IMPLIED

-          type (int | date | string) #IMPLIED

-          unit (millisecond | second | minute | hour | day | week | month | year) #IMPLIED

-          pattern CDATA #IMPLIED

-          value CDATA #IMPLIED>

-

-<!ELEMENT vsscheckin EMPTY>

-<!ATTLIST vsscheckin

-          id ID #IMPLIED

-          recursive %boolean; #IMPLIED

-          ssdir CDATA #IMPLIED

-          autoresponse CDATA #IMPLIED

-          vsspath CDATA #IMPLIED

-          comment CDATA #IMPLIED

-          serverpath CDATA #IMPLIED

-          writable %boolean; #IMPLIED

-          login CDATA #IMPLIED

-          taskname CDATA #IMPLIED

-          localpath CDATA #IMPLIED

-          description CDATA #IMPLIED>

-

-<!ELEMENT sql (#PCDATA | fileset | classpath | transaction)*>

-<!ATTLIST sql

-          id ID #IMPLIED

-          onerror (continue | stop | abort) #IMPLIED

-          password CDATA #IMPLIED

-          userid CDATA #IMPLIED

-          autocommit %boolean; #IMPLIED

-          rdbms CDATA #IMPLIED

-          print %boolean; #IMPLIED

-          classpathref IDREF #IMPLIED

-          encoding CDATA #IMPLIED

-          version CDATA #IMPLIED

-          url CDATA #IMPLIED

-          src CDATA #IMPLIED

-          output CDATA #IMPLIED

-          driver CDATA #IMPLIED

-          showheaders %boolean; #IMPLIED

-          classpath CDATA #IMPLIED

-          delimitertype (normal | row) #IMPLIED

-          description CDATA #IMPLIED

-          append %boolean; #IMPLIED

-          taskname CDATA #IMPLIED

-          caching %boolean; #IMPLIED

-          delimiter CDATA #IMPLIED>

-

-<!ELEMENT transaction (#PCDATA)>

-<!ATTLIST transaction

-          id ID #IMPLIED

-          src CDATA #IMPLIED>

-

-<!ELEMENT cvspass EMPTY>

-<!ATTLIST cvspass

-          id ID #IMPLIED

-          password CDATA #IMPLIED

-          taskname CDATA #IMPLIED

-          description CDATA #IMPLIED

-          cvsroot CDATA #IMPLIED

-          passfile CDATA #IMPLIED>

-

-<!ELEMENT p4reopen EMPTY>

-<!ATTLIST p4reopen

-          id ID #IMPLIED

-          tochange CDATA #IMPLIED

-          port CDATA #IMPLIED

-          client CDATA #IMPLIED

-          user CDATA #IMPLIED

-          cmdopts CDATA #IMPLIED

-          view CDATA #IMPLIED

-          taskname CDATA #IMPLIED

-          failonerror %boolean; #IMPLIED

-          description CDATA #IMPLIED>

-

-<!ELEMENT csc (patternset | exclude | include | custom | none | present | not | or | contains | depend | size | majority | filename | selector | includesfile | date | excludesfile | depth | and)*>

-<!ATTLIST csc

-          id ID #IMPLIED

-          references CDATA #IMPLIED

-          filealign CDATA #IMPLIED

-          mainclass CDATA #IMPLIED

-          excludes CDATA #IMPLIED

-          noconfig %boolean; #IMPLIED

-          extraoptions CDATA #IMPLIED

-          additionalmodules CDATA #IMPLIED

-          win32icon CDATA #IMPLIED

-          destdir CDATA #IMPLIED

-          defaultexcludes %boolean; #IMPLIED

-          utf8output %boolean; #IMPLIED

-          includedefaultreferences %boolean; #IMPLIED

-          followsymlinks %boolean; #IMPLIED

-          optimize %boolean; #IMPLIED

-          targettype CDATA #IMPLIED

-          destfile CDATA #IMPLIED

-          casesensitive %boolean; #IMPLIED

-          win32res CDATA #IMPLIED

-          debug %boolean; #IMPLIED

-          unsafe %boolean; #IMPLIED

-          docfile CDATA #IMPLIED

-          incremental %boolean; #IMPLIED

-          outputfile CDATA #IMPLIED

-          includes CDATA #IMPLIED

-          description CDATA #IMPLIED

-          includesfile CDATA #IMPLIED

-          failonerror %boolean; #IMPLIED

-          warnlevel CDATA #IMPLIED

-          taskname CDATA #IMPLIED

-          srcdir CDATA #IMPLIED

-          fullpaths %boolean; #IMPLIED

-          excludesfile CDATA #IMPLIED

-          definitions CDATA #IMPLIED

-          referencefiles CDATA #IMPLIED>

-

-<!ELEMENT dirname EMPTY>

-<!ATTLIST dirname

-          id ID #IMPLIED

-          taskname CDATA #IMPLIED

-          file CDATA #IMPLIED

-          description CDATA #IMPLIED

-          property CDATA #IMPLIED>

-

-<!ELEMENT wlrun (classpath | wlclasspath)*>

-<!ATTLIST wlrun

-          id ID #IMPLIED

-          name CDATA #IMPLIED

-          classpath CDATA #IMPLIED

-          pkpassword CDATA #IMPLIED

-          beahome CDATA #IMPLIED

-          domain CDATA #IMPLIED

-          username CDATA #IMPLIED

-          weblogicmainclass CDATA #IMPLIED

-          wlclasspath CDATA #IMPLIED

-          policy CDATA #IMPLIED

-          properties CDATA #IMPLIED

-          args CDATA #IMPLIED

-          home CDATA #IMPLIED

-          taskname CDATA #IMPLIED

-          password CDATA #IMPLIED

-          description CDATA #IMPLIED

-          jvmargs CDATA #IMPLIED>

-

-<!ELEMENT wlclasspath (fileset | dirset | filelist | pathelement | path)*>

-<!ATTLIST wlclasspath

-          id ID #IMPLIED

-          location CDATA #IMPLIED

-          refid IDREF #IMPLIED

-          description CDATA #IMPLIED

-          path CDATA #IMPLIED>

-

-<!ELEMENT p4label EMPTY>

-<!ATTLIST p4label

-          id ID #IMPLIED

-          name CDATA #IMPLIED

-          port CDATA #IMPLIED

-          client CDATA #IMPLIED

-          user CDATA #IMPLIED

-          cmdopts CDATA #IMPLIED

-          desc CDATA #IMPLIED

-          view CDATA #IMPLIED

-          taskname CDATA #IMPLIED

-          lock CDATA #IMPLIED

-          failonerror %boolean; #IMPLIED

-          description CDATA #IMPLIED>

-

-<!ELEMENT p4revert EMPTY>

-<!ATTLIST p4revert

-          id ID #IMPLIED

-          port CDATA #IMPLIED

-          client CDATA #IMPLIED

-          revertonlyunchanged %boolean; #IMPLIED

-          user CDATA #IMPLIED

-          cmdopts CDATA #IMPLIED

-          change CDATA #IMPLIED

-          view CDATA #IMPLIED

-          taskname CDATA #IMPLIED

-          failonerror %boolean; #IMPLIED

-          description CDATA #IMPLIED>

-

-<!ELEMENT replaceregexp (fileset | substitution | regexp)*>

-<!ATTLIST replaceregexp

-          id ID #IMPLIED

-          flags CDATA #IMPLIED

-          match CDATA #IMPLIED

-          taskname CDATA #IMPLIED

-          byline CDATA #IMPLIED

-          replace CDATA #IMPLIED

-          file CDATA #IMPLIED

-          description CDATA #IMPLIED>

-

-<!ELEMENT get EMPTY>

-<!ATTLIST get

-          id ID #IMPLIED

-          src CDATA #IMPLIED

-          verbose %boolean; #IMPLIED

-          ignoreerrors %boolean; #IMPLIED

-          usetimestamp %boolean; #IMPLIED

-          username CDATA #IMPLIED

-          taskname CDATA #IMPLIED

-          dest CDATA #IMPLIED

-          description CDATA #IMPLIED

-          password CDATA #IMPLIED>

-

-<!ELEMENT jjtree EMPTY>

-<!ATTLIST jjtree

-          id ID #IMPLIED

-          nodedefaultvoid %boolean; #IMPLIED

-          buildnodefiles %boolean; #IMPLIED

-          outputdirectory CDATA #IMPLIED

-          static %boolean; #IMPLIED

-          javacchome CDATA #IMPLIED

-          nodeprefix CDATA #IMPLIED

-          nodefactory %boolean; #IMPLIED

-          visitor %boolean; #IMPLIED

-          multi %boolean; #IMPLIED

-          target CDATA #IMPLIED

-          nodeusesparser %boolean; #IMPLIED

-          visitorexception CDATA #IMPLIED

-          nodescopehook %boolean; #IMPLIED

-          taskname CDATA #IMPLIED

-          nodepackage CDATA #IMPLIED

-          description CDATA #IMPLIED>

-

-<!ELEMENT sleep EMPTY>

-<!ATTLIST sleep

-          id ID #IMPLIED

-          hours CDATA #IMPLIED

-          milliseconds CDATA #IMPLIED

-          taskname CDATA #IMPLIED

-          minutes CDATA #IMPLIED

-          description CDATA #IMPLIED

-          seconds CDATA #IMPLIED

-          failonerror %boolean; #IMPLIED>

-

-<!ELEMENT jarlib-display (fileset)*>

-<!ATTLIST jarlib-display

-          id ID #IMPLIED

-          taskname CDATA #IMPLIED

-          file CDATA #IMPLIED

-          description CDATA #IMPLIED>

-

-<!ELEMENT dependset (patternset | exclude | include | custom | none | present | not | targetfileset | srcfileset | or | contains | depend | size | majority | filename | selector | includesfile | srcfilelist | date | excludesfile | depth | and | targetfilelist)*>

-<!ATTLIST dependset

-          id ID #IMPLIED

-          defaultexcludes %boolean; #IMPLIED

-          followsymlinks %boolean; #IMPLIED

-          taskname CDATA #IMPLIED

-          casesensitive %boolean; #IMPLIED

-          description CDATA #IMPLIED

-          excludes CDATA #IMPLIED

-          includesfile CDATA #IMPLIED

-          excludesfile CDATA #IMPLIED

-          includes CDATA #IMPLIED>

-

-<!ELEMENT targetfileset (patternset | exclude | include | custom | none | present | not | or | contains | depend | size | majority | filename | selector | includesfile | date | excludesfile | depth | and)*>

-<!ATTLIST targetfileset

-          id ID #IMPLIED

-          refid IDREF #IMPLIED

-          dir CDATA #IMPLIED

-          defaultexcludes %boolean; #IMPLIED

-          followsymlinks %boolean; #IMPLIED

-          casesensitive %boolean; #IMPLIED

-          description CDATA #IMPLIED

-          excludes CDATA #IMPLIED

-          includesfile CDATA #IMPLIED

-          excludesfile CDATA #IMPLIED

-          includes CDATA #IMPLIED>

-

-<!ELEMENT srcfileset (patternset | exclude | include | custom | none | present | not | or | contains | depend | size | majority | filename | selector | includesfile | date | excludesfile | depth | and)*>

-<!ATTLIST srcfileset

-          id ID #IMPLIED

-          refid IDREF #IMPLIED

-          dir CDATA #IMPLIED

-          defaultexcludes %boolean; #IMPLIED

-          followsymlinks %boolean; #IMPLIED

-          casesensitive %boolean; #IMPLIED

-          description CDATA #IMPLIED

-          excludes CDATA #IMPLIED

-          includesfile CDATA #IMPLIED

-          excludesfile CDATA #IMPLIED

-          includes CDATA #IMPLIED>

-

-<!ELEMENT srcfilelist EMPTY>

-<!ATTLIST srcfilelist

-          id ID #IMPLIED

-          dir CDATA #IMPLIED

-          refid IDREF #IMPLIED

-          files CDATA #IMPLIED

-          description CDATA #IMPLIED>

-

-<!ELEMENT targetfilelist EMPTY>

-<!ATTLIST targetfilelist

-          id ID #IMPLIED

-          dir CDATA #IMPLIED

-          refid IDREF #IMPLIED

-          files CDATA #IMPLIED

-          description CDATA #IMPLIED>

-

-<!ELEMENT zip (patternset | exclude | include | custom | none | present | not | or | contains | depend | fileset | size | majority | filename | selector | includesfile | zipgroupfileset | zipfileset | date | excludesfile | depth | and)*>

-<!ATTLIST zip

-          id ID #IMPLIED

-          whenempty (fail | skip | create) #IMPLIED

-          duplicate (add | preserve | fail) #IMPLIED

-          excludes CDATA #IMPLIED

-          basedir CDATA #IMPLIED

-          encoding CDATA #IMPLIED

-          defaultexcludes %boolean; #IMPLIED

-          update %boolean; #IMPLIED

-          followsymlinks %boolean; #IMPLIED

-          destfile CDATA #IMPLIED

-          casesensitive %boolean; #IMPLIED

-          includes CDATA #IMPLIED

-          description CDATA #IMPLIED

-          includesfile CDATA #IMPLIED

-          compress %boolean; #IMPLIED

-          taskname CDATA #IMPLIED

-          filesonly %boolean; #IMPLIED

-          file CDATA #IMPLIED

-          excludesfile CDATA #IMPLIED

-          zipfile CDATA #IMPLIED>

-

-<!ELEMENT zipgroupfileset (patternset | exclude | include | custom | none | present | not | or | contains | depend | size | majority | filename | selector | includesfile | date | excludesfile | depth | and)*>

-<!ATTLIST zipgroupfileset

-          id ID #IMPLIED

-          refid IDREF #IMPLIED

-          dir CDATA #IMPLIED

-          defaultexcludes %boolean; #IMPLIED

-          followsymlinks %boolean; #IMPLIED

-          casesensitive %boolean; #IMPLIED

-          description CDATA #IMPLIED

-          excludes CDATA #IMPLIED

-          includesfile CDATA #IMPLIED

-          excludesfile CDATA #IMPLIED

-          includes CDATA #IMPLIED>

-

-<!ELEMENT zipfileset (patternset | exclude | include | custom | none | present | not | or | contains | depend | size | majority | filename | selector | includesfile | date | excludesfile | depth | and)*>

-<!ATTLIST zipfileset

-          id ID #IMPLIED

-          src CDATA #IMPLIED

-          refid IDREF #IMPLIED

-          dir CDATA #IMPLIED

-          defaultexcludes %boolean; #IMPLIED

-          followsymlinks %boolean; #IMPLIED

-          prefix CDATA #IMPLIED

-          casesensitive %boolean; #IMPLIED

-          fullpath CDATA #IMPLIED

-          description CDATA #IMPLIED

-          excludes CDATA #IMPLIED

-          includesfile CDATA #IMPLIED

-          excludesfile CDATA #IMPLIED

-          includes CDATA #IMPLIED>

-

-<!ELEMENT patch EMPTY>

-<!ATTLIST patch

-          id ID #IMPLIED

-          strip CDATA #IMPLIED

-          dir CDATA #IMPLIED

-          quiet %boolean; #IMPLIED

-          originalfile CDATA #IMPLIED

-          patchfile CDATA #IMPLIED

-          reverse %boolean; #IMPLIED

-          backups %boolean; #IMPLIED

-          taskname CDATA #IMPLIED

-          ignorewhitespace %boolean; #IMPLIED

-          description CDATA #IMPLIED>

-

-<!ELEMENT jspc (patternset | exclude | include | custom | none | present | not | or | contains | depend | classpath | size | majority | filename | selector | includesfile | date | excludesfile | webapp | depth | and)*>

-<!ATTLIST jspc

-          id ID #IMPLIED

-          mapped %boolean; #IMPLIED

-          ieplugin CDATA #IMPLIED

-          excludes CDATA #IMPLIED

-          classpathref IDREF #IMPLIED

-          package CDATA #IMPLIED

-          destdir CDATA #IMPLIED

-          defaultexcludes %boolean; #IMPLIED

-          followsymlinks %boolean; #IMPLIED

-          uribase CDATA #IMPLIED

-          classpath CDATA #IMPLIED

-          casesensitive %boolean; #IMPLIED

-          verbose CDATA #IMPLIED

-          compiler CDATA #IMPLIED

-          includes CDATA #IMPLIED

-          webxml CDATA #IMPLIED

-          description CDATA #IMPLIED

-          includesfile CDATA #IMPLIED

-          failonerror %boolean; #IMPLIED

-          taskname CDATA #IMPLIED

-          srcdir CDATA #IMPLIED

-          excludesfile CDATA #IMPLIED

-          uriroot CDATA #IMPLIED

-          webinc CDATA #IMPLIED>

-

-<!ELEMENT webapp EMPTY>

-<!ATTLIST webapp

-          id ID #IMPLIED

-          basedir CDATA #IMPLIED>

-

-<!ELEMENT style (patternset | exclude | include | custom | none | present | not | param | or | contains | depend | classpath | size | majority | filename | xmlcatalog | selector | outputproperty | includesfile | date | excludesfile | depth | and)*>

-<!ATTLIST style

-          id ID #IMPLIED

-          force %boolean; #IMPLIED

-          excludes CDATA #IMPLIED

-          processor CDATA #IMPLIED

-          classpathref IDREF #IMPLIED

-          basedir CDATA #IMPLIED

-          destdir CDATA #IMPLIED

-          defaultexcludes %boolean; #IMPLIED

-          scanincludeddirectories %boolean; #IMPLIED

-          extension CDATA #IMPLIED

-          in CDATA #IMPLIED

-          followsymlinks %boolean; #IMPLIED

-          classpath CDATA #IMPLIED

-          casesensitive %boolean; #IMPLIED

-          includes CDATA #IMPLIED

-          description CDATA #IMPLIED

-          out CDATA #IMPLIED

-          style CDATA #IMPLIED

-          includesfile CDATA #IMPLIED

-          taskname CDATA #IMPLIED

-          excludesfile CDATA #IMPLIED>

-

-<!ELEMENT outputproperty EMPTY>

-<!ATTLIST outputproperty

-          id ID #IMPLIED

-          name CDATA #IMPLIED

-          value CDATA #IMPLIED>

-

-<!ELEMENT test (arg | jvmarg | classpath | sysproperty | testlet | env)*>

-<!ATTLIST test

-          id ID #IMPLIED

-          jvmargs CDATA #IMPLIED

-          args CDATA #IMPLIED

-          fork %boolean; #IMPLIED

-          maxmemory CDATA #IMPLIED

-          classpathref IDREF #IMPLIED

-          jar CDATA #IMPLIED

-          forceshowtrace %boolean; #IMPLIED

-          output CDATA #IMPLIED

-          timeout CDATA #IMPLIED

-          jvm CDATA #IMPLIED

-          classpath CDATA #IMPLIED

-          dir CDATA #IMPLIED

-          showsuccess %boolean; #IMPLIED

-          description CDATA #IMPLIED

-          jvmversion CDATA #IMPLIED

-          failonerror %boolean; #IMPLIED

-          append %boolean; #IMPLIED

-          showbanner CDATA #IMPLIED

-          taskname CDATA #IMPLIED

-          newenvironment %boolean; #IMPLIED

-          classname CDATA #IMPLIED

-          showtrace %boolean; #IMPLIED>

-

-<!ELEMENT arg EMPTY>

-<!ATTLIST arg

-          id ID #IMPLIED

-          line CDATA #IMPLIED

-          file CDATA #IMPLIED

-          value CDATA #IMPLIED

-          path CDATA #IMPLIED>

-

-<!ELEMENT jvmarg EMPTY>

-<!ATTLIST jvmarg

-          id ID #IMPLIED

-          line CDATA #IMPLIED

-          file CDATA #IMPLIED

-          value CDATA #IMPLIED

-          path CDATA #IMPLIED>

-

-<!ELEMENT sysproperty EMPTY>

-<!ATTLIST sysproperty

-          id ID #IMPLIED

-          key CDATA #IMPLIED

-          file CDATA #IMPLIED

-          value CDATA #IMPLIED

-          path CDATA #IMPLIED>

-

-<!ELEMENT testlet (#PCDATA)>

-<!ATTLIST testlet

-          id ID #IMPLIED>

-

-<!ELEMENT env EMPTY>

-<!ATTLIST env

-          id ID #IMPLIED

-          key CDATA #IMPLIED

-          file CDATA #IMPLIED

-          value CDATA #IMPLIED

-          path CDATA #IMPLIED>

-

-<!ELEMENT tstamp (format)*>

-<!ATTLIST tstamp

-          id ID #IMPLIED

-          taskname CDATA #IMPLIED

-          description CDATA #IMPLIED

-          prefix CDATA #IMPLIED>

-

-<!ELEMENT format EMPTY>

-<!ATTLIST format

-          id ID #IMPLIED

-          locale CDATA #IMPLIED

-          timezone CDATA #IMPLIED

-          unit (millisecond | second | minute | hour | day | week | month | year) #IMPLIED

-          pattern CDATA #IMPLIED

-          property CDATA #IMPLIED

-          offset CDATA #IMPLIED>

-

-<!ELEMENT unwar (fileset | patternset)*>

-<!ATTLIST unwar

-          id ID #IMPLIED

-          overwrite %boolean; #IMPLIED

-          dest CDATA #IMPLIED

-          taskname CDATA #IMPLIED

-          description CDATA #IMPLIED

-          src CDATA #IMPLIED>

-

-<!ELEMENT vsshistory EMPTY>

-<!ATTLIST vsshistory

-          id ID #IMPLIED

-          style (brief | codediff | nofile | default) #IMPLIED

-          numdays CDATA #IMPLIED

-          todate CDATA #IMPLIED

-          fromlabel CDATA #IMPLIED

-          output CDATA #IMPLIED

-          ssdir CDATA #IMPLIED

-          recursive %boolean; #IMPLIED

-          vsspath CDATA #IMPLIED

-          fromdate CDATA #IMPLIED

-          user CDATA #IMPLIED

-          serverpath CDATA #IMPLIED

-          login CDATA #IMPLIED

-          tolabel CDATA #IMPLIED

-          taskname CDATA #IMPLIED

-          dateformat CDATA #IMPLIED

-          description CDATA #IMPLIED>

-

-<!ELEMENT icontract (patternset | exclude | include | custom | none | present | not | or | contains | depend | classpath | size | majority | filename | selector | includesfile | date | excludesfile | depth | and)*>

-<!ATTLIST icontract

-          id ID #IMPLIED

-          classdir CDATA #IMPLIED

-          excludes CDATA #IMPLIED

-          quiet %boolean; #IMPLIED

-          classpathref IDREF #IMPLIED

-          defaultexcludes %boolean; #IMPLIED

-          repositorydir CDATA #IMPLIED

-          instrumentdir CDATA #IMPLIED

-          updateicontrol %boolean; #IMPLIED

-          builddir CDATA #IMPLIED

-          followsymlinks %boolean; #IMPLIED

-          classpath CDATA #IMPLIED

-          casesensitive %boolean; #IMPLIED

-          controlfile CDATA #IMPLIED

-          pre %boolean; #IMPLIED

-          includes CDATA #IMPLIED

-          invariant %boolean; #IMPLIED

-          description CDATA #IMPLIED

-          post %boolean; #IMPLIED

-          includesfile CDATA #IMPLIED

-          taskname CDATA #IMPLIED

-          srcdir CDATA #IMPLIED

-          failthrowable CDATA #IMPLIED

-          verbosity CDATA #IMPLIED

-          excludesfile CDATA #IMPLIED

-          targets CDATA #IMPLIED

-          repbuilddir CDATA #IMPLIED>

-

-<!ELEMENT cvschangelog (fileset | user)*>

-<!ATTLIST cvschangelog

-          id ID #IMPLIED

-          end CDATA #IMPLIED

-          dir CDATA #IMPLIED

-          taskname CDATA #IMPLIED

-          description CDATA #IMPLIED

-          usersfile CDATA #IMPLIED

-          daysinpast CDATA #IMPLIED

-          start CDATA #IMPLIED

-          destfile CDATA #IMPLIED>

-

-<!ELEMENT user EMPTY>

-<!ATTLIST user

-          id ID #IMPLIED

-          userid CDATA #IMPLIED

-          displayname CDATA #IMPLIED>

-

-<!ELEMENT p4submit EMPTY>

-<!ATTLIST p4submit

-          id ID #IMPLIED

-          port CDATA #IMPLIED

-          client CDATA #IMPLIED

-          user CDATA #IMPLIED

-          cmdopts CDATA #IMPLIED

-          change CDATA #IMPLIED

-          view CDATA #IMPLIED

-          taskname CDATA #IMPLIED

-          failonerror %boolean; #IMPLIED

-          description CDATA #IMPLIED>

-

-<!ELEMENT ccmcheckin EMPTY>

-<!ATTLIST ccmcheckin

-          id ID #IMPLIED

-          ccmaction CDATA #IMPLIED

-          task CDATA #IMPLIED

-          taskname CDATA #IMPLIED

-          file CDATA #IMPLIED

-          description CDATA #IMPLIED

-          ccmdir CDATA #IMPLIED

-          comment CDATA #IMPLIED>

-

-<!ELEMENT p4change EMPTY>

-<!ATTLIST p4change

-          id ID #IMPLIED

-          view CDATA #IMPLIED

-          client CDATA #IMPLIED

-          user CDATA #IMPLIED

-          port CDATA #IMPLIED

-          taskname CDATA #IMPLIED

-          description CDATA #IMPLIED

-          cmdopts CDATA #IMPLIED

-          failonerror %boolean; #IMPLIED>

-

-<!ELEMENT bzip2 EMPTY>

-<!ATTLIST bzip2

-          id ID #IMPLIED

-          taskname CDATA #IMPLIED

-          zipfile CDATA #IMPLIED

-          description CDATA #IMPLIED

-          src CDATA #IMPLIED>

-

-<!ELEMENT p4delete EMPTY>

-<!ATTLIST p4delete

-          id ID #IMPLIED

-          port CDATA #IMPLIED

-          client CDATA #IMPLIED

-          user CDATA #IMPLIED

-          cmdopts CDATA #IMPLIED

-          change CDATA #IMPLIED

-          view CDATA #IMPLIED

-          taskname CDATA #IMPLIED

-          failonerror %boolean; #IMPLIED

-          description CDATA #IMPLIED>

-

-<!ELEMENT vssadd EMPTY>

-<!ATTLIST vssadd

-          id ID #IMPLIED

-          recursive %boolean; #IMPLIED

-          ssdir CDATA #IMPLIED

-          autoresponse CDATA #IMPLIED

-          vsspath CDATA #IMPLIED

-          comment CDATA #IMPLIED

-          serverpath CDATA #IMPLIED

-          writable %boolean; #IMPLIED

-          login CDATA #IMPLIED

-          taskname CDATA #IMPLIED

-          localpath CDATA #IMPLIED

-          description CDATA #IMPLIED>

-

-<!ELEMENT javadoc (bottom | source | classpath | doctitle | header | excludepackage | bootclasspath | doclet | taglet | fileset | packageset | sourcepath | link | footer | package | group | tag)*>

-<!ATTLIST javadoc

-          id ID #IMPLIED

-          bottom CDATA #IMPLIED

-          verbose %boolean; #IMPLIED

-          bootclasspathref IDREF #IMPLIED

-          header CDATA #IMPLIED

-          link CDATA #IMPLIED

-          noindex %boolean; #IMPLIED

-          access (protected | public | package | private) #IMPLIED

-          doclet CDATA #IMPLIED

-          public %boolean; #IMPLIED

-          author %boolean; #IMPLIED

-          footer CDATA #IMPLIED

-          docletpath CDATA #IMPLIED

-          package %boolean; #IMPLIED

-          useexternalfile %boolean; #IMPLIED

-          sourcepathref IDREF #IMPLIED

-          description CDATA #IMPLIED

-          protected %boolean; #IMPLIED

-          nonavbar %boolean; #IMPLIED

-          maxmemory CDATA #IMPLIED

-          group CDATA #IMPLIED

-          source CDATA #IMPLIED

-          linkoffline CDATA #IMPLIED

-          additionalparam CDATA #IMPLIED

-          failonerror %boolean; #IMPLIED

-          locale CDATA #IMPLIED

-          destdir CDATA #IMPLIED

-          classpath CDATA #IMPLIED

-          defaultexcludes %boolean; #IMPLIED

-          bootclasspath CDATA #IMPLIED

-          private %boolean; #IMPLIED

-          taskname CDATA #IMPLIED

-          charset CDATA #IMPLIED

-          nodeprecatedlist %boolean; #IMPLIED

-          classpathref IDREF #IMPLIED

-          stylesheetfile CDATA #IMPLIED

-          docencoding CDATA #IMPLIED

-          excludepackagenames CDATA #IMPLIED

-          docletpathref IDREF #IMPLIED

-          packagenames CDATA #IMPLIED

-          windowtitle CDATA #IMPLIED

-          notree %boolean; #IMPLIED

-          splitindex %boolean; #IMPLIED

-          packagelist CDATA #IMPLIED

-          encoding CDATA #IMPLIED

-          doctitle CDATA #IMPLIED

-          serialwarn %boolean; #IMPLIED

-          old %boolean; #IMPLIED

-          use %boolean; #IMPLIED

-          sourcepath CDATA #IMPLIED

-          helpfile CDATA #IMPLIED

-          version %boolean; #IMPLIED

-          sourcefiles CDATA #IMPLIED

-          extdirs CDATA #IMPLIED

-          nohelp %boolean; #IMPLIED

-          nodeprecated %boolean; #IMPLIED

-          overview CDATA #IMPLIED>

-

-<!ELEMENT bottom (#PCDATA)>

-<!ATTLIST bottom

-          id ID #IMPLIED>

-

-<!ELEMENT source EMPTY>

-<!ATTLIST source

-          id ID #IMPLIED

-          file CDATA #IMPLIED>

-

-<!ELEMENT doctitle (#PCDATA)>

-<!ATTLIST doctitle

-          id ID #IMPLIED>

-

-<!ELEMENT header (#PCDATA)>

-<!ATTLIST header

-          id ID #IMPLIED>

-

-<!ELEMENT excludepackage EMPTY>

-<!ATTLIST excludepackage

-          id ID #IMPLIED

-          name CDATA #IMPLIED>

-

-<!ELEMENT bootclasspath (fileset | dirset | filelist | pathelement | path)*>

-<!ATTLIST bootclasspath

-          id ID #IMPLIED

-          location CDATA #IMPLIED

-          refid IDREF #IMPLIED

-          description CDATA #IMPLIED

-          path CDATA #IMPLIED>

-

-<!ELEMENT doclet (path | param)*>

-<!ATTLIST doclet

-          id ID #IMPLIED

-          name CDATA #IMPLIED

-          pathref IDREF #IMPLIED

-          path CDATA #IMPLIED>

-

-<!ELEMENT taglet (path)*>

-<!ATTLIST taglet

-          id ID #IMPLIED

-          name CDATA #IMPLIED

-          pathref IDREF #IMPLIED

-          path CDATA #IMPLIED>

-

-<!ELEMENT packageset (patternset | exclude | include | custom | none | present | not | or | contains | depend | size | majority | filename | selector | includesfile | date | excludesfile | depth | and)*>

-<!ATTLIST packageset

-          id ID #IMPLIED

-          refid IDREF #IMPLIED

-          dir CDATA #IMPLIED

-          defaultexcludes %boolean; #IMPLIED

-          followsymlinks %boolean; #IMPLIED

-          casesensitive %boolean; #IMPLIED

-          description CDATA #IMPLIED

-          excludes CDATA #IMPLIED

-          includesfile CDATA #IMPLIED

-          excludesfile CDATA #IMPLIED

-          includes CDATA #IMPLIED>

-

-<!ELEMENT sourcepath (fileset | dirset | filelist | pathelement | path)*>

-<!ATTLIST sourcepath

-          id ID #IMPLIED

-          location CDATA #IMPLIED

-          refid IDREF #IMPLIED

-          description CDATA #IMPLIED

-          path CDATA #IMPLIED>

-

-<!ELEMENT link EMPTY>

-<!ATTLIST link

-          id ID #IMPLIED

-          href CDATA #IMPLIED

-          offline %boolean; #IMPLIED

-          packagelistloc CDATA #IMPLIED>

-

-<!ELEMENT footer (#PCDATA)>

-<!ATTLIST footer

-          id ID #IMPLIED>

-

-<!ELEMENT package EMPTY>

-<!ATTLIST package

-          id ID #IMPLIED

-          name CDATA #IMPLIED>

-

-<!ELEMENT group (package | title)*>

-<!ATTLIST group

-          id ID #IMPLIED

-          packages CDATA #IMPLIED

-          title CDATA #IMPLIED>

-

-<!ELEMENT title (#PCDATA)>

-<!ATTLIST title

-          id ID #IMPLIED>

-

-<!ELEMENT tag EMPTY>

-<!ATTLIST tag

-          id ID #IMPLIED

-          enabled %boolean; #IMPLIED

-          name CDATA #IMPLIED

-          scope CDATA #IMPLIED

-          description CDATA #IMPLIED>

-

-<!ELEMENT translate (patternset | exclude | include | custom | none | present | not | or | contains | depend | fileset | size | majority | filename | selector | includesfile | date | excludesfile | depth | and)*>

-<!ATTLIST translate

-          id ID #IMPLIED

-          bundlecountry CDATA #IMPLIED

-          bundlelanguage CDATA #IMPLIED

-          excludes CDATA #IMPLIED

-          defaultexcludes %boolean; #IMPLIED

-          followsymlinks %boolean; #IMPLIED

-          srcencoding CDATA #IMPLIED

-          bundle CDATA #IMPLIED

-          bundleencoding CDATA #IMPLIED

-          casesensitive %boolean; #IMPLIED

-          destencoding CDATA #IMPLIED

-          bundlevariant CDATA #IMPLIED

-          includes CDATA #IMPLIED

-          description CDATA #IMPLIED

-          todir CDATA #IMPLIED

-          includesfile CDATA #IMPLIED

-          taskname CDATA #IMPLIED

-          excludesfile CDATA #IMPLIED

-          endtoken CDATA #IMPLIED

-          forceoverwrite %boolean; #IMPLIED

-          starttoken CDATA #IMPLIED>

-

-<!ELEMENT signjar (fileset)*>

-<!ATTLIST signjar

-          id ID #IMPLIED

-          storepass CDATA #IMPLIED

-          lazy %boolean; #IMPLIED

-          keypass CDATA #IMPLIED

-          jar CDATA #IMPLIED

-          verbose %boolean; #IMPLIED

-          alias CDATA #IMPLIED

-          sectionsonly %boolean; #IMPLIED

-          keystore CDATA #IMPLIED

-          sigfile CDATA #IMPLIED

-          taskname CDATA #IMPLIED

-          description CDATA #IMPLIED

-          internalsf %boolean; #IMPLIED

-          storetype CDATA #IMPLIED

-          signedjar CDATA #IMPLIED>

-

-<!ELEMENT vajload (vajproject)*>

-<!ATTLIST vajload

-          id ID #IMPLIED

-          taskname CDATA #IMPLIED

-          description CDATA #IMPLIED

-          remote CDATA #IMPLIED>

-

-<!ELEMENT vajproject EMPTY>

-<!ATTLIST vajproject

-          id ID #IMPLIED

-          version CDATA #IMPLIED

-          name CDATA #IMPLIED>

-

-<!ELEMENT jarlib-available (extensionset | extension)*>

-<!ATTLIST jarlib-available

-          id ID #IMPLIED

-          taskname CDATA #IMPLIED

-          file CDATA #IMPLIED

-          description CDATA #IMPLIED

-          property CDATA #IMPLIED>

-

-<!ELEMENT extensionset (fileset | libfileset | extension)*>

-<!ATTLIST extensionset

-          id ID #IMPLIED

-          refid IDREF #IMPLIED

-          description CDATA #IMPLIED>

-

-<!ELEMENT WsdlToDotnet EMPTY>

-<!ATTLIST WsdlToDotnet

-          id ID #IMPLIED

-          url CDATA #IMPLIED

-          srcfile CDATA #IMPLIED

-          namespace CDATA #IMPLIED

-          server %boolean; #IMPLIED

-          destfile CDATA #IMPLIED

-          language CDATA #IMPLIED

-          extraoptions CDATA #IMPLIED

-          taskname CDATA #IMPLIED

-          failonerror %boolean; #IMPLIED

-          description CDATA #IMPLIED>

-

-<!ELEMENT buildnumber EMPTY>

-<!ATTLIST buildnumber

-          id ID #IMPLIED

-          taskname CDATA #IMPLIED

-          file CDATA #IMPLIED

-          description CDATA #IMPLIED>

-

-<!ELEMENT jpcovmerge (fileset)*>

-<!ATTLIST jpcovmerge

-          id ID #IMPLIED

-          verbose %boolean; #IMPLIED

-          taskname CDATA #IMPLIED

-          tofile CDATA #IMPLIED

-          description CDATA #IMPLIED

-          home CDATA #IMPLIED>

-

-<!ELEMENT ejbjar (patternset | exclude | include | weblogictoplink | custom | none | present | jboss | borland | weblogic | not | iplanet | jonas | or | contains | depend | support | classpath | size | majority | websphere | dtd | filename | selector | includesfile | date | excludesfile | depth | and)*>

-<!ATTLIST ejbjar

-          id ID #IMPLIED

-          descriptordir CDATA #IMPLIED

-          excludes CDATA #IMPLIED

-          manifest CDATA #IMPLIED

-          destdir CDATA #IMPLIED

-          defaultexcludes %boolean; #IMPLIED

-          followsymlinks %boolean; #IMPLIED

-          basenameterminator CDATA #IMPLIED

-          classpath CDATA #IMPLIED

-          casesensitive %boolean; #IMPLIED

-          dependency CDATA #IMPLIED

-          basejarname CDATA #IMPLIED

-          flatdestdir %boolean; #IMPLIED

-          includes CDATA #IMPLIED

-          description CDATA #IMPLIED

-          includesfile CDATA #IMPLIED

-          taskname CDATA #IMPLIED

-          srcdir CDATA #IMPLIED

-          naming (ejb-name | directory | descriptor | basejarname) #IMPLIED

-          excludesfile CDATA #IMPLIED

-          genericjarsuffix CDATA #IMPLIED>

-

-<!ELEMENT weblogictoplink (classpath | wlclasspath | sysproperty)*>

-<!ATTLIST weblogictoplink

-          id ID #IMPLIED

-          newcmp %boolean; #IMPLIED

-          ejbdtd CDATA #IMPLIED

-          jvmargs CDATA #IMPLIED

-          rebuild %boolean; #IMPLIED

-          suffix CDATA #IMPLIED

-          args CDATA #IMPLIED

-          outputdir CDATA #IMPLIED

-          toplinkdtd CDATA #IMPLIED

-          wldtd CDATA #IMPLIED

-          destdir CDATA #IMPLIED

-          weblogicdtd CDATA #IMPLIED

-          wlclasspath CDATA #IMPLIED

-          jvmdebuglevel CDATA #IMPLIED

-          classpath CDATA #IMPLIED

-          keepgenerated CDATA #IMPLIED

-          compiler CDATA #IMPLIED

-          oldcmp %boolean; #IMPLIED

-          keepgeneric %boolean; #IMPLIED

-          ejbcclass CDATA #IMPLIED

-          toplinkdescriptor CDATA #IMPLIED

-          noejbc %boolean; #IMPLIED

-          genericjarsuffix CDATA #IMPLIED>

-

-<!ELEMENT jboss (classpath)*>

-<!ATTLIST jboss

-          id ID #IMPLIED

-          destdir CDATA #IMPLIED

-          genericjarsuffix CDATA #IMPLIED

-          classpath CDATA #IMPLIED>

-

-<!ELEMENT borland (classpath)*>

-<!ATTLIST borland

-          id ID #IMPLIED

-          verifyargs CDATA #IMPLIED

-          debug %boolean; #IMPLIED

-          destdir CDATA #IMPLIED

-          classpath CDATA #IMPLIED

-          genericjarsuffix CDATA #IMPLIED

-          version CDATA #IMPLIED

-          basdtd CDATA #IMPLIED

-          verify %boolean; #IMPLIED

-          suffix CDATA #IMPLIED

-          generateclient %boolean; #IMPLIED>

-

-<!ELEMENT weblogic (classpath | wlclasspath | sysproperty)*>

-<!ATTLIST weblogic

-          id ID #IMPLIED

-          newcmp %boolean; #IMPLIED

-          ejbdtd CDATA #IMPLIED

-          jvmargs CDATA #IMPLIED

-          rebuild %boolean; #IMPLIED

-          suffix CDATA #IMPLIED

-          args CDATA #IMPLIED

-          outputdir CDATA #IMPLIED

-          wldtd CDATA #IMPLIED

-          destdir CDATA #IMPLIED

-          weblogicdtd CDATA #IMPLIED

-          wlclasspath CDATA #IMPLIED

-          jvmdebuglevel CDATA #IMPLIED

-          classpath CDATA #IMPLIED

-          keepgenerated CDATA #IMPLIED

-          compiler CDATA #IMPLIED

-          oldcmp %boolean; #IMPLIED

-          keepgeneric %boolean; #IMPLIED

-          ejbcclass CDATA #IMPLIED

-          noejbc %boolean; #IMPLIED

-          genericjarsuffix CDATA #IMPLIED>

-

-<!ELEMENT iplanet (classpath)*>

-<!ATTLIST iplanet

-          id ID #IMPLIED

-          destdir CDATA #IMPLIED

-          genericjarsuffix CDATA #IMPLIED

-          keepgenerated %boolean; #IMPLIED

-          debug %boolean; #IMPLIED

-          classpath CDATA #IMPLIED

-          suffix CDATA #IMPLIED

-          iashome CDATA #IMPLIED>

-

-<!ELEMENT jonas (classpath)*>

-<!ATTLIST jonas

-          id ID #IMPLIED

-          jonasroot CDATA #IMPLIED

-          additionalargs CDATA #IMPLIED

-          keepgeneric %boolean; #IMPLIED

-          javac CDATA #IMPLIED

-          destdir CDATA #IMPLIED

-          orb CDATA #IMPLIED

-          classpath CDATA #IMPLIED

-          jarsuffix CDATA #IMPLIED

-          verbose %boolean; #IMPLIED

-          nogenic %boolean; #IMPLIED

-          genericjarsuffix CDATA #IMPLIED

-          rmicopts CDATA #IMPLIED

-          javacopts CDATA #IMPLIED

-          novalidation %boolean; #IMPLIED

-          nocompil %boolean; #IMPLIED

-          keepgenerated %boolean; #IMPLIED

-          secpropag %boolean; #IMPLIED>

-

-<!ELEMENT support (patternset | exclude | include | custom | none | present | not | or | contains | depend | size | majority | filename | selector | includesfile | date | excludesfile | depth | and)*>

-<!ATTLIST support

-          id ID #IMPLIED

-          refid IDREF #IMPLIED

-          dir CDATA #IMPLIED

-          defaultexcludes %boolean; #IMPLIED

-          followsymlinks %boolean; #IMPLIED

-          casesensitive %boolean; #IMPLIED

-          description CDATA #IMPLIED

-          excludes CDATA #IMPLIED

-          includesfile CDATA #IMPLIED

-          excludesfile CDATA #IMPLIED

-          includes CDATA #IMPLIED>

-

-<!ELEMENT websphere (classpath | wasclasspath)*>

-<!ATTLIST websphere

-          id ID #IMPLIED

-          newcmp %boolean; #IMPLIED

-          ejbdtd CDATA #IMPLIED

-          noinform %boolean; #IMPLIED

-          rebuild %boolean; #IMPLIED

-          suffix CDATA #IMPLIED

-          args CDATA #IMPLIED

-          quiet %boolean; #IMPLIED

-          dbschema CDATA #IMPLIED

-          destdir CDATA #IMPLIED

-          ejbdeploy %boolean; #IMPLIED

-          tempdir CDATA #IMPLIED

-          use35 %boolean; #IMPLIED

-          novalidate %boolean; #IMPLIED

-          codegen %boolean; #IMPLIED

-          dbvendor (SQL92 | SQL99 | DB2UDBWIN_V71 | DB2UDBOS390_V6 | DB2UDBAS400_V4R5 | ORACLE_V8 | INFORMIX_V92 | SYBASE_V1192 | MSSQLSERVER_V7 | MYSQL_V323) #IMPLIED

-          classpath CDATA #IMPLIED

-          keepgenerated CDATA #IMPLIED

-          compiler CDATA #IMPLIED

-          wasclasspath CDATA #IMPLIED

-          oldcmp %boolean; #IMPLIED

-          dbname CDATA #IMPLIED

-          keepgeneric %boolean; #IMPLIED

-          trace %boolean; #IMPLIED

-          nowarn %boolean; #IMPLIED

-          genericjarsuffix CDATA #IMPLIED>

-

-<!ELEMENT wasclasspath (fileset | dirset | filelist | pathelement | path)*>

-<!ATTLIST wasclasspath

-          id ID #IMPLIED

-          location CDATA #IMPLIED

-          refid IDREF #IMPLIED

-          description CDATA #IMPLIED

-          path CDATA #IMPLIED>

-

-<!ELEMENT war (patternset | exclude | include | custom | none | present | manifest | not | metainf | or | contains | lib | depend | fileset | size | majority | filename | selector | includesfile | zipgroupfileset | zipfileset | classes | date | webinf | excludesfile | depth | and)*>

-<!ATTLIST war

-          id ID #IMPLIED

-          whenempty (fail | skip | create) #IMPLIED

-          duplicate (add | preserve | fail) #IMPLIED

-          excludes CDATA #IMPLIED

-          manifest CDATA #IMPLIED

-          basedir CDATA #IMPLIED

-          encoding CDATA #IMPLIED

-          jarfile CDATA #IMPLIED

-          index %boolean; #IMPLIED

-          defaultexcludes %boolean; #IMPLIED

-          update %boolean; #IMPLIED

-          followsymlinks %boolean; #IMPLIED

-          destfile CDATA #IMPLIED

-          casesensitive %boolean; #IMPLIED

-          includes CDATA #IMPLIED

-          webxml CDATA #IMPLIED

-          description CDATA #IMPLIED

-          includesfile CDATA #IMPLIED

-          compress %boolean; #IMPLIED

-          taskname CDATA #IMPLIED

-          warfile CDATA #IMPLIED

-          filesonly %boolean; #IMPLIED

-          file CDATA #IMPLIED

-          excludesfile CDATA #IMPLIED

-          zipfile CDATA #IMPLIED>

-

-<!ELEMENT manifest (attribute | section)*>

-<!ATTLIST manifest

-          id ID #IMPLIED>

-

-<!ELEMENT attribute EMPTY>

-<!ATTLIST attribute

-          id ID #IMPLIED

-          name CDATA #IMPLIED

-          value CDATA #IMPLIED>

-

-<!ELEMENT section (attribute)*>

-<!ATTLIST section

-          id ID #IMPLIED

-          name CDATA #IMPLIED>

-

-<!ELEMENT metainf (patternset | exclude | include | custom | none | present | not | or | contains | depend | size | majority | filename | selector | includesfile | date | excludesfile | depth | and)*>

-<!ATTLIST metainf

-          id ID #IMPLIED

-          src CDATA #IMPLIED

-          refid IDREF #IMPLIED

-          dir CDATA #IMPLIED

-          defaultexcludes %boolean; #IMPLIED

-          followsymlinks %boolean; #IMPLIED

-          prefix CDATA #IMPLIED

-          casesensitive %boolean; #IMPLIED

-          fullpath CDATA #IMPLIED

-          description CDATA #IMPLIED

-          excludes CDATA #IMPLIED

-          includesfile CDATA #IMPLIED

-          excludesfile CDATA #IMPLIED

-          includes CDATA #IMPLIED>

-

-<!ELEMENT lib (patternset | exclude | include | custom | none | present | not | or | contains | depend | size | majority | filename | selector | includesfile | date | excludesfile | depth | and)*>

-<!ATTLIST lib

-          id ID #IMPLIED

-          src CDATA #IMPLIED

-          refid IDREF #IMPLIED

-          dir CDATA #IMPLIED

-          defaultexcludes %boolean; #IMPLIED

-          followsymlinks %boolean; #IMPLIED

-          prefix CDATA #IMPLIED

-          casesensitive %boolean; #IMPLIED

-          fullpath CDATA #IMPLIED

-          description CDATA #IMPLIED

-          excludes CDATA #IMPLIED

-          includesfile CDATA #IMPLIED

-          excludesfile CDATA #IMPLIED

-          includes CDATA #IMPLIED>

-

-<!ELEMENT classes (patternset | exclude | include | custom | none | present | not | or | contains | depend | size | majority | filename | selector | includesfile | date | excludesfile | depth | and)*>

-<!ATTLIST classes

-          id ID #IMPLIED

-          src CDATA #IMPLIED

-          refid IDREF #IMPLIED

-          dir CDATA #IMPLIED

-          defaultexcludes %boolean; #IMPLIED

-          followsymlinks %boolean; #IMPLIED

-          prefix CDATA #IMPLIED

-          casesensitive %boolean; #IMPLIED

-          fullpath CDATA #IMPLIED

-          description CDATA #IMPLIED

-          excludes CDATA #IMPLIED

-          includesfile CDATA #IMPLIED

-          excludesfile CDATA #IMPLIED

-          includes CDATA #IMPLIED>

-

-<!ELEMENT webinf (patternset | exclude | include | custom | none | present | not | or | contains | depend | size | majority | filename | selector | includesfile | date | excludesfile | depth | and)*>

-<!ATTLIST webinf

-          id ID #IMPLIED

-          src CDATA #IMPLIED

-          refid IDREF #IMPLIED

-          dir CDATA #IMPLIED

-          defaultexcludes %boolean; #IMPLIED

-          followsymlinks %boolean; #IMPLIED

-          prefix CDATA #IMPLIED

-          casesensitive %boolean; #IMPLIED

-          fullpath CDATA #IMPLIED

-          description CDATA #IMPLIED

-          excludes CDATA #IMPLIED

-          includesfile CDATA #IMPLIED

-          excludesfile CDATA #IMPLIED

-          includes CDATA #IMPLIED>

-

-<!ELEMENT rename EMPTY>

-<!ATTLIST rename

-          id ID #IMPLIED

-          dest CDATA #IMPLIED

-          taskname CDATA #IMPLIED

-          replace CDATA #IMPLIED

-          description CDATA #IMPLIED

-          src CDATA #IMPLIED>

-

-<!ELEMENT sequential (%tasks;)*>

-<!ATTLIST sequential

-          id ID #IMPLIED

-          taskname CDATA #IMPLIED

-          description CDATA #IMPLIED>

-

-<!ELEMENT serverdeploy (weblogic | generic | jonas)*>

-<!ATTLIST serverdeploy

-          id ID #IMPLIED

-          taskname CDATA #IMPLIED

-          description CDATA #IMPLIED

-          action CDATA #IMPLIED

-          source CDATA #IMPLIED>

-

-<!ELEMENT generic (arg | jvmarg | classpath)*>

-<!ATTLIST generic

-          id ID #IMPLIED

-          classpath CDATA #IMPLIED

-          password CDATA #IMPLIED

-          classname CDATA #IMPLIED

-          server CDATA #IMPLIED

-          username CDATA #IMPLIED>

-

-<!ELEMENT property (classpath)*>

-<!ATTLIST property

-          id ID #IMPLIED

-          refid IDREF #IMPLIED

-          name CDATA #IMPLIED

-          classpath CDATA #IMPLIED

-          file CDATA #IMPLIED

-          userproperty %boolean; #IMPLIED

-          resource CDATA #IMPLIED

-          environment CDATA #IMPLIED

-          prefix CDATA #IMPLIED

-          taskname CDATA #IMPLIED

-          value CDATA #IMPLIED

-          location CDATA #IMPLIED

-          description CDATA #IMPLIED>

-

-<!ELEMENT move (filterchain | fileset | filterset | mapper)*>

-<!ATTLIST move

-          id ID #IMPLIED

-          flatten %boolean; #IMPLIED

-          encoding CDATA #IMPLIED

-          tofile CDATA #IMPLIED

-          todir CDATA #IMPLIED

-          file CDATA #IMPLIED

-          verbose %boolean; #IMPLIED

-          includeemptydirs %boolean; #IMPLIED

-          overwrite %boolean; #IMPLIED

-          taskname CDATA #IMPLIED

-          failonerror %boolean; #IMPLIED

-          description CDATA #IMPLIED

-          preservelastmodified %boolean; #IMPLIED

-          filtering %boolean; #IMPLIED>

-

-<!ELEMENT copydir (patternset | exclude | include | custom | none | present | not | or | contains | depend | size | majority | filename | selector | includesfile | date | excludesfile | depth | and)*>

-<!ATTLIST copydir

-          id ID #IMPLIED

-          flatten %boolean; #IMPLIED

-          src CDATA #IMPLIED

-          defaultexcludes %boolean; #IMPLIED

-          followsymlinks %boolean; #IMPLIED

-          taskname CDATA #IMPLIED

-          casesensitive %boolean; #IMPLIED

-          dest CDATA #IMPLIED

-          forceoverwrite %boolean; #IMPLIED

-          description CDATA #IMPLIED

-          excludes CDATA #IMPLIED

-          includesfile CDATA #IMPLIED

-          excludesfile CDATA #IMPLIED

-          filtering %boolean; #IMPLIED

-          includes CDATA #IMPLIED>

-

-<!ELEMENT cccheckin EMPTY>

-<!ATTLIST cccheckin

-          id ID #IMPLIED

-          preservetime %boolean; #IMPLIED

-          viewpath CDATA #IMPLIED

-          comment CDATA #IMPLIED

-          nowarn %boolean; #IMPLIED

-          identical %boolean; #IMPLIED

-          cleartooldir CDATA #IMPLIED

-          keepcopy %boolean; #IMPLIED

-          taskname CDATA #IMPLIED

-          description CDATA #IMPLIED

-          commentfile CDATA #IMPLIED>

-

-<!ELEMENT wljspc (patternset | exclude | include | custom | none | present | not | or | contains | depend | classpath | size | majority | filename | selector | includesfile | date | excludesfile | depth | and)*>

-<!ATTLIST wljspc

-          id ID #IMPLIED

-          src CDATA #IMPLIED

-          classpath CDATA #IMPLIED

-          defaultexcludes %boolean; #IMPLIED

-          followsymlinks %boolean; #IMPLIED

-          taskname CDATA #IMPLIED

-          casesensitive %boolean; #IMPLIED

-          package CDATA #IMPLIED

-          dest CDATA #IMPLIED

-          description CDATA #IMPLIED

-          excludes CDATA #IMPLIED

-          includesfile CDATA #IMPLIED

-          excludesfile CDATA #IMPLIED

-          includes CDATA #IMPLIED>

-

-<!ELEMENT fixcrlf (patternset | exclude | include | custom | none | present | not | or | contains | depend | size | majority | filename | selector | includesfile | date | excludesfile | depth | and)*>

-<!ATTLIST fixcrlf

-          id ID #IMPLIED

-          tab (add | asis | remove) #IMPLIED

-          excludes CDATA #IMPLIED

-          encoding CDATA #IMPLIED

-          cr (add | asis | remove) #IMPLIED

-          destdir CDATA #IMPLIED

-          defaultexcludes %boolean; #IMPLIED

-          eol (asis | cr | lf | crlf) #IMPLIED

-          followsymlinks %boolean; #IMPLIED

-          javafiles %boolean; #IMPLIED

-          eof (add | asis | remove) #IMPLIED

-          casesensitive %boolean; #IMPLIED

-          tablength CDATA #IMPLIED

-          includes CDATA #IMPLIED

-          description CDATA #IMPLIED

-          includesfile CDATA #IMPLIED

-          taskname CDATA #IMPLIED

-          srcdir CDATA #IMPLIED

-          excludesfile CDATA #IMPLIED>

-

-<!ELEMENT sosget EMPTY>

-<!ATTLIST sosget

-          id ID #IMPLIED

-          password CDATA #IMPLIED

-          comment CDATA #IMPLIED

-          nocompress %boolean; #IMPLIED

-          version CDATA #IMPLIED

-          username CDATA #IMPLIED

-          sosserverpath CDATA #IMPLIED

-          label CDATA #IMPLIED

-          vssserverpath CDATA #IMPLIED

-          soscmd CDATA #IMPLIED

-          verbose %boolean; #IMPLIED

-          localpath CDATA #IMPLIED

-          nocache %boolean; #IMPLIED

-          projectpath CDATA #IMPLIED

-          description CDATA #IMPLIED

-          taskname CDATA #IMPLIED

-          recursive %boolean; #IMPLIED

-          file CDATA #IMPLIED

-          soshome CDATA #IMPLIED>

-

-<!ELEMENT pathconvert (map | path)*>

-<!ATTLIST pathconvert

-          id ID #IMPLIED

-          pathsep CDATA #IMPLIED

-          taskname CDATA #IMPLIED

-          refid IDREF #IMPLIED

-          dirsep CDATA #IMPLIED

-          setonempty %boolean; #IMPLIED

-          description CDATA #IMPLIED

-          property CDATA #IMPLIED

-          targetos CDATA #IMPLIED>

-

-<!ELEMENT map EMPTY>

-<!ATTLIST map

-          id ID #IMPLIED

-          from CDATA #IMPLIED

-          to CDATA #IMPLIED>

-

-<!ELEMENT record EMPTY>

-<!ATTLIST record

-          id ID #IMPLIED

-          append %boolean; #IMPLIED

-          name CDATA #IMPLIED

-          taskname CDATA #IMPLIED

-          loglevel (error | warn | info | verbose | debug) #IMPLIED

-          emacsmode %boolean; #IMPLIED

-          description CDATA #IMPLIED

-          action (start | stop) #IMPLIED>

-

-<!ELEMENT p4sync EMPTY>

-<!ATTLIST p4sync

-          id ID #IMPLIED

-          force CDATA #IMPLIED

-          port CDATA #IMPLIED

-          client CDATA #IMPLIED

-          user CDATA #IMPLIED

-          cmdopts CDATA #IMPLIED

-          view CDATA #IMPLIED

-          label CDATA #IMPLIED

-          taskname CDATA #IMPLIED

-          failonerror %boolean; #IMPLIED

-          description CDATA #IMPLIED>

-

-<!ELEMENT exec (arg | env)*>

-<!ATTLIST exec

-          id ID #IMPLIED

-          append %boolean; #IMPLIED

-          output CDATA #IMPLIED

-          dir CDATA #IMPLIED

-          command CDATA #IMPLIED

-          outputproperty CDATA #IMPLIED

-          os CDATA #IMPLIED

-          resultproperty CDATA #IMPLIED

-          failifexecutionfails %boolean; #IMPLIED

-          timeout CDATA #IMPLIED

-          taskname CDATA #IMPLIED

-          vmlauncher %boolean; #IMPLIED

-          failonerror %boolean; #IMPLIED

-          description CDATA #IMPLIED

-          executable CDATA #IMPLIED

-          newenvironment %boolean; #IMPLIED>

-

-<!ELEMENT p4edit EMPTY>

-<!ATTLIST p4edit

-          id ID #IMPLIED

-          port CDATA #IMPLIED

-          client CDATA #IMPLIED

-          user CDATA #IMPLIED

-          cmdopts CDATA #IMPLIED

-          change CDATA #IMPLIED

-          view CDATA #IMPLIED

-          taskname CDATA #IMPLIED

-          failonerror %boolean; #IMPLIED

-          description CDATA #IMPLIED>

-

-<!ELEMENT maudit (fileset | rulespath | jvmarg | classpath | searchpath | sourcepath)*>

-<!ATTLIST maudit

-          id ID #IMPLIED

-          exit %boolean; #IMPLIED

-          tofile CDATA #IMPLIED

-          offsets %boolean; #IMPLIED

-          unused %boolean; #IMPLIED

-          quiet %boolean; #IMPLIED

-          verbose %boolean; #IMPLIED

-          maxmemory CDATA #IMPLIED

-          fix %boolean; #IMPLIED

-          metamatahome CDATA #IMPLIED

-          list %boolean; #IMPLIED

-          fullsemanticize %boolean; #IMPLIED

-          home CDATA #IMPLIED

-          taskname CDATA #IMPLIED

-          description CDATA #IMPLIED>

-

-<!ELEMENT rulespath (fileset | dirset | filelist | pathelement | path)*>

-<!ATTLIST rulespath

-          id ID #IMPLIED

-          location CDATA #IMPLIED

-          refid IDREF #IMPLIED

-          description CDATA #IMPLIED

-          path CDATA #IMPLIED>

-

-<!ELEMENT searchpath (fileset | dirset | filelist | pathelement | path)*>

-<!ATTLIST searchpath

-          id ID #IMPLIED

-          location CDATA #IMPLIED

-          refid IDREF #IMPLIED

-          description CDATA #IMPLIED

-          path CDATA #IMPLIED>

-

-<!ELEMENT antlr (jvmarg | classpath)*>

-<!ATTLIST antlr

-          id ID #IMPLIED

-          debug %boolean; #IMPLIED

-          outputdirectory CDATA #IMPLIED

-          fork %boolean; #IMPLIED

-          dir CDATA #IMPLIED

-          trace %boolean; #IMPLIED

-          tracetreewalker %boolean; #IMPLIED

-          html %boolean; #IMPLIED

-          tracelexer %boolean; #IMPLIED

-          diagnostic %boolean; #IMPLIED

-          traceparser %boolean; #IMPLIED

-          target CDATA #IMPLIED

-          taskname CDATA #IMPLIED

-          glib CDATA #IMPLIED

-          description CDATA #IMPLIED>

-

-<!ELEMENT netrexxc (patternset | exclude | include | custom | none | present | not | or | contains | depend | size | majority | filename | selector | includesfile | date | excludesfile | depth | and)*>

-<!ATTLIST netrexxc

-          id ID #IMPLIED

-          excludes CDATA #IMPLIED

-          verbose (verbose | verbose0 | verbose1 | verbose2 | verbose3 | verbose4 | verbose5 | noverbose) #IMPLIED

-          keep %boolean; #IMPLIED

-          comments %boolean; #IMPLIED

-          strictimport %boolean; #IMPLIED

-          sourcedir %boolean; #IMPLIED

-          diag %boolean; #IMPLIED

-          compile %boolean; #IMPLIED

-          binary %boolean; #IMPLIED

-          description CDATA #IMPLIED

-          includes CDATA #IMPLIED

-          suppressmethodargumentnotused %boolean; #IMPLIED

-          suppressvariablenotused %boolean; #IMPLIED

-          strictsignal %boolean; #IMPLIED

-          trace (trace | trace1 | trace2 | notrace) #IMPLIED

-          destdir CDATA #IMPLIED

-          console %boolean; #IMPLIED

-          replace %boolean; #IMPLIED

-          classpath CDATA #IMPLIED

-          casesensitive %boolean; #IMPLIED

-          followsymlinks %boolean; #IMPLIED

-          defaultexcludes %boolean; #IMPLIED

-          format %boolean; #IMPLIED

-          explicit %boolean; #IMPLIED

-          suppressprivatepropertynotused %boolean; #IMPLIED

-          includesfile CDATA #IMPLIED

-          strictargs %boolean; #IMPLIED

-          suppressdeprecation %boolean; #IMPLIED

-          strictcase %boolean; #IMPLIED

-          taskname CDATA #IMPLIED

-          savelog %boolean; #IMPLIED

-          logo %boolean; #IMPLIED

-          utf8 %boolean; #IMPLIED

-          strictprops %boolean; #IMPLIED

-          srcdir CDATA #IMPLIED

-          java %boolean; #IMPLIED

-          suppressexceptionnotsignalled %boolean; #IMPLIED

-          crossref %boolean; #IMPLIED

-          time %boolean; #IMPLIED

-          symbols %boolean; #IMPLIED

-          excludesfile CDATA #IMPLIED

-          strictassign %boolean; #IMPLIED

-          compact %boolean; #IMPLIED

-          decimal %boolean; #IMPLIED>

-

-<!ELEMENT jpcovreport (reference | coveragepath | sourcepath)*>

-<!ATTLIST jpcovreport

-          id ID #IMPLIED

-          snapshot CDATA #IMPLIED

-          filters CDATA #IMPLIED

-          tofile CDATA #IMPLIED

-          percent CDATA #IMPLIED

-          home CDATA #IMPLIED

-          type (executive | summary | detailed | verydetailed) #IMPLIED

-          taskname CDATA #IMPLIED

-          format (html | text | xml) #IMPLIED

-          includesource %boolean; #IMPLIED

-          description CDATA #IMPLIED>

-

-<!ELEMENT reference (classpath | filters)*>

-<!ATTLIST reference

-          id ID #IMPLIED>

-

-<!ELEMENT filters (include | exclude)*>

-<!ATTLIST filters

-          id ID #IMPLIED>

-

-<!ELEMENT coveragepath (fileset | dirset | filelist | pathelement | path)*>

-<!ATTLIST coveragepath

-          id ID #IMPLIED

-          location CDATA #IMPLIED

-          refid IDREF #IMPLIED

-          description CDATA #IMPLIED

-          path CDATA #IMPLIED>

-

-<!ELEMENT execon (arg | fileset | env | targetfile | srcfile | mapper)*>

-<!ATTLIST execon

-          id ID #IMPLIED

-          resultproperty CDATA #IMPLIED

-          skipemptyfilesets %boolean; #IMPLIED

-          type (file | dir | both) #IMPLIED

-          failifexecutionfails %boolean; #IMPLIED

-          command CDATA #IMPLIED

-          executable CDATA #IMPLIED

-          os CDATA #IMPLIED

-          output CDATA #IMPLIED

-          timeout CDATA #IMPLIED

-          dest CDATA #IMPLIED

-          dir CDATA #IMPLIED

-          description CDATA #IMPLIED

-          outputproperty CDATA #IMPLIED

-          failonerror %boolean; #IMPLIED

-          append %boolean; #IMPLIED

-          taskname CDATA #IMPLIED

-          newenvironment %boolean; #IMPLIED

-          vmlauncher %boolean; #IMPLIED

-          relative %boolean; #IMPLIED

-          parallel %boolean; #IMPLIED>

-

-<!ELEMENT targetfile EMPTY>

-<!ATTLIST targetfile

-          id ID #IMPLIED>

-

-<!ELEMENT srcfile EMPTY>

-<!ATTLIST srcfile

-          id ID #IMPLIED>

-

-<!ELEMENT ccmcheckout EMPTY>

-<!ATTLIST ccmcheckout

-          id ID #IMPLIED

-          ccmaction CDATA #IMPLIED

-          task CDATA #IMPLIED

-          taskname CDATA #IMPLIED

-          file CDATA #IMPLIED

-          description CDATA #IMPLIED

-          ccmdir CDATA #IMPLIED

-          comment CDATA #IMPLIED>

-

-<!ELEMENT ant (reference | property)*>

-<!ATTLIST ant

-          id ID #IMPLIED

-          output CDATA #IMPLIED

-          inheritall %boolean; #IMPLIED

-          dir CDATA #IMPLIED

-          taskname CDATA #IMPLIED

-          inheritrefs %boolean; #IMPLIED

-          description CDATA #IMPLIED

-          antfile CDATA #IMPLIED

-          target CDATA #IMPLIED>

-

-<!ELEMENT xmlvalidate (fileset | classpath | dtd | xmlcatalog)*>

-<!ATTLIST xmlvalidate

-          id ID #IMPLIED

-          classpath CDATA #IMPLIED

-          file CDATA #IMPLIED

-          classname CDATA #IMPLIED

-          lenient %boolean; #IMPLIED

-          warn %boolean; #IMPLIED

-          classpathref IDREF #IMPLIED

-          taskname CDATA #IMPLIED

-          failonerror %boolean; #IMPLIED

-          description CDATA #IMPLIED>

-

-<!ELEMENT xslt (patternset | exclude | include | custom | none | present | not | param | or | contains | depend | classpath | size | majority | filename | xmlcatalog | selector | outputproperty | includesfile | date | excludesfile | depth | and)*>

-<!ATTLIST xslt

-          id ID #IMPLIED

-          force %boolean; #IMPLIED

-          excludes CDATA #IMPLIED

-          processor CDATA #IMPLIED

-          classpathref IDREF #IMPLIED

-          basedir CDATA #IMPLIED

-          destdir CDATA #IMPLIED

-          defaultexcludes %boolean; #IMPLIED

-          scanincludeddirectories %boolean; #IMPLIED

-          extension CDATA #IMPLIED

-          in CDATA #IMPLIED

-          followsymlinks %boolean; #IMPLIED

-          classpath CDATA #IMPLIED

-          casesensitive %boolean; #IMPLIED

-          includes CDATA #IMPLIED

-          description CDATA #IMPLIED

-          out CDATA #IMPLIED

-          style CDATA #IMPLIED

-          includesfile CDATA #IMPLIED

-          taskname CDATA #IMPLIED

-          excludesfile CDATA #IMPLIED>

-

-<!ELEMENT iplanet-ejbc (classpath)*>

-<!ATTLIST iplanet-ejbc

-          id ID #IMPLIED

-          ejbdescriptor CDATA #IMPLIED

-          debug %boolean; #IMPLIED

-          classpath CDATA #IMPLIED

-          iasdescriptor CDATA #IMPLIED

-          iashome CDATA #IMPLIED

-          taskname CDATA #IMPLIED

-          dest CDATA #IMPLIED

-          description CDATA #IMPLIED

-          keepgenerated %boolean; #IMPLIED>

-

-<!ELEMENT ccmcheckintask EMPTY>

-<!ATTLIST ccmcheckintask

-          id ID #IMPLIED

-          ccmaction CDATA #IMPLIED

-          task CDATA #IMPLIED

-          taskname CDATA #IMPLIED

-          file CDATA #IMPLIED

-          description CDATA #IMPLIED

-          ccmdir CDATA #IMPLIED

-          comment CDATA #IMPLIED>

-

-<!ELEMENT gzip EMPTY>

-<!ATTLIST gzip

-          id ID #IMPLIED

-          taskname CDATA #IMPLIED

-          zipfile CDATA #IMPLIED

-          description CDATA #IMPLIED

-          src CDATA #IMPLIED>

-

-<!ELEMENT native2ascii (patternset | exclude | include | custom | none | present | not | or | contains | depend | size | majority | filename | selector | includesfile | mapper | date | excludesfile | depth | and)*>

-<!ATTLIST native2ascii

-          id ID #IMPLIED

-          src CDATA #IMPLIED

-          ext CDATA #IMPLIED

-          encoding CDATA #IMPLIED

-          defaultexcludes %boolean; #IMPLIED

-          followsymlinks %boolean; #IMPLIED

-          reverse %boolean; #IMPLIED

-          taskname CDATA #IMPLIED

-          casesensitive %boolean; #IMPLIED

-          dest CDATA #IMPLIED

-          description CDATA #IMPLIED

-          excludes CDATA #IMPLIED

-          includesfile CDATA #IMPLIED

-          excludesfile CDATA #IMPLIED

-          includes CDATA #IMPLIED>

-

-<!ELEMENT starteam EMPTY>

-<!ATTLIST starteam

-          id ID #IMPLIED

-          targetfolderabsolute %boolean; #IMPLIED

-          force %boolean; #IMPLIED

-          recursion %boolean; #IMPLIED

-          verbose %boolean; #IMPLIED

-          username CDATA #IMPLIED

-          targetfolder CDATA #IMPLIED

-          viewname CDATA #IMPLIED

-          projectname CDATA #IMPLIED

-          servername CDATA #IMPLIED

-          taskname CDATA #IMPLIED

-          serverport CDATA #IMPLIED

-          description CDATA #IMPLIED

-          password CDATA #IMPLIED

-          foldername CDATA #IMPLIED

-          excludes CDATA #IMPLIED

-          includes CDATA #IMPLIED>

-

-<!ELEMENT ear (patternset | exclude | include | custom | none | present | manifest | not | metainf | or | contains | depend | fileset | size | majority | archives | filename | selector | includesfile | zipgroupfileset | zipfileset | date | excludesfile | depth | and)*>

-<!ATTLIST ear

-          id ID #IMPLIED

-          whenempty (fail | skip | create) #IMPLIED

-          duplicate (add | preserve | fail) #IMPLIED

-          excludes CDATA #IMPLIED

-          manifest CDATA #IMPLIED

-          basedir CDATA #IMPLIED

-          encoding CDATA #IMPLIED

-          jarfile CDATA #IMPLIED

-          index %boolean; #IMPLIED

-          defaultexcludes %boolean; #IMPLIED

-          update %boolean; #IMPLIED

-          followsymlinks %boolean; #IMPLIED

-          destfile CDATA #IMPLIED

-          earfile CDATA #IMPLIED

-          casesensitive %boolean; #IMPLIED

-          includes CDATA #IMPLIED

-          description CDATA #IMPLIED

-          includesfile CDATA #IMPLIED

-          appxml CDATA #IMPLIED

-          compress %boolean; #IMPLIED

-          taskname CDATA #IMPLIED

-          filesonly %boolean; #IMPLIED

-          file CDATA #IMPLIED

-          excludesfile CDATA #IMPLIED

-          zipfile CDATA #IMPLIED>

-

-<!ELEMENT archives (patternset | exclude | include | custom | none | present | not | or | contains | depend | size | majority | filename | selector | includesfile | date | excludesfile | depth | and)*>

-<!ATTLIST archives

-          id ID #IMPLIED

-          src CDATA #IMPLIED

-          refid IDREF #IMPLIED

-          dir CDATA #IMPLIED

-          defaultexcludes %boolean; #IMPLIED

-          followsymlinks %boolean; #IMPLIED

-          prefix CDATA #IMPLIED

-          casesensitive %boolean; #IMPLIED

-          fullpath CDATA #IMPLIED

-          description CDATA #IMPLIED

-          excludes CDATA #IMPLIED

-          includesfile CDATA #IMPLIED

-          excludesfile CDATA #IMPLIED

-          includes CDATA #IMPLIED>

-

-<!ELEMENT input (#PCDATA)>

-<!ATTLIST input

-          id ID #IMPLIED

-          addproperty CDATA #IMPLIED

-          taskname CDATA #IMPLIED

-          validargs CDATA #IMPLIED

-          message CDATA #IMPLIED

-          description CDATA #IMPLIED>

-

-<!ELEMENT rmic (patternset | exclude | include | custom | none | present | extdirs | not | or | contains | depend | classpath | size | majority | filename | selector | includesfile | compilerarg | date | excludesfile | depth | and)*>

-<!ATTLIST rmic

-          id ID #IMPLIED

-          verify %boolean; #IMPLIED

-          idlopts CDATA #IMPLIED

-          iiop %boolean; #IMPLIED

-          excludes CDATA #IMPLIED

-          extdirs CDATA #IMPLIED

-          sourcebase CDATA #IMPLIED

-          classpathref IDREF #IMPLIED

-          base CDATA #IMPLIED

-          defaultexcludes %boolean; #IMPLIED

-          followsymlinks %boolean; #IMPLIED

-          includejavaruntime %boolean; #IMPLIED

-          includeantruntime %boolean; #IMPLIED

-          classpath CDATA #IMPLIED

-          casesensitive %boolean; #IMPLIED

-          debug %boolean; #IMPLIED

-          compiler CDATA #IMPLIED

-          includes CDATA #IMPLIED

-          description CDATA #IMPLIED

-          includesfile CDATA #IMPLIED

-          idl %boolean; #IMPLIED

-          taskname CDATA #IMPLIED

-          iiopopts CDATA #IMPLIED

-          classname CDATA #IMPLIED

-          stubversion CDATA #IMPLIED

-          filtering %boolean; #IMPLIED

-          excludesfile CDATA #IMPLIED>

-

-<!ELEMENT extdirs (fileset | dirset | filelist | pathelement | path)*>

-<!ATTLIST extdirs

-          id ID #IMPLIED

-          location CDATA #IMPLIED

-          refid IDREF #IMPLIED

-          description CDATA #IMPLIED

-          path CDATA #IMPLIED>

-

-<!ELEMENT compilerarg EMPTY>

-<!ATTLIST compilerarg

-          id ID #IMPLIED

-          implementation CDATA #IMPLIED

-          line CDATA #IMPLIED

-          file CDATA #IMPLIED

-          compiler CDATA #IMPLIED

-          value CDATA #IMPLIED

-          path CDATA #IMPLIED>

-

-<!ELEMENT checksum (patternset | exclude | include | custom | none | present | not | or | contains | depend | fileset | size | majority | filename | selector | includesfile | date | excludesfile | depth | and)*>

-<!ATTLIST checksum

-          id ID #IMPLIED

-          file CDATA #IMPLIED

-          verifyproperty CDATA #IMPLIED

-          defaultexcludes %boolean; #IMPLIED

-          followsymlinks %boolean; #IMPLIED

-          readbuffersize CDATA #IMPLIED

-          algorithm CDATA #IMPLIED

-          provider CDATA #IMPLIED

-          taskname CDATA #IMPLIED

-          casesensitive %boolean; #IMPLIED

-          forceoverwrite %boolean; #IMPLIED

-          property CDATA #IMPLIED

-          description CDATA #IMPLIED

-          excludes CDATA #IMPLIED

-          includesfile CDATA #IMPLIED

-          excludesfile CDATA #IMPLIED

-          fileext CDATA #IMPLIED

-          includes CDATA #IMPLIED>

-

-<!ELEMENT mail (fileset | bcc | message | cc | to | from)*>

-<!ATTLIST mail

-          id ID #IMPLIED

-          includefilenames %boolean; #IMPLIED

-          files CDATA #IMPLIED

-          encoding (auto | mime | uu | plain) #IMPLIED

-          cclist CDATA #IMPLIED

-          bcclist CDATA #IMPLIED

-          tolist CDATA #IMPLIED

-          subject CDATA #IMPLIED

-          mailhost CDATA #IMPLIED

-          messagefile CDATA #IMPLIED

-          messagemimetype CDATA #IMPLIED

-          taskname CDATA #IMPLIED

-          from CDATA #IMPLIED

-          failonerror %boolean; #IMPLIED

-          description CDATA #IMPLIED

-          mailport CDATA #IMPLIED

-          message CDATA #IMPLIED>

-

-<!ELEMENT bcc EMPTY>

-<!ATTLIST bcc

-          id ID #IMPLIED

-          address CDATA #IMPLIED

-          name CDATA #IMPLIED>

-

-<!ELEMENT message (#PCDATA)>

-<!ATTLIST message

-          id ID #IMPLIED

-          mimetype CDATA #IMPLIED

-          src CDATA #IMPLIED>

-

-<!ELEMENT cc EMPTY>

-<!ATTLIST cc

-          id ID #IMPLIED

-          address CDATA #IMPLIED

-          name CDATA #IMPLIED>

-

-<!ELEMENT to EMPTY>

-<!ATTLIST to

-          id ID #IMPLIED

-          address CDATA #IMPLIED

-          name CDATA #IMPLIED>

-

-<!ELEMENT from EMPTY>

-<!ATTLIST from

-          id ID #IMPLIED

-          address CDATA #IMPLIED

-          name CDATA #IMPLIED>

-

-<!ELEMENT loadfile (filterchain)*>

-<!ATTLIST loadfile

-          id ID #IMPLIED

-          taskname CDATA #IMPLIED

-          encoding CDATA #IMPLIED

-          description CDATA #IMPLIED

-          property CDATA #IMPLIED

-          srcfile CDATA #IMPLIED

-          failonerror %boolean; #IMPLIED>

-

-<!ELEMENT vsscheckout EMPTY>

-<!ATTLIST vsscheckout

-          id ID #IMPLIED

-          date CDATA #IMPLIED

-          recursive %boolean; #IMPLIED

-          ssdir CDATA #IMPLIED

-          autoresponse CDATA #IMPLIED

-          vsspath CDATA #IMPLIED

-          version CDATA #IMPLIED

-          serverpath CDATA #IMPLIED

-          login CDATA #IMPLIED

-          label CDATA #IMPLIED

-          taskname CDATA #IMPLIED

-          localpath CDATA #IMPLIED

-          description CDATA #IMPLIED>

-

-<!ELEMENT stylebook (arg | jvmarg | classpath | sysproperty | env)*>

-<!ATTLIST stylebook

-          id ID #IMPLIED

-          jvmargs CDATA #IMPLIED

-          loaderconfig CDATA #IMPLIED

-          args CDATA #IMPLIED

-          fork %boolean; #IMPLIED

-          maxmemory CDATA #IMPLIED

-          classpathref IDREF #IMPLIED

-          jar CDATA #IMPLIED

-          targetdirectory CDATA #IMPLIED

-          output CDATA #IMPLIED

-          timeout CDATA #IMPLIED

-          skindirectory CDATA #IMPLIED

-          jvm CDATA #IMPLIED

-          book CDATA #IMPLIED

-          classpath CDATA #IMPLIED

-          dir CDATA #IMPLIED

-          description CDATA #IMPLIED

-          jvmversion CDATA #IMPLIED

-          failonerror %boolean; #IMPLIED

-          append %boolean; #IMPLIED

-          taskname CDATA #IMPLIED

-          newenvironment %boolean; #IMPLIED

-          classname CDATA #IMPLIED>

-

-<!ELEMENT soscheckin EMPTY>

-<!ATTLIST soscheckin

-          id ID #IMPLIED

-          password CDATA #IMPLIED

-          comment CDATA #IMPLIED

-          nocompress %boolean; #IMPLIED

-          version CDATA #IMPLIED

-          username CDATA #IMPLIED

-          sosserverpath CDATA #IMPLIED

-          label CDATA #IMPLIED

-          vssserverpath CDATA #IMPLIED

-          soscmd CDATA #IMPLIED

-          verbose %boolean; #IMPLIED

-          localpath CDATA #IMPLIED

-          nocache %boolean; #IMPLIED

-          projectpath CDATA #IMPLIED

-          description CDATA #IMPLIED

-          taskname CDATA #IMPLIED

-          recursive %boolean; #IMPLIED

-          file CDATA #IMPLIED

-          soshome CDATA #IMPLIED>

-

-<!ELEMENT mimemail (fileset | bcc | message | cc | to | from)*>

-<!ATTLIST mimemail

-          id ID #IMPLIED

-          includefilenames %boolean; #IMPLIED

-          files CDATA #IMPLIED

-          encoding (auto | mime | uu | plain) #IMPLIED

-          cclist CDATA #IMPLIED

-          bcclist CDATA #IMPLIED

-          tolist CDATA #IMPLIED

-          subject CDATA #IMPLIED

-          mailhost CDATA #IMPLIED

-          messagefile CDATA #IMPLIED

-          messagemimetype CDATA #IMPLIED

-          taskname CDATA #IMPLIED

-          from CDATA #IMPLIED

-          failonerror %boolean; #IMPLIED

-          description CDATA #IMPLIED

-          mailport CDATA #IMPLIED

-          message CDATA #IMPLIED>

-

-<!ELEMENT stlabel EMPTY>

-<!ATTLIST stlabel

-          id ID #IMPLIED

-          lastbuild CDATA #IMPLIED

-          url CDATA #IMPLIED

-          username CDATA #IMPLIED

-          viewname CDATA #IMPLIED

-          projectname CDATA #IMPLIED

-          servername CDATA #IMPLIED

-          label CDATA #IMPLIED

-          taskname CDATA #IMPLIED

-          description CDATA #IMPLIED

-          password CDATA #IMPLIED

-          serverport CDATA #IMPLIED>

-

-<!ELEMENT gunzip EMPTY>

-<!ATTLIST gunzip

-          id ID #IMPLIED

-          dest CDATA #IMPLIED

-          taskname CDATA #IMPLIED

-          description CDATA #IMPLIED

-          src CDATA #IMPLIED>

-

-<!ELEMENT concat (#PCDATA | fileset | filelist)*>

-<!ATTLIST concat

-          id ID #IMPLIED

-          append %boolean; #IMPLIED

-          taskname CDATA #IMPLIED

-          encoding CDATA #IMPLIED

-          description CDATA #IMPLIED

-          destfile CDATA #IMPLIED>

-

-<!ELEMENT cab (patternset | exclude | include | custom | none | present | not | or | contains | depend | fileset | size | majority | filename | selector | includesfile | date | excludesfile | depth | and)*>

-<!ATTLIST cab

-          id ID #IMPLIED

-          cabfile CDATA #IMPLIED

-          compress %boolean; #IMPLIED

-          verbose %boolean; #IMPLIED

-          defaultexcludes %boolean; #IMPLIED

-          followsymlinks %boolean; #IMPLIED

-          basedir CDATA #IMPLIED

-          taskname CDATA #IMPLIED

-          casesensitive %boolean; #IMPLIED

-          description CDATA #IMPLIED

-          excludes CDATA #IMPLIED

-          includesfile CDATA #IMPLIED

-          excludesfile CDATA #IMPLIED

-          options CDATA #IMPLIED

-          includes CDATA #IMPLIED>

-

-<!ELEMENT touch (fileset)*>

-<!ATTLIST touch

-          id ID #IMPLIED

-          taskname CDATA #IMPLIED

-          millis CDATA #IMPLIED

-          file CDATA #IMPLIED

-          description CDATA #IMPLIED

-          datetime CDATA #IMPLIED>

-

-<!ELEMENT parallel (%tasks;)*>

-<!ATTLIST parallel

-          id ID #IMPLIED

-          taskname CDATA #IMPLIED

-          description CDATA #IMPLIED>

-

-<!ELEMENT splash EMPTY>

-<!ATTLIST splash

-          id ID #IMPLIED

-          port CDATA #IMPLIED

-          user CDATA #IMPLIED

-          proxy CDATA #IMPLIED

-          imageurl CDATA #IMPLIED

-          taskname CDATA #IMPLIED

-          showduration CDATA #IMPLIED

-          description CDATA #IMPLIED

-          password CDATA #IMPLIED

-          useproxy %boolean; #IMPLIED>

-

-<!ELEMENT antcall (reference | param)*>

-<!ATTLIST antcall

-          id ID #IMPLIED

-          inheritall %boolean; #IMPLIED

-          taskname CDATA #IMPLIED

-          inheritrefs %boolean; #IMPLIED

-          description CDATA #IMPLIED

-          target CDATA #IMPLIED>

-

-<!ELEMENT cccheckout EMPTY>

-<!ATTLIST cccheckout

-          id ID #IMPLIED

-          reserved %boolean; #IMPLIED

-          viewpath CDATA #IMPLIED

-          out CDATA #IMPLIED

-          nodata %boolean; #IMPLIED

-          comment CDATA #IMPLIED

-          version %boolean; #IMPLIED

-          nowarn %boolean; #IMPLIED

-          cleartooldir CDATA #IMPLIED

-          taskname CDATA #IMPLIED

-          branch CDATA #IMPLIED

-          description CDATA #IMPLIED

-          commentfile CDATA #IMPLIED>

-

-<!ELEMENT typedef (classpath)*>

-<!ATTLIST typedef

-          id ID #IMPLIED

-          name CDATA #IMPLIED

-          classpath CDATA #IMPLIED

-          file CDATA #IMPLIED

-          classname CDATA #IMPLIED

-          resource CDATA #IMPLIED

-          loaderref IDREF #IMPLIED

-          classpathref IDREF #IMPLIED

-          taskname CDATA #IMPLIED

-          reverseloader %boolean; #IMPLIED

-          description CDATA #IMPLIED>

-

-<!ELEMENT p4have EMPTY>

-<!ATTLIST p4have

-          id ID #IMPLIED

-          view CDATA #IMPLIED

-          client CDATA #IMPLIED

-          user CDATA #IMPLIED

-          port CDATA #IMPLIED

-          taskname CDATA #IMPLIED

-          description CDATA #IMPLIED

-          cmdopts CDATA #IMPLIED

-          failonerror %boolean; #IMPLIED>

-

-<!ELEMENT xmlproperty EMPTY>

-<!ATTLIST xmlproperty

-          id ID #IMPLIED

-          taskname CDATA #IMPLIED

-          collapseattributes %boolean; #IMPLIED

-          keeproot %boolean; #IMPLIED

-          file CDATA #IMPLIED

-          description CDATA #IMPLIED

-          prefix CDATA #IMPLIED

-          validate %boolean; #IMPLIED>

-

-<!ELEMENT copy (filterchain | fileset | filterset | mapper)*>

-<!ATTLIST copy

-          id ID #IMPLIED

-          flatten %boolean; #IMPLIED

-          encoding CDATA #IMPLIED

-          tofile CDATA #IMPLIED

-          todir CDATA #IMPLIED

-          file CDATA #IMPLIED

-          verbose %boolean; #IMPLIED

-          includeemptydirs %boolean; #IMPLIED

-          overwrite %boolean; #IMPLIED

-          taskname CDATA #IMPLIED

-          failonerror %boolean; #IMPLIED

-          description CDATA #IMPLIED

-          preservelastmodified %boolean; #IMPLIED

-          filtering %boolean; #IMPLIED>

-

-<!ELEMENT antstructure EMPTY>

-<!ATTLIST antstructure

-          id ID #IMPLIED

-          output CDATA #IMPLIED

-          taskname CDATA #IMPLIED

-          description CDATA #IMPLIED>

-

-<!ELEMENT ccmcreatetask EMPTY>

-<!ATTLIST ccmcreatetask

-          id ID #IMPLIED

-          subsystem CDATA #IMPLIED

-          task CDATA #IMPLIED

-          platform CDATA #IMPLIED

-          resolver CDATA #IMPLIED

-          comment CDATA #IMPLIED

-          ccmaction CDATA #IMPLIED

-          ccmdir CDATA #IMPLIED

-          release CDATA #IMPLIED

-          taskname CDATA #IMPLIED

-          description CDATA #IMPLIED>

-

-<!ELEMENT rpm EMPTY>

-<!ATTLIST rpm

-          id ID #IMPLIED

-          removesource %boolean; #IMPLIED

-          output CDATA #IMPLIED

-          command CDATA #IMPLIED

-          cleanbuilddir %boolean; #IMPLIED

-          removespec %boolean; #IMPLIED

-          error CDATA #IMPLIED

-          taskname CDATA #IMPLIED

-          description CDATA #IMPLIED

-          specfile CDATA #IMPLIED

-          topdir CDATA #IMPLIED>

-

-<!ELEMENT delete (exclude | patternset | include | custom | none | present | not | or | contains | depend | fileset | size | majority | filename | selector | includesfile | date | excludesfile | and | depth)*>

-<!ATTLIST delete

-          id ID #IMPLIED

-          file CDATA #IMPLIED

-          dir CDATA #IMPLIED

-          quiet %boolean; #IMPLIED

-          verbose %boolean; #IMPLIED

-          defaultexcludes %boolean; #IMPLIED

-          followsymlinks %boolean; #IMPLIED

-          includeemptydirs %boolean; #IMPLIED

-          taskname CDATA #IMPLIED

-          casesensitive %boolean; #IMPLIED

-          failonerror %boolean; #IMPLIED

-          description CDATA #IMPLIED

-          excludesfile CDATA #IMPLIED

-          includesfile CDATA #IMPLIED

-          excludes CDATA #IMPLIED

-          includes CDATA #IMPLIED>

-

-<!ELEMENT replace (patternset | exclude | include | custom | none | present | not | replacefilter | or | contains | depend | replacetoken | size | majority | filename | selector | includesfile | replacevalue | date | excludesfile | depth | and)*>

-<!ATTLIST replace

-          id ID #IMPLIED

-          encoding CDATA #IMPLIED

-          file CDATA #IMPLIED

-          dir CDATA #IMPLIED

-          token CDATA #IMPLIED

-          propertyfile CDATA #IMPLIED

-          defaultexcludes %boolean; #IMPLIED

-          followsymlinks %boolean; #IMPLIED

-          summary %boolean; #IMPLIED

-          taskname CDATA #IMPLIED

-          casesensitive %boolean; #IMPLIED

-          value CDATA #IMPLIED

-          description CDATA #IMPLIED

-          replacefilterfile CDATA #IMPLIED

-          excludes CDATA #IMPLIED

-          includesfile CDATA #IMPLIED

-          excludesfile CDATA #IMPLIED

-          includes CDATA #IMPLIED>

-

-<!ELEMENT replacefilter EMPTY>

-<!ATTLIST replacefilter

-          id ID #IMPLIED

-          token CDATA #IMPLIED

-          value CDATA #IMPLIED

-          property CDATA #IMPLIED>

-

-<!ELEMENT replacetoken (#PCDATA)>

-<!ATTLIST replacetoken

-          id ID #IMPLIED>

-

-<!ELEMENT replacevalue (#PCDATA)>

-<!ATTLIST replacevalue

-          id ID #IMPLIED>

-

-<!ELEMENT mmetrics (fileset | jvmarg | classpath | path | sourcepath)*>

-<!ATTLIST mmetrics

-          id ID #IMPLIED

-          taskname CDATA #IMPLIED

-          metamatahome CDATA #IMPLIED

-          tofile CDATA #IMPLIED

-          description CDATA #IMPLIED

-          maxmemory CDATA #IMPLIED

-          granularity (compilation-units | files | methods | types | packages) #IMPLIED

-          home CDATA #IMPLIED>

-

-<!ELEMENT waitfor (isfalse | equals | available | not | contains | os | or | and | filesmatch | checksum | istrue | isset | socket | http | uptodate)*>

-<!ATTLIST waitfor

-          id ID #IMPLIED

-          checkeveryunit (millisecond | second | minute | hour | day | week) #IMPLIED

-          checkevery CDATA #IMPLIED

-          maxwaitunit (millisecond | second | minute | hour | day | week) #IMPLIED

-          maxwait CDATA #IMPLIED

-          timeoutproperty CDATA #IMPLIED>

-

-<!ELEMENT isfalse EMPTY>

-<!ATTLIST isfalse

-          id ID #IMPLIED

-          value %boolean; #IMPLIED>

-

-<!ELEMENT equals EMPTY>

-<!ATTLIST equals

-          id ID #IMPLIED

-          trim %boolean; #IMPLIED

-          arg2 CDATA #IMPLIED

-          arg1 CDATA #IMPLIED

-          casesensitive %boolean; #IMPLIED>

-

-<!ELEMENT available (classpath | filepath)*>

-<!ATTLIST available

-          id ID #IMPLIED

-          classpath CDATA #IMPLIED

-          file CDATA #IMPLIED

-          resource CDATA #IMPLIED

-          classname CDATA #IMPLIED

-          ignoresystemclasses %boolean; #IMPLIED

-          type (file | dir) #IMPLIED

-          classpathref IDREF #IMPLIED

-          taskname CDATA #IMPLIED

-          value CDATA #IMPLIED

-          property CDATA #IMPLIED

-          description CDATA #IMPLIED

-          filepath CDATA #IMPLIED>

-

-<!ELEMENT filepath (fileset | dirset | filelist | pathelement | path)*>

-<!ATTLIST filepath

-          id ID #IMPLIED

-          location CDATA #IMPLIED

-          refid IDREF #IMPLIED

-          description CDATA #IMPLIED

-          path CDATA #IMPLIED>

-

-<!ELEMENT os EMPTY>

-<!ATTLIST os

-          id ID #IMPLIED

-          version CDATA #IMPLIED

-          name CDATA #IMPLIED

-          family CDATA #IMPLIED

-          arch CDATA #IMPLIED>

-

-<!ELEMENT filesmatch EMPTY>

-<!ATTLIST filesmatch

-          id ID #IMPLIED

-          file2 CDATA #IMPLIED

-          file1 CDATA #IMPLIED>

-

-<!ELEMENT istrue EMPTY>

-<!ATTLIST istrue

-          id ID #IMPLIED

-          value %boolean; #IMPLIED>

-

-<!ELEMENT isset EMPTY>

-<!ATTLIST isset

-          id ID #IMPLIED

-          property CDATA #IMPLIED>

-

-<!ELEMENT socket EMPTY>

-<!ATTLIST socket

-          id ID #IMPLIED

-          port CDATA #IMPLIED

-          server CDATA #IMPLIED>

-

-<!ELEMENT http EMPTY>

-<!ATTLIST http

-          id ID #IMPLIED

-          url CDATA #IMPLIED>

-

-<!ELEMENT uptodate (srcfiles | mapper)*>

-<!ATTLIST uptodate

-          id ID #IMPLIED

-          taskname CDATA #IMPLIED

-          description CDATA #IMPLIED

-          value CDATA #IMPLIED

-          property CDATA #IMPLIED

-          srcfile CDATA #IMPLIED

-          targetfile CDATA #IMPLIED>

-

-<!ELEMENT srcfiles (patternset | exclude | include | custom | none | present | not | or | contains | depend | size | majority | filename | selector | includesfile | date | excludesfile | depth | and)*>

-<!ATTLIST srcfiles

-          id ID #IMPLIED

-          refid IDREF #IMPLIED

-          dir CDATA #IMPLIED

-          defaultexcludes %boolean; #IMPLIED

-          followsymlinks %boolean; #IMPLIED

-          casesensitive %boolean; #IMPLIED

-          description CDATA #IMPLIED

-          excludes CDATA #IMPLIED

-          includesfile CDATA #IMPLIED

-          excludesfile CDATA #IMPLIED

-          includes CDATA #IMPLIED>

-

-<!ELEMENT untar (fileset | patternset)*>

-<!ATTLIST untar

-          id ID #IMPLIED

-          compression (none | gzip | bzip2) #IMPLIED

-          overwrite %boolean; #IMPLIED

-          dest CDATA #IMPLIED

-          taskname CDATA #IMPLIED

-          description CDATA #IMPLIED

-          src CDATA #IMPLIED>

-

-<!ELEMENT loadproperties (filterchain)*>

-<!ATTLIST loadproperties

-          id ID #IMPLIED

-          taskname CDATA #IMPLIED

-          description CDATA #IMPLIED

-          srcfile CDATA #IMPLIED>

-

-<!ELEMENT echoproperties EMPTY>

-<!ATTLIST echoproperties

-          id ID #IMPLIED

-          taskname CDATA #IMPLIED

-          description CDATA #IMPLIED

-          prefix CDATA #IMPLIED

-          failonerror %boolean; #IMPLIED

-          destfile CDATA #IMPLIED>

-

-<!ELEMENT junit (batchtest | jvmarg | classpath | sysproperty | formatter | env | test)*>

-<!ATTLIST junit

-          id ID #IMPLIED

-          showoutput %boolean; #IMPLIED

-          haltonerror %boolean; #IMPLIED

-          fork %boolean; #IMPLIED

-          jvm CDATA #IMPLIED

-          dir CDATA #IMPLIED

-          failureproperty CDATA #IMPLIED

-          maxmemory CDATA #IMPLIED

-          filtertrace %boolean; #IMPLIED

-          includeantruntime %boolean; #IMPLIED

-          haltonfailure %boolean; #IMPLIED

-          errorproperty CDATA #IMPLIED

-          timeout CDATA #IMPLIED

-          printsummary (true | yes | false | no | on | off | withOutAndErr) #IMPLIED

-          taskname CDATA #IMPLIED

-          description CDATA #IMPLIED

-          newenvironment %boolean; #IMPLIED>

-

-<!ELEMENT batchtest (fileset | formatter)*>

-<!ATTLIST batchtest

-          id ID #IMPLIED

-          if CDATA #IMPLIED

-          unless CDATA #IMPLIED

-          haltonerror %boolean; #IMPLIED

-          fork %boolean; #IMPLIED

-          todir CDATA #IMPLIED

-          failureproperty CDATA #IMPLIED

-          filtertrace %boolean; #IMPLIED

-          haltonfailure %boolean; #IMPLIED

-          errorproperty CDATA #IMPLIED>

-

-<!ELEMENT formatter EMPTY>

-<!ATTLIST formatter

-          id ID #IMPLIED

-          usefile %boolean; #IMPLIED

-          type (plain | xml | brief) #IMPLIED

-          classname CDATA #IMPLIED

-          extension CDATA #IMPLIED>

-

-<!ELEMENT vajexport (include | exclude)*>

-<!ATTLIST vajexport

-          id ID #IMPLIED

-          exportclasses %boolean; #IMPLIED

-          remote CDATA #IMPLIED

-          destdir CDATA #IMPLIED

-          defaultexcludes %boolean; #IMPLIED

-          exportresources %boolean; #IMPLIED

-          exportsources %boolean; #IMPLIED

-          overwrite %boolean; #IMPLIED

-          exportdebuginfo %boolean; #IMPLIED

-          taskname CDATA #IMPLIED

-          description CDATA #IMPLIED

-          excludes CDATA #IMPLIED

-          includes CDATA #IMPLIED>

-

-<!ELEMENT stcheckout EMPTY>

-<!ATTLIST stcheckout

-          id ID #IMPLIED

-          password CDATA #IMPLIED

-          projectname CDATA #IMPLIED

-          servername CDATA #IMPLIED

-          excludes CDATA #IMPLIED

-          username CDATA #IMPLIED

-          url CDATA #IMPLIED

-          rootstarteamfolder CDATA #IMPLIED

-          label CDATA #IMPLIED

-          viewname CDATA #IMPLIED

-          rootlocalfolder CDATA #IMPLIED

-          serverport CDATA #IMPLIED

-          deleteuncontrolled %boolean; #IMPLIED

-          includes CDATA #IMPLIED

-          description CDATA #IMPLIED

-          unlocked %boolean; #IMPLIED

-          taskname CDATA #IMPLIED

-          recursive %boolean; #IMPLIED

-          locked %boolean; #IMPLIED

-          createworkingdirs %boolean; #IMPLIED

-          forced %boolean; #IMPLIED>

-

-<!ELEMENT bunzip2 EMPTY>

-<!ATTLIST bunzip2

-          id ID #IMPLIED

-          dest CDATA #IMPLIED

-          taskname CDATA #IMPLIED

-          description CDATA #IMPLIED

-          src CDATA #IMPLIED>

-

-<!ELEMENT copyfile EMPTY>

-<!ATTLIST copyfile

-          id ID #IMPLIED

-          forceoverwrite %boolean; #IMPLIED

-          dest CDATA #IMPLIED

-          taskname CDATA #IMPLIED

-          description CDATA #IMPLIED

-          filtering CDATA #IMPLIED

-          src CDATA #IMPLIED>

-

-<!ELEMENT vsscreate EMPTY>

-<!ATTLIST vsscreate

-          id ID #IMPLIED

-          ssdir CDATA #IMPLIED

-          quiet %boolean; #IMPLIED

-          autoresponse CDATA #IMPLIED

-          vsspath CDATA #IMPLIED

-          comment CDATA #IMPLIED

-          serverpath CDATA #IMPLIED

-          login CDATA #IMPLIED

-          taskname CDATA #IMPLIED

-          failonerror %boolean; #IMPLIED

-          description CDATA #IMPLIED>

-

-<!ELEMENT ejbc (patternset | exclude | include | custom | none | present | not | or | contains | depend | size | majority | filename | selector | includesfile | date | excludesfile | depth | and)*>

-<!ATTLIST ejbc

-          id ID #IMPLIED

-          src CDATA #IMPLIED

-          manifest CDATA #IMPLIED

-          classpath CDATA #IMPLIED

-          defaultexcludes %boolean; #IMPLIED

-          followsymlinks %boolean; #IMPLIED

-          taskname CDATA #IMPLIED

-          casesensitive %boolean; #IMPLIED

-          dest CDATA #IMPLIED

-          keepgenerated CDATA #IMPLIED

-          description CDATA #IMPLIED

-          descriptors CDATA #IMPLIED

-          excludes CDATA #IMPLIED

-          includesfile CDATA #IMPLIED

-          excludesfile CDATA #IMPLIED

-          includes CDATA #IMPLIED>

-

-<!ELEMENT unjar (fileset | patternset)*>

-<!ATTLIST unjar

-          id ID #IMPLIED

-          overwrite %boolean; #IMPLIED

-          dest CDATA #IMPLIED

-          taskname CDATA #IMPLIED

-          description CDATA #IMPLIED

-          src CDATA #IMPLIED>

-

-<!ELEMENT wsdltodotnet EMPTY>

-<!ATTLIST wsdltodotnet

-          id ID #IMPLIED

-          url CDATA #IMPLIED

-          srcfile CDATA #IMPLIED

-          namespace CDATA #IMPLIED

-          server %boolean; #IMPLIED

-          destfile CDATA #IMPLIED

-          language CDATA #IMPLIED

-          extraoptions CDATA #IMPLIED

-          taskname CDATA #IMPLIED

-          failonerror %boolean; #IMPLIED

-          description CDATA #IMPLIED>

-

-<!ELEMENT mkdir EMPTY>

-<!ATTLIST mkdir

-          id ID #IMPLIED

-          dir CDATA #IMPLIED

-          taskname CDATA #IMPLIED

-          description CDATA #IMPLIED>

-

-<!ELEMENT condition (isfalse | equals | available | not | contains | os | or | and | filesmatch | checksum | istrue | isset | socket | http | uptodate)*>

-<!ATTLIST condition

-          id ID #IMPLIED

-          value CDATA #IMPLIED

-          property CDATA #IMPLIED>

-

-<!ELEMENT cvs (commandline)*>

-<!ATTLIST cvs

-          id ID #IMPLIED

-          cvsrsh CDATA #IMPLIED

-          quiet %boolean; #IMPLIED

-          passfile CDATA #IMPLIED

-          command CDATA #IMPLIED

-          package CDATA #IMPLIED

-          cvsroot CDATA #IMPLIED

-          output CDATA #IMPLIED

-          port CDATA #IMPLIED

-          compressionlevel CDATA #IMPLIED

-          dest CDATA #IMPLIED

-          noexec %boolean; #IMPLIED

-          error CDATA #IMPLIED

-          description CDATA #IMPLIED

-          failonerror %boolean; #IMPLIED

-          append %boolean; #IMPLIED

-          taskname CDATA #IMPLIED

-          date CDATA #IMPLIED

-          compression %boolean; #IMPLIED

-          tag CDATA #IMPLIED>

-

-<!ELEMENT commandline (marker | argument)*>

-<!ATTLIST commandline

-          id ID #IMPLIED

-          executable CDATA #IMPLIED>

-

-<!ELEMENT marker EMPTY>

-<!ATTLIST marker

-          id ID #IMPLIED>

-

-<!ELEMENT argument EMPTY>

-<!ATTLIST argument

-          id ID #IMPLIED

-          line CDATA #IMPLIED

-          file CDATA #IMPLIED

-          value CDATA #IMPLIED

-          path CDATA #IMPLIED>

-

-<!ELEMENT tempfile EMPTY>

-<!ATTLIST tempfile

-          id ID #IMPLIED

-          destdir CDATA #IMPLIED

-          taskname CDATA #IMPLIED

-          description CDATA #IMPLIED

-          prefix CDATA #IMPLIED

-          property CDATA #IMPLIED

-          suffix CDATA #IMPLIED>

-

-<!ELEMENT junitreport (report | fileset)*>

-<!ATTLIST junitreport

-          id ID #IMPLIED

-          todir CDATA #IMPLIED

-          taskname CDATA #IMPLIED

-          tofile CDATA #IMPLIED

-          description CDATA #IMPLIED>

-

-<!ELEMENT report EMPTY>

-<!ATTLIST report

-          id ID #IMPLIED

-          todir CDATA #IMPLIED

-          styledir CDATA #IMPLIED

-          format (frames | noframes) #IMPLIED

-          extension CDATA #IMPLIED>

-

-<!ELEMENT taskdef (classpath)*>

-<!ATTLIST taskdef

-          id ID #IMPLIED

-          name CDATA #IMPLIED

-          classpath CDATA #IMPLIED

-          file CDATA #IMPLIED

-          classname CDATA #IMPLIED

-          resource CDATA #IMPLIED

-          loaderref IDREF #IMPLIED

-          classpathref IDREF #IMPLIED

-          taskname CDATA #IMPLIED

-          reverseloader %boolean; #IMPLIED

-          description CDATA #IMPLIED>

-

-<!ELEMENT echo (#PCDATA)>

-<!ATTLIST echo

-          id ID #IMPLIED

-          append %boolean; #IMPLIED

-          taskname CDATA #IMPLIED

-          file CDATA #IMPLIED

-          message CDATA #IMPLIED

-          description CDATA #IMPLIED

-          level (error | warning | info | verbose | debug) #IMPLIED>

-

-<!ELEMENT ccupdate EMPTY>

-<!ATTLIST ccupdate

-          id ID #IMPLIED

-          preservetime %boolean; #IMPLIED

-          rename %boolean; #IMPLIED

-          log CDATA #IMPLIED

-          viewpath CDATA #IMPLIED

-          overwrite %boolean; #IMPLIED

-          cleartooldir CDATA #IMPLIED

-          graphical %boolean; #IMPLIED

-          currenttime %boolean; #IMPLIED

-          taskname CDATA #IMPLIED

-          description CDATA #IMPLIED>

-

-<!ELEMENT java (arg | jvmarg | classpath | sysproperty | env)*>

-<!ATTLIST java

-          id ID #IMPLIED

-          jvmargs CDATA #IMPLIED

-          args CDATA #IMPLIED

-          fork %boolean; #IMPLIED

-          maxmemory CDATA #IMPLIED

-          classpathref IDREF #IMPLIED

-          jar CDATA #IMPLIED

-          output CDATA #IMPLIED

-          timeout CDATA #IMPLIED

-          jvm CDATA #IMPLIED

-          classpath CDATA #IMPLIED

-          dir CDATA #IMPLIED

-          description CDATA #IMPLIED

-          jvmversion CDATA #IMPLIED

-          failonerror %boolean; #IMPLIED

-          append %boolean; #IMPLIED

-          taskname CDATA #IMPLIED

-          newenvironment %boolean; #IMPLIED

-          classname CDATA #IMPLIED>

-

-<!ELEMENT renameext (patternset | exclude | include | custom | none | present | not | or | contains | depend | size | majority | filename | selector | includesfile | date | excludesfile | depth | and)*>

-<!ATTLIST renameext

-          id ID #IMPLIED

-          toextension CDATA #IMPLIED

-          replace %boolean; #IMPLIED

-          defaultexcludes %boolean; #IMPLIED

-          followsymlinks %boolean; #IMPLIED

-          fromextension CDATA #IMPLIED

-          srcdir CDATA #IMPLIED

-          taskname CDATA #IMPLIED

-          casesensitive %boolean; #IMPLIED

-          description CDATA #IMPLIED

-          excludes CDATA #IMPLIED

-          includesfile CDATA #IMPLIED

-          excludesfile CDATA #IMPLIED

-          includes CDATA #IMPLIED>

-

-<!ELEMENT vsslabel EMPTY>

-<!ATTLIST vsslabel

-          id ID #IMPLIED

-          ssdir CDATA #IMPLIED

-          autoresponse CDATA #IMPLIED

-          vsspath CDATA #IMPLIED

-          comment CDATA #IMPLIED

-          version CDATA #IMPLIED

-          serverpath CDATA #IMPLIED

-          login CDATA #IMPLIED

-          label CDATA #IMPLIED

-          taskname CDATA #IMPLIED

-          description CDATA #IMPLIED>

-

-<!ELEMENT basename EMPTY>

-<!ATTLIST basename

-          id ID #IMPLIED

-          taskname CDATA #IMPLIED

-          file CDATA #IMPLIED

-          description CDATA #IMPLIED

-          property CDATA #IMPLIED

-          suffix CDATA #IMPLIED>

-

-<!ELEMENT javadoc2 (bottom | source | classpath | doctitle | header | excludepackage | bootclasspath | doclet | taglet | fileset | packageset | sourcepath | link | footer | package | group | tag)*>

-<!ATTLIST javadoc2

-          id ID #IMPLIED

-          bottom CDATA #IMPLIED

-          verbose %boolean; #IMPLIED

-          bootclasspathref IDREF #IMPLIED

-          header CDATA #IMPLIED

-          link CDATA #IMPLIED

-          noindex %boolean; #IMPLIED

-          access (protected | public | package | private) #IMPLIED

-          doclet CDATA #IMPLIED

-          public %boolean; #IMPLIED

-          author %boolean; #IMPLIED

-          footer CDATA #IMPLIED

-          docletpath CDATA #IMPLIED

-          package %boolean; #IMPLIED

-          useexternalfile %boolean; #IMPLIED

-          sourcepathref IDREF #IMPLIED

-          description CDATA #IMPLIED

-          protected %boolean; #IMPLIED

-          nonavbar %boolean; #IMPLIED

-          maxmemory CDATA #IMPLIED

-          group CDATA #IMPLIED

-          source CDATA #IMPLIED

-          linkoffline CDATA #IMPLIED

-          additionalparam CDATA #IMPLIED

-          failonerror %boolean; #IMPLIED

-          locale CDATA #IMPLIED

-          destdir CDATA #IMPLIED

-          classpath CDATA #IMPLIED

-          defaultexcludes %boolean; #IMPLIED

-          bootclasspath CDATA #IMPLIED

-          private %boolean; #IMPLIED

-          taskname CDATA #IMPLIED

-          charset CDATA #IMPLIED

-          nodeprecatedlist %boolean; #IMPLIED

-          classpathref IDREF #IMPLIED

-          stylesheetfile CDATA #IMPLIED

-          docencoding CDATA #IMPLIED

-          excludepackagenames CDATA #IMPLIED

-          docletpathref IDREF #IMPLIED

-          packagenames CDATA #IMPLIED

-          windowtitle CDATA #IMPLIED

-          notree %boolean; #IMPLIED

-          splitindex %boolean; #IMPLIED

-          packagelist CDATA #IMPLIED

-          encoding CDATA #IMPLIED

-          doctitle CDATA #IMPLIED

-          serialwarn %boolean; #IMPLIED

-          old %boolean; #IMPLIED

-          use %boolean; #IMPLIED

-          sourcepath CDATA #IMPLIED

-          helpfile CDATA #IMPLIED

-          version %boolean; #IMPLIED

-          sourcefiles CDATA #IMPLIED

-          extdirs CDATA #IMPLIED

-          nohelp %boolean; #IMPLIED

-          nodeprecated %boolean; #IMPLIED

-          overview CDATA #IMPLIED>

-

-<!ELEMENT vsscp EMPTY>

-<!ATTLIST vsscp

-          id ID #IMPLIED

-          login CDATA #IMPLIED

-          taskname CDATA #IMPLIED

-          vsspath CDATA #IMPLIED

-          description CDATA #IMPLIED

-          autoresponse CDATA #IMPLIED

-          serverpath CDATA #IMPLIED

-          ssdir CDATA #IMPLIED>

-

-<!ELEMENT tar (patternset | exclude | include | tarfileset | custom | none | present | not | or | contains | depend | size | majority | filename | selector | includesfile | date | excludesfile | depth | and)*>

-<!ATTLIST tar

-          id ID #IMPLIED

-          tarfile CDATA #IMPLIED

-          destfile CDATA #IMPLIED

-          defaultexcludes %boolean; #IMPLIED

-          followsymlinks %boolean; #IMPLIED

-          basedir CDATA #IMPLIED

-          taskname CDATA #IMPLIED

-          casesensitive %boolean; #IMPLIED

-          description CDATA #IMPLIED

-          excludes CDATA #IMPLIED

-          includesfile CDATA #IMPLIED

-          excludesfile CDATA #IMPLIED

-          compression (none | gzip | bzip2) #IMPLIED

-          longfile (warn | fail | truncate | gnu | omit) #IMPLIED

-          includes CDATA #IMPLIED>

-

-<!ELEMENT tarfileset (patternset | exclude | include | custom | none | present | not | or | contains | depend | size | majority | filename | selector | includesfile | date | excludesfile | depth | and)*>

-<!ATTLIST tarfileset

-          id ID #IMPLIED

-          refid IDREF #IMPLIED

-          dir CDATA #IMPLIED

-          username CDATA #IMPLIED

-          defaultexcludes %boolean; #IMPLIED

-          followsymlinks %boolean; #IMPLIED

-          mode CDATA #IMPLIED

-          prefix CDATA #IMPLIED

-          casesensitive %boolean; #IMPLIED

-          preserveleadingslashes %boolean; #IMPLIED

-          group CDATA #IMPLIED

-          fullpath CDATA #IMPLIED

-          description CDATA #IMPLIED

-          excludes CDATA #IMPLIED

-          includesfile CDATA #IMPLIED

-          excludesfile CDATA #IMPLIED

-          includes CDATA #IMPLIED>

-

-<!ELEMENT vajimport (fileset)*>

-<!ATTLIST vajimport

-          id ID #IMPLIED

-          importsources %boolean; #IMPLIED

-          taskname CDATA #IMPLIED

-          importclasses %boolean; #IMPLIED

-          description CDATA #IMPLIED

-          remote CDATA #IMPLIED

-          importresources %boolean; #IMPLIED

-          defaultexcludes %boolean; #IMPLIED

-          project CDATA #IMPLIED>

-

-<!ELEMENT setproxy EMPTY>

-<!ATTLIST setproxy

-          id ID #IMPLIED

-          socksproxyport CDATA #IMPLIED

-          proxyport CDATA #IMPLIED

-          taskname CDATA #IMPLIED

-          socksproxyhost CDATA #IMPLIED

-          proxyhost CDATA #IMPLIED

-          description CDATA #IMPLIED

-          nonproxyhosts CDATA #IMPLIED>

-

-<!ELEMENT wlstop (classpath)*>

-<!ATTLIST wlstop

-          id ID #IMPLIED

-          user CDATA #IMPLIED

-          classpath CDATA #IMPLIED

-          delay CDATA #IMPLIED

-          password CDATA #IMPLIED

-          url CDATA #IMPLIED

-          taskname CDATA #IMPLIED

-          description CDATA #IMPLIED

-          beahome CDATA #IMPLIED>

-

-<!ELEMENT p4counter EMPTY>

-<!ATTLIST p4counter

-          id ID #IMPLIED

-          name CDATA #IMPLIED

-          port CDATA #IMPLIED

-          client CDATA #IMPLIED

-          user CDATA #IMPLIED

-          cmdopts CDATA #IMPLIED

-          view CDATA #IMPLIED

-          taskname CDATA #IMPLIED

-          value CDATA #IMPLIED

-          property CDATA #IMPLIED

-          failonerror %boolean; #IMPLIED

-          description CDATA #IMPLIED>

-

-<!ELEMENT ilasm (patternset | exclude | include | custom | none | present | not | or | contains | depend | size | majority | filename | selector | includesfile | date | excludesfile | depth | and)*>

-<!ATTLIST ilasm

-          id ID #IMPLIED

-          owner CDATA #IMPLIED

-          excludes CDATA #IMPLIED

-          extraoptions CDATA #IMPLIED

-          defaultexcludes %boolean; #IMPLIED

-          followsymlinks %boolean; #IMPLIED

-          targettype CDATA #IMPLIED

-          casesensitive %boolean; #IMPLIED

-          verbose %boolean; #IMPLIED

-          debug %boolean; #IMPLIED

-          includes CDATA #IMPLIED

-          outputfile CDATA #IMPLIED

-          description CDATA #IMPLIED

-          includesfile CDATA #IMPLIED

-          failonerror %boolean; #IMPLIED

-          resourcefile CDATA #IMPLIED

-          taskname CDATA #IMPLIED

-          srcdir CDATA #IMPLIED

-          excludesfile CDATA #IMPLIED

-          listing %boolean; #IMPLIED

-          keyfile CDATA #IMPLIED>

-

-<!ELEMENT soscheckout EMPTY>

-<!ATTLIST soscheckout

-          id ID #IMPLIED

-          password CDATA #IMPLIED

-          comment CDATA #IMPLIED

-          nocompress %boolean; #IMPLIED

-          version CDATA #IMPLIED

-          username CDATA #IMPLIED

-          sosserverpath CDATA #IMPLIED

-          label CDATA #IMPLIED

-          vssserverpath CDATA #IMPLIED

-          soscmd CDATA #IMPLIED

-          verbose %boolean; #IMPLIED

-          localpath CDATA #IMPLIED

-          nocache %boolean; #IMPLIED

-          projectpath CDATA #IMPLIED

-          description CDATA #IMPLIED

-          taskname CDATA #IMPLIED

-          recursive %boolean; #IMPLIED

-          file CDATA #IMPLIED

-          soshome CDATA #IMPLIED>

-

-<!ELEMENT apply (arg | fileset | env | targetfile | srcfile | mapper)*>

-<!ATTLIST apply

-          id ID #IMPLIED

-          resultproperty CDATA #IMPLIED

-          skipemptyfilesets %boolean; #IMPLIED

-          type (file | dir | both) #IMPLIED

-          failifexecutionfails %boolean; #IMPLIED

-          command CDATA #IMPLIED

-          executable CDATA #IMPLIED

-          os CDATA #IMPLIED

-          output CDATA #IMPLIED

-          timeout CDATA #IMPLIED

-          dest CDATA #IMPLIED

-          dir CDATA #IMPLIED

-          description CDATA #IMPLIED

-          outputproperty CDATA #IMPLIED

-          failonerror %boolean; #IMPLIED

-          append %boolean; #IMPLIED

-          taskname CDATA #IMPLIED

-          newenvironment %boolean; #IMPLIED

-          vmlauncher %boolean; #IMPLIED

-          relative %boolean; #IMPLIED

-          parallel %boolean; #IMPLIED>

-

-<!ELEMENT ccuncheckout EMPTY>

-<!ATTLIST ccuncheckout

-          id ID #IMPLIED

-          keepcopy %boolean; #IMPLIED

-          taskname CDATA #IMPLIED

-          cleartooldir CDATA #IMPLIED

-          viewpath CDATA #IMPLIED

-          description CDATA #IMPLIED>

-

-<!ELEMENT jarlib-resolve (ant | location | url | extension)*>

-<!ATTLIST jarlib-resolve

-          id ID #IMPLIED

-          checkextension %boolean; #IMPLIED

-          taskname CDATA #IMPLIED

-          description CDATA #IMPLIED

-          property CDATA #IMPLIED

-          failonerror %boolean; #IMPLIED>

-

-<!ELEMENT location EMPTY>

-<!ATTLIST location

-          id ID #IMPLIED

-          location CDATA #IMPLIED>

-

-<!ELEMENT url EMPTY>

-<!ATTLIST url

-          id ID #IMPLIED

-          destdir CDATA #IMPLIED

-          url CDATA #IMPLIED

-          destfile CDATA #IMPLIED>

-

-<!ELEMENT cvstagdiff EMPTY>

-<!ATTLIST cvstagdiff

-          id ID #IMPLIED

-          passfile CDATA #IMPLIED

-          enddate CDATA #IMPLIED

-          port CDATA #IMPLIED

-          destfile CDATA #IMPLIED

-          quiet %boolean; #IMPLIED

-          endtag CDATA #IMPLIED

-          compressionlevel CDATA #IMPLIED

-          cvsrsh CDATA #IMPLIED

-          cvsroot CDATA #IMPLIED

-          taskname CDATA #IMPLIED

-          startdate CDATA #IMPLIED

-          starttag CDATA #IMPLIED

-          package CDATA #IMPLIED

-          failonerror %boolean; #IMPLIED

-          description CDATA #IMPLIED

-          compression %boolean; #IMPLIED>

-

-<!ELEMENT jlink (patternset | exclude | include | custom | none | present | not | or | contains | depend | mergefiles | size | majority | filename | selector | includesfile | date | excludesfile | addfiles | depth | and)*>

-<!ATTLIST jlink

-          id ID #IMPLIED

-          outfile CDATA #IMPLIED

-          compress %boolean; #IMPLIED

-          defaultexcludes %boolean; #IMPLIED

-          followsymlinks %boolean; #IMPLIED

-          addfiles CDATA #IMPLIED

-          taskname CDATA #IMPLIED

-          casesensitive %boolean; #IMPLIED

-          description CDATA #IMPLIED

-          excludes CDATA #IMPLIED

-          includesfile CDATA #IMPLIED

-          excludesfile CDATA #IMPLIED

-          mergefiles CDATA #IMPLIED

-          includes CDATA #IMPLIED>

-

-<!ELEMENT mergefiles (fileset | dirset | filelist | pathelement | path)*>

-<!ATTLIST mergefiles

-          id ID #IMPLIED

-          location CDATA #IMPLIED

-          refid IDREF #IMPLIED

-          description CDATA #IMPLIED

-          path CDATA #IMPLIED>

-

-<!ELEMENT addfiles (fileset | dirset | filelist | pathelement | path)*>

-<!ATTLIST addfiles

-          id ID #IMPLIED

-          location CDATA #IMPLIED

-          refid IDREF #IMPLIED

-          description CDATA #IMPLIED

-          path CDATA #IMPLIED>

-

-<!ELEMENT javacc EMPTY>

-<!ATTLIST javacc

-          id ID #IMPLIED

-          debugparser %boolean; #IMPLIED

-          javacchome CDATA #IMPLIED

-          forcelacheck %boolean; #IMPLIED

-          commontokenaction %boolean; #IMPLIED

-          optimizetokenmanager %boolean; #IMPLIED

-          buildtokenmanager %boolean; #IMPLIED

-          sanitycheck %boolean; #IMPLIED

-          buildparser %boolean; #IMPLIED

-          otherambiguitycheck CDATA #IMPLIED

-          lookahead CDATA #IMPLIED

-          debuglookahead %boolean; #IMPLIED

-          choiceambiguitycheck CDATA #IMPLIED

-          unicodeinput %boolean; #IMPLIED

-          usercharstream %boolean; #IMPLIED

-          debugtokenmanager %boolean; #IMPLIED

-          description CDATA #IMPLIED

-          taskname CDATA #IMPLIED

-          outputdirectory CDATA #IMPLIED

-          cachetokens %boolean; #IMPLIED

-          javaunicodeescape %boolean; #IMPLIED

-          static %boolean; #IMPLIED

-          usertokenmanager %boolean; #IMPLIED

-          target CDATA #IMPLIED

-          ignorecase %boolean; #IMPLIED

-          errorreporting %boolean; #IMPLIED>

-

-<!ELEMENT jarlib-manifest (options | attribute | depends | extension)*>

-<!ATTLIST jarlib-manifest

-          id ID #IMPLIED

-          taskname CDATA #IMPLIED

-          description CDATA #IMPLIED

-          destfile CDATA #IMPLIED>

-

-<!ELEMENT options (fileset | libfileset | extension)*>

-<!ATTLIST options

-          id ID #IMPLIED

-          refid IDREF #IMPLIED

-          description CDATA #IMPLIED>

-

-<!ELEMENT depends (fileset | libfileset | extension)*>

-<!ATTLIST depends

-          id ID #IMPLIED

-          refid IDREF #IMPLIED

-          description CDATA #IMPLIED>

-

-<!ELEMENT pvcs (pvcsproject)*>

-<!ATTLIST pvcs

-          id ID #IMPLIED

-          updateonly %boolean; #IMPLIED

-          force CDATA #IMPLIED

-          pvcsbin CDATA #IMPLIED

-          workspace CDATA #IMPLIED

-          pvcsproject CDATA #IMPLIED

-          filenameformat CDATA #IMPLIED

-          userid CDATA #IMPLIED

-          repository CDATA #IMPLIED

-          ignorereturncode %boolean; #IMPLIED

-          linestart CDATA #IMPLIED

-          promotiongroup CDATA #IMPLIED

-          taskname CDATA #IMPLIED

-          label CDATA #IMPLIED

-          description CDATA #IMPLIED>

-

-<!ELEMENT pvcsproject EMPTY>

-<!ATTLIST pvcsproject

-          id ID #IMPLIED

-          name CDATA #IMPLIED>

-

-<!ELEMENT chmod (mapper | include | exclude | srcfile | targetfile | patternset | env | fileset | arg)*>

-<!ATTLIST chmod

-          id ID #IMPLIED

-          resultproperty CDATA #IMPLIED

-          perm CDATA #IMPLIED

-          skipemptyfilesets %boolean; #IMPLIED

-          excludes CDATA #IMPLIED

-          command CDATA #IMPLIED

-          type (file | dir | both) #IMPLIED

-          failifexecutionfails %boolean; #IMPLIED

-          executable CDATA #IMPLIED

-          defaultexcludes %boolean; #IMPLIED

-          os CDATA #IMPLIED

-          output CDATA #IMPLIED

-          timeout CDATA #IMPLIED

-          dest CDATA #IMPLIED

-          dir CDATA #IMPLIED

-          includes CDATA #IMPLIED

-          description CDATA #IMPLIED

-          outputproperty CDATA #IMPLIED

-          failonerror %boolean; #IMPLIED

-          append %boolean; #IMPLIED

-          taskname CDATA #IMPLIED

-          newenvironment %boolean; #IMPLIED

-          vmlauncher %boolean; #IMPLIED

-          file CDATA #IMPLIED

-          relative %boolean; #IMPLIED

-          parallel %boolean; #IMPLIED>

-

-<!ELEMENT jar (patternset | exclude | include | custom | none | present | manifest | not | metainf | or | contains | depend | fileset | size | majority | filename | selector | includesfile | zipgroupfileset | zipfileset | date | excludesfile | depth | and)*>

-<!ATTLIST jar

-          id ID #IMPLIED

-          whenempty (fail | skip | create) #IMPLIED

-          duplicate (add | preserve | fail) #IMPLIED

-          excludes CDATA #IMPLIED

-          manifest CDATA #IMPLIED

-          basedir CDATA #IMPLIED

-          encoding CDATA #IMPLIED

-          jarfile CDATA #IMPLIED

-          index %boolean; #IMPLIED

-          defaultexcludes %boolean; #IMPLIED

-          update %boolean; #IMPLIED

-          followsymlinks %boolean; #IMPLIED

-          destfile CDATA #IMPLIED

-          casesensitive %boolean; #IMPLIED

-          includes CDATA #IMPLIED

-          description CDATA #IMPLIED

-          includesfile CDATA #IMPLIED

-          compress %boolean; #IMPLIED

-          taskname CDATA #IMPLIED

-          filesonly %boolean; #IMPLIED

-          file CDATA #IMPLIED

-          excludesfile CDATA #IMPLIED

-          zipfile CDATA #IMPLIED>

-

-<!ELEMENT sound (fail | success)*>

-<!ATTLIST sound

-          id ID #IMPLIED

-          taskname CDATA #IMPLIED

-          description CDATA #IMPLIED>

-

-<!ELEMENT fail EMPTY>

-<!ATTLIST fail

-          id ID #IMPLIED

-          loops CDATA #IMPLIED

-          source CDATA #IMPLIED

-          duration CDATA #IMPLIED>

-

-<!ELEMENT success EMPTY>

-<!ATTLIST success

-          id ID #IMPLIED

-          loops CDATA #IMPLIED

-          source CDATA #IMPLIED

-          duration CDATA #IMPLIED>

-

-<!ELEMENT mparse (jvmarg | classpath | sourcepath)*>

-<!ATTLIST mparse

-          id ID #IMPLIED

-          cleanup %boolean; #IMPLIED

-          verbose %boolean; #IMPLIED

-          maxmemory CDATA #IMPLIED

-          metamatahome CDATA #IMPLIED

-          target CDATA #IMPLIED

-          debugparser %boolean; #IMPLIED

-          taskname CDATA #IMPLIED

-          description CDATA #IMPLIED

-          debugscanner %boolean; #IMPLIED>

-

-<!ELEMENT blgenclient (classpath)*>

-<!ATTLIST blgenclient

-          id ID #IMPLIED

-          debug %boolean; #IMPLIED

-          classpath CDATA #IMPLIED

-          mode CDATA #IMPLIED

-          ejbjar CDATA #IMPLIED

-          version CDATA #IMPLIED

-          classpathref IDREF #IMPLIED

-          taskname CDATA #IMPLIED

-          description CDATA #IMPLIED

-          clientjar CDATA #IMPLIED>

-

-<!ELEMENT genkey (dname)*>

-<!ATTLIST genkey

-          id ID #IMPLIED

-          storepass CDATA #IMPLIED

-          sigalg CDATA #IMPLIED

-          verbose %boolean; #IMPLIED

-          keypass CDATA #IMPLIED

-          dname CDATA #IMPLIED

-          keysize CDATA #IMPLIED

-          alias CDATA #IMPLIED

-          keyalg CDATA #IMPLIED

-          validity CDATA #IMPLIED

-          keystore CDATA #IMPLIED

-          taskname CDATA #IMPLIED

-          description CDATA #IMPLIED

-          storetype CDATA #IMPLIED>

-

-<!ELEMENT dname (param)*>

-<!ATTLIST dname

-          id ID #IMPLIED>

-

-<!ELEMENT javah (classpath | class | bootclasspath)*>

-<!ATTLIST javah

-          id ID #IMPLIED

-          stubs %boolean; #IMPLIED

-          force %boolean; #IMPLIED

-          destdir CDATA #IMPLIED

-          old %boolean; #IMPLIED

-          classpath CDATA #IMPLIED

-          outputfile CDATA #IMPLIED

-          class CDATA #IMPLIED

-          verbose %boolean; #IMPLIED

-          bootclasspath CDATA #IMPLIED

-          bootclasspathref IDREF #IMPLIED

-          classpathref IDREF #IMPLIED

-          taskname CDATA #IMPLIED

-          description CDATA #IMPLIED>

-

-<!ELEMENT class EMPTY>

-<!ATTLIST class

-          id ID #IMPLIED

-          name CDATA #IMPLIED>

-

-<!ELEMENT ccmreconfigure EMPTY>

-<!ATTLIST ccmreconfigure

-          id ID #IMPLIED

-          verbose %boolean; #IMPLIED

-          ccmaction CDATA #IMPLIED

-          ccmproject CDATA #IMPLIED

-          taskname CDATA #IMPLIED

-          recurse %boolean; #IMPLIED

-          description CDATA #IMPLIED

-          ccmdir CDATA #IMPLIED>

-

-<!ELEMENT unzip (fileset | patternset)*>

-<!ATTLIST unzip

-          id ID #IMPLIED

-          overwrite %boolean; #IMPLIED

-          dest CDATA #IMPLIED

-          taskname CDATA #IMPLIED

-          description CDATA #IMPLIED

-          src CDATA #IMPLIED>

-

-<!ELEMENT javac (patternset | exclude | include | custom | none | present | extdirs | not | src | or | contains | depend | classpath | sourcepath | size | majority | bootclasspath | filename | selector | includesfile | compilerarg | date | excludesfile | depth | and)*>

-<!ATTLIST javac

-          id ID #IMPLIED

-          target CDATA #IMPLIED

-          excludes CDATA #IMPLIED

-          verbose %boolean; #IMPLIED

-          bootclasspathref IDREF #IMPLIED

-          compiler CDATA #IMPLIED

-          executable CDATA #IMPLIED

-          debuglevel CDATA #IMPLIED

-          memoryinitialsize CDATA #IMPLIED

-          deprecation %boolean; #IMPLIED

-          includeantruntime %boolean; #IMPLIED

-          depend %boolean; #IMPLIED

-          sourcepathref IDREF #IMPLIED

-          description CDATA #IMPLIED

-          includes CDATA #IMPLIED

-          source CDATA #IMPLIED

-          includejavaruntime %boolean; #IMPLIED

-          failonerror %boolean; #IMPLIED

-          destdir CDATA #IMPLIED

-          debug %boolean; #IMPLIED

-          classpath CDATA #IMPLIED

-          casesensitive %boolean; #IMPLIED

-          followsymlinks %boolean; #IMPLIED

-          defaultexcludes %boolean; #IMPLIED

-          bootclasspath CDATA #IMPLIED

-          includesfile CDATA #IMPLIED

-          nowarn %boolean; #IMPLIED

-          proceed %boolean; #IMPLIED

-          taskname CDATA #IMPLIED

-          classpathref IDREF #IMPLIED

-          fork %boolean; #IMPLIED

-          srcdir CDATA #IMPLIED

-          memorymaximumsize CDATA #IMPLIED

-          optimize %boolean; #IMPLIED

-          encoding CDATA #IMPLIED

-          excludesfile CDATA #IMPLIED

-          sourcepath CDATA #IMPLIED

-          listfiles %boolean; #IMPLIED

-          extdirs CDATA #IMPLIED>

-

-<!ELEMENT src (fileset | dirset | filelist | pathelement | path)*>

-<!ATTLIST src

-          id ID #IMPLIED

-          location CDATA #IMPLIED

-          refid IDREF #IMPLIED

-          description CDATA #IMPLIED

-          path CDATA #IMPLIED>

-

-<!ELEMENT p4add (fileset)*>

-<!ATTLIST p4add

-          id ID #IMPLIED

-          port CDATA #IMPLIED

-          client CDATA #IMPLIED

-          user CDATA #IMPLIED

-          changelist CDATA #IMPLIED

-          cmdopts CDATA #IMPLIED

-          view CDATA #IMPLIED

-          taskname CDATA #IMPLIED

-          failonerror %boolean; #IMPLIED

-          description CDATA #IMPLIED

-          commandlength CDATA #IMPLIED>

-

-<!ELEMENT soslabel EMPTY>

-<!ATTLIST soslabel

-          id ID #IMPLIED

-          password CDATA #IMPLIED

-          comment CDATA #IMPLIED

-          nocompress %boolean; #IMPLIED

-          version CDATA #IMPLIED

-          username CDATA #IMPLIED

-          sosserverpath CDATA #IMPLIED

-          label CDATA #IMPLIED

-          vssserverpath CDATA #IMPLIED

-          soscmd CDATA #IMPLIED

-          verbose %boolean; #IMPLIED

-          localpath CDATA #IMPLIED

-          nocache %boolean; #IMPLIED

-          projectpath CDATA #IMPLIED

-          description CDATA #IMPLIED

-          taskname CDATA #IMPLIED

-          recursive %boolean; #IMPLIED

-          file CDATA #IMPLIED

-          soshome CDATA #IMPLIED>

-

-<!ELEMENT jpcoverage (arg | socket | fileset | jvmarg | classpath | triggers | filters)*>

-<!ATTLIST jpcoverage

-          id ID #IMPLIED

-          applet %boolean; #IMPLIED

-          recordfromstart (coverage | none | all) #IMPLIED

-          vm (java2 | jdk118 | jdk117) #IMPLIED

-          classname CDATA #IMPLIED

-          workingdir CDATA #IMPLIED

-          inputfile CDATA #IMPLIED

-          snapshotdir CDATA #IMPLIED

-          seedname CDATA #IMPLIED

-          javaexe CDATA #IMPLIED

-          exitprompt CDATA #IMPLIED

-          home CDATA #IMPLIED

-          taskname CDATA #IMPLIED

-          warnlevel CDATA #IMPLIED

-          finalsnapshot CDATA #IMPLIED

-          description CDATA #IMPLIED

-          tracknatives %boolean; #IMPLIED>

-

-<!ELEMENT triggers (method)*>

-<!ATTLIST triggers

-          id ID #IMPLIED>

-

-<!ELEMENT method EMPTY>

-<!ATTLIST method

-          id ID #IMPLIED

-          name CDATA #IMPLIED

-          event CDATA #IMPLIED

-          action CDATA #IMPLIED

-          param CDATA #IMPLIED>

-

-<!ELEMENT vssget EMPTY>

-<!ATTLIST vssget

-          id ID #IMPLIED

-          date CDATA #IMPLIED

-          recursive %boolean; #IMPLIED

-          ssdir CDATA #IMPLIED

-          quiet %boolean; #IMPLIED

-          autoresponse CDATA #IMPLIED

-          vsspath CDATA #IMPLIED

-          version CDATA #IMPLIED

-          serverpath CDATA #IMPLIED

-          writable %boolean; #IMPLIED

-          login CDATA #IMPLIED

-          label CDATA #IMPLIED

-          taskname CDATA #IMPLIED

-          localpath CDATA #IMPLIED

-          description CDATA #IMPLIED>

-

-<!ELEMENT deltree EMPTY>

-<!ATTLIST deltree

-          id ID #IMPLIED

-          dir CDATA #IMPLIED

-          taskname CDATA #IMPLIED

-          description CDATA #IMPLIED>

-

-<!ELEMENT ddcreator (patternset | exclude | include | custom | none | present | not | or | contains | depend | size | majority | filename | selector | includesfile | date | excludesfile | depth | and)*>

-<!ATTLIST ddcreator

-          id ID #IMPLIED

-          classpath CDATA #IMPLIED

-          defaultexcludes %boolean; #IMPLIED

-          followsymlinks %boolean; #IMPLIED

-          taskname CDATA #IMPLIED

-          casesensitive %boolean; #IMPLIED

-          dest CDATA #IMPLIED

-          description CDATA #IMPLIED

-          descriptors CDATA #IMPLIED

-          excludes CDATA #IMPLIED

-          includesfile CDATA #IMPLIED

-          excludesfile CDATA #IMPLIED

-          includes CDATA #IMPLIED>

-

diff --git a/ant/org.eclipse.ant.ui/Ant Editor/anttasks_1.5b.xml b/ant/org.eclipse.ant.ui/Ant Editor/anttasks_1.5b.xml
deleted file mode 100644
index 28c372d..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/anttasks_1.5b.xml
+++ /dev/null
@@ -1,24428 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<tasks>
-
-  <task name="ant" category="control" classname="org.apache.tools.ant.taskdefs.Ant">
-
-  
-    <short-description>Build a sub-project.</short-description>
-  
-    <description>
-    Build a sub-project.
-
-  &lt;pre&gt;
-  &amp;lt;target name=&amp;quot;foo&amp;quot; depends=&amp;quot;init&amp;quot;&amp;gt;
-    &amp;lt;ant antfile=&amp;quot;build.xml&amp;quot; target=&amp;quot;bar&amp;quot; &amp;gt;
-      &amp;lt;property name=&amp;quot;property1&amp;quot; value=&amp;quot;aaaaa&amp;quot; /&amp;gt;
-      &amp;lt;property name=&amp;quot;foo&amp;quot; value=&amp;quot;baz&amp;quot; /&amp;gt;
-    &amp;lt;/ant&amp;gt;&lt;/SPAN&gt;
-  &amp;lt;/target&amp;gt;&lt;/SPAN&gt;
-
-  &amp;lt;target name=&amp;quot;bar&amp;quot; depends=&amp;quot;init&amp;quot;&amp;gt;
-    &amp;lt;echo message=&amp;quot;prop is ${property1} ${foo}&amp;quot; /&amp;gt;
-  &amp;lt;/target&amp;gt;
- &lt;/pre&gt;
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="antfile" type="java.lang.String" briefType="String" required="no">
-        
-          <short-description>The buildfile to use.</short-description>
-        
-          <description>
-          The buildfile to use.
- Defaults to "build.xml". This file is expected to be a filename relative
- to the dir attribute given.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="dir" type="java.io.File" briefType="File" required="no">
-        
-          <short-description>The directory to use as a base directory for the new Ant project.</short-description>
-        
-          <description>
-          The directory to use as a base directory for the new Ant project.
- Defaults to the current project's basedir, unless inheritall
- has been set to false, in which case it doesn't have a default
- value. This will override the basedir setting of the called project.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="inheritall" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>If true, pass all properties to the new Ant project.</short-description>
-        
-          <description>
-          If true, pass all properties to the new Ant project.
- Defaults to true.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="inheritrefs" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>If true, pass all references to the new Ant project.</short-description>
-        
-          <description>
-          If true, pass all references to the new Ant project.
- Defaults to false.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="output" type="java.lang.String" briefType="String" required="no">
-        
-          <short-description>Filename to write the output to.</short-description>
-        
-          <description>
-          Filename to write the output to.
- This is relative to the value of the dir attribute
- if it has been set or to the base directory of the
- current project otherwise.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="target" type="java.lang.String" briefType="String" required="no">
-        
-          <short-description>The target of the new Ant project to execute.</short-description>
-        
-          <description>
-          The target of the new Ant project to execute.
- Defaults to the new project's default target.
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-      
-        <element name="reference" type="org.apache.tools.ant.taskdefs.Ant.Reference" briefType="" required="NOTDEFINED">
-        
-          <short-description>Reference element identifying a data type to carry
- over to the new project.</short-description>
-        
-          <description>
-          Reference element identifying a data type to carry
- over to the new project.
-        </description>
-      
-        </element>
-
-      
-        <element name="property" type="org.apache.tools.ant.taskdefs.Property" briefType="see &lt;property&gt;" required="NOTDEFINED">
-        
-          <short-description>Property to pass to the new project.</short-description>
-        
-          <description>
-          Property to pass to the new project.
- The property is passed as a 'user property'
-        </description>
-      
-        </element>
-
-    
-      </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="antcall" category="control" classname="org.apache.tools.ant.taskdefs.CallTarget">
-
-  
-    <short-description>Call another target in the same project.</short-description>
-  
-    <description>
-    Call another target in the same project.
-
-  &lt;pre&gt;
-    &amp;lt;target name="foo"&amp;gt;
-      &amp;lt;antcall target="bar"&amp;gt;
-        &amp;lt;param name="property1" value="aaaaa" /&amp;gt;
-        &amp;lt;param name="foo" value="baz" /&amp;gt;
-       &amp;lt;/antcall&amp;gt;
-    &amp;lt;/target&amp;gt;
-
-    &amp;lt;target name="bar" depends="init"&amp;gt;
-      &amp;lt;echo message="prop is ${property1} ${foo}" /&amp;gt;
-    &amp;lt;/target&amp;gt;
- &lt;/pre&gt;
-
- &lt;p&gt;This only works as expected if neither property1 nor foo are
- defined in the project itself.
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="inheritall" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>If true, pass all properties to the new Ant project.</short-description>
-        
-          <description>
-          If true, pass all properties to the new Ant project.
- Defaults to true.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="inheritrefs" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>If true, pass all references to the new Ant project.</short-description>
-        
-          <description>
-          If true, pass all references to the new Ant project.
- Defaults to false
-        </description>
-      
-        </attribute>
-      
-        <attribute name="target" type="java.lang.String" briefType="String" required="yes">
-        
-          <short-description>Target to execute, required.</short-description>
-        
-          <description>
-          Target to execute, required.
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-      
-        <element name="reference" type="org.apache.tools.ant.taskdefs.Ant.Reference" briefType="" required="NOTDEFINED">
-        
-          <short-description>Reference element identifying a data type to carry
- over to the invoked target.</short-description>
-        
-          <description>
-          Reference element identifying a data type to carry
- over to the invoked target.
-        </description>
-      
-        </element>
-
-      
-        <element name="param" type="org.apache.tools.ant.taskdefs.Property" briefType="see &lt;property&gt;" required="NOTDEFINED">
-        
-          <short-description>Property to pass to the invoked target.</short-description>
-        
-          <description>
-          Property to pass to the invoked target.
-        </description>
-      
-        </element>
-
-    
-      </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="antlr" category="other" classname="org.apache.tools.ant.taskdefs.optional.ANTLR">
-
-  
-    <short-description>Invokes the ANTLR Translator generator on a grammar file.</short-description>
-  
-    <description>
-    Invokes the ANTLR Translator generator on a grammar file.
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="debug" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>Flag to enable ParseView debugging.</short-description>
-        
-          <description>
-          Sets a flag to enable ParseView debugging
-        </description>
-      
-        </attribute>
-      
-        <attribute name="diagnostic" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>Flag to emit diagnostic text.</short-description>
-        
-          <description>
-          Sets a flag to emit diagnostic text
-        </description>
-      
-        </attribute>
-      
-        <attribute name="dir" type="java.io.File" briefType="File" required="no">
-        
-          <short-description>The working directory of the process.</short-description>
-        
-          <description>
-          The working directory of the process
-        </description>
-      
-        </attribute>
-      
-        <attribute name="glib" type="java.lang.String" briefType="String" required="no">
-        
-          <short-description>Sets an optional super grammar file.</short-description>
-        
-          <description>
-          Sets an optional super grammar file.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="html" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>If true, emit html.</short-description>
-        
-          <description>
-          If true, emit html
-        </description>
-      
-        </attribute>
-      
-        <attribute name="outputdirectory" type="java.io.File" briefType="File" required="no">
-        
-          <short-description>The directory to write the generated files to.</short-description>
-        
-          <description>
-          The directory to write the generated files to.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="target" type="java.io.File" briefType="File" required="yes">
-        
-          <short-description>The grammar file to process.</short-description>
-        
-          <description>
-          The grammar file to process.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="trace" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>If true, enables all tracing.</short-description>
-        
-          <description>
-          If true, enables all tracing.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="tracelexer" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>If true, enables lexer tracing.</short-description>
-        
-          <description>
-          If true, enables lexer tracing.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="traceparser" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>If true, enables parser tracing.</short-description>
-        
-          <description>
-          If true, enables parser tracing.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="tracetreewalker" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>Flag to allow the user to enable tree walker tracing.</short-description>
-        
-          <description>
-          Sets a flag to allow the user to enable tree walker tracing
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-      
-        <element name="classpath" type="org.apache.tools.ant.types.Path" briefType="Path" required="NOTDEFINED">
-        
-          <short-description>Adds a classpath to be set
- because a directory might be given for Antlr debug.</short-description>
-        
-          <description>
-          Adds a classpath to be set
- because a directory might be given for Antlr debug.
-        </description>
-      
-        </element>
-
-      
-        <element name="jvmarg" type="org.apache.tools.ant.types.Commandline.Argument" briefType="" required="NOTDEFINED">
-        
-          <short-description>Adds a new JVM argument.</short-description>
-        
-          <description>
-          Adds a new JVM argument.
-        </description>
-      
-        </element>
-
-    
-      </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="antstructure" category="xml" classname="org.apache.tools.ant.taskdefs.AntStructure">
-
-  
-    <short-description>Creates a partial DTD for Ant from the currently known tasks.</short-description>
-  
-    <description>
-    Creates a partial DTD for Ant from the currently known tasks.
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="output" type="java.io.File" briefType="File" required="yes">
-        
-          <short-description>The output file.</short-description>
-        
-          <description>
-          The output file.
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-    </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="apply" category="control" classname="org.apache.tools.ant.taskdefs.ExecuteOn">
-
-  
-    <short-description>Executes a given command, supplying a set of files as arguments.</short-description>
-  
-    <description>
-    Executes a given command, supplying a set of files as arguments.
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="append" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          <short-description>Whether output should be appended to or overwrite an existing file.</short-description>
-        
-          <description>
-          Whether output should be appended to or overwrite an existing file.
- Defaults to false.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="dest" type="java.io.File" briefType="File" required="yes, if you specify a nested mapper">
-        
-          <short-description>The directory where target files are to be placed.</short-description>
-        
-          <description>
-          The directory where target files are to be placed.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="dir" type="java.io.File" briefType="File" required="no">
-        
-          <short-description>The working directory of the process.</short-description>
-        
-          <description>
-          The working directory of the process.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="executable" type="java.lang.String" briefType="String" required="yes">
-        
-          <short-description>The command to execute.</short-description>
-        
-          <description>
-          The command to execute.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="failifexecutionfails" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          <short-description>Stop the build if program cannot be started.</short-description>
-        
-          <description>
-          Stop the build if program cannot be started. Defaults to true.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="failonerror" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>Fail if the command exits with a non-zero return code.</short-description>
-        
-          <description>
-          Fail if the command exits with a non-zero return code.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="newenvironment" type="boolean" briefType="boolean" required="no, default is false">
-        
-          <short-description>Do not propagate old environment when new environment variables are specified.</short-description>
-        
-          <description>
-          Do not propagate old environment when new environment variables are specified.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="os" type="java.lang.String" briefType="String" required="no">
-        
-          <short-description>List of operating systems on which the command may be executed.</short-description>
-        
-          <description>
-          List of operating systems on which the command may be executed.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="output" type="java.io.File" briefType="File" required="no">
-        
-          <short-description>File the output of the process is redirected to.</short-description>
-        
-          <description>
-          File the output of the process is redirected to.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="outputproperty" type="java.lang.String" briefType="String" required="no">
-        
-          <short-description>Property name whose value should be set to the output of
- the process.</short-description>
-        
-          <description>
-          Property name whose value should be set to the output of
- the process.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="parallel" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>If true, run the command only once, appending all files as arguments.</short-description>
-        
-          <description>
-          If true, run the command only once, appending all files as arguments.
- If false, command will be executed once for every file. Defaults to false.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="relative" type="boolean" briefType="boolean" required="no, default is false">
-        
-          <short-description>Whether the filenames should be passed on the command line as
- absolute or relative pathnames.</short-description>
-        
-          <description>
-          Whether the filenames should be passed on the command line as
- absolute or relative pathnames. Paths are relative to the base
- directory of the corresponding fileset for source files or the
- dest attribute for target files.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="resultproperty" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>The name of a property in which the return code of the
- command should be stored.</short-description>
-        
-          <description>
-          The name of a property in which the return code of the
- command should be stored. Only of interest if failonerror=false.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="skipemptyfilesets" type="boolean" briefType="boolean" required="no, default is false">
-        
-          <short-description>If no source files have been found or are newer than their
- corresponding target files, do not run the command.</short-description>
-        
-          <description>
-          If no source files have been found or are newer than their
- corresponding target files, do not run the command.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="type" type="org.apache.tools.ant.taskdefs.ExecuteOn.FileDirBoth" briefType="&quot;file&quot;, &quot;dir&quot;, &quot;both&quot;" required="no, default is file">
-        
-          <short-description>Whether the command works only on files, directories or both?.</short-description>
-        
-          <description>
-          Whether the command works only on files, directories or both?
-        </description>
-      
-        </attribute>
-      
-        <attribute name="vmlauncher" type="boolean" briefType="boolean" required="no, default is true">
-        
-          <short-description>If true, launch new process with VM, otherwise use the OS's shell.</short-description>
-        
-          <description>
-          If true, launch new process with VM, otherwise use the OS's shell.
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-      
-        <element name="env" type="org.apache.tools.ant.types.Environment.Variable" briefType="" required="NOTDEFINED">
-        
-          <short-description>Add an environment variable to the launched process.</short-description>
-        
-          <description>
-          Add an environment variable to the launched process.
-        </description>
-      
-        </element>
-
-      
-        <element name="fileset" type="org.apache.tools.ant.types.FileSet" briefType="Fileset" required="NOTDEFINED">
-        
-          <short-description>Source files to operate upon.</short-description>
-        
-          <description>
-          Source files to operate upon.
-        </description>
-      
-        </element>
-
-      
-        <element name="arg" type="org.apache.tools.ant.types.Commandline.Argument" briefType="" required="NOTDEFINED">
-        
-          <short-description>Adds a command-line argument.</short-description>
-        
-          <description>
-          Adds a command-line argument.
-        </description>
-      
-        </element>
-
-      
-        <element name="mapper" type="org.apache.tools.ant.types.Mapper" briefType="Mapper" required="NOTDEFINED">
-        
-          <short-description>Mapper to use for mapping source files to target files.</short-description>
-        
-          <description>
-          Mapper to use for mapping source files to target files.
-        </description>
-      
-        </element>
-
-      
-        <element name="srcfile" type="org.apache.tools.ant.types.Commandline.Marker" briefType="" required="NOTDEFINED">
-        
-          <short-description>Marker that indicates where the name of the source file should
- be put on the command line.</short-description>
-        
-          <description>
-          Marker that indicates where the name of the source file should
- be put on the command line.
-        </description>
-      
-        </element>
-
-      
-        <element name="targetfile" type="org.apache.tools.ant.types.Commandline.Marker" briefType="" required="NOTDEFINED">
-        
-          <short-description>Marker that indicates where the name of the target file should
- be put on the command line.</short-description>
-        
-          <description>
-          Marker that indicates where the name of the target file should
- be put on the command line.
-        </description>
-      
-        </element>
-
-    
-      </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="available" category="control" classname="org.apache.tools.ant.taskdefs.Available">
-
-  
-    <short-description>Will set the given property if the requested resource is available at runtime.</short-description>
-  
-    <description>
-    Will set the given property if the requested resource is available at 
- runtime. This task may also be used as a condition by the condition task.
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="classname" type="java.lang.String" briefType="String" required="yes">
-        
-          <short-description>Classname of a class which must be available to set the given 
- property.</short-description>
-        
-          <description>
-          Set a classname of a class which must be available to set the given 
- property.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="classpath" type="org.apache.tools.ant.types.Path" briefType="Path" required="no">
-        
-          <short-description>Classpath to be used when searching for classes and resources.</short-description>
-        
-          <description>
-          Set the classpath to be used when searching for classes and resources.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="classpathref" type="org.apache.tools.ant.types.Reference" briefType="Reference" required="no">
-        
-          <short-description>Classpath by reference.</short-description>
-        
-          <description>
-          Set the classpath by reference.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="file" type="java.io.File" briefType="File" required="">
-        
-          <short-description>File which must be present in the file system to set the given
- property.</short-description>
-        
-          <description>
-          Set the file which must be present in the file system to set the given
- property.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="filepath" type="org.apache.tools.ant.types.Path" briefType="Path" required="no">
-        
-          <short-description>Path to use when looking for a file.</short-description>
-        
-          <description>
-          Set the path to use when looking for a file.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="ignoresystemclasses" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>Set whether the search for classes should ignore the runtime classes and
- just use the given classpath.</short-description>
-        
-          <description>
-          Set whether the search for classes should ignore the runtime classes and
- just use the given classpath.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="property" type="java.lang.String" briefType="String" required="yes">
-        
-          <short-description>Name of the property which will be set if the particular resource
- is available.</short-description>
-        
-          <description>
-          Set the name of the property which will be set if the particular resource
- is available.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="resource" type="java.lang.String" briefType="String" required="">
-        
-          <short-description>Name of a Java resource which is required to set the property.</short-description>
-        
-          <description>
-          Set the name of a Java resource which is required to set the property.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="type" type="org.apache.tools.ant.taskdefs.Available.FileDir" briefType="&quot;file&quot;, &quot;dir&quot;" required="no">
-        
-          <short-description>Set what type of file is required - either directory or file.</short-description>
-        
-          <description>
-          Set what type of file is required - either directory or file.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="value" type="java.lang.String" briefType="String" required="no">
-        
-          <short-description>Value to be given to the property if the desired resource is
- available.</short-description>
-        
-          <description>
-          Set the value to be given to the property if the desired resource is
- available.
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-      
-        <element name="classpath" type="org.apache.tools.ant.types.Path" briefType="Path" required="NOTDEFINED">
-        
-          <short-description>Classpath to be used when searching for classes and resources.</short-description>
-        
-          <description>
-          Classpath to be used when searching for classes and resources.
-        </description>
-      
-        </element>
-
-      
-        <element name="filepath" type="org.apache.tools.ant.types.Path" briefType="Path" required="NOTDEFINED">
-        
-          <short-description>Path to search for file resources.</short-description>
-        
-          <description>
-          Path to search for file resources.
-        </description>
-      
-        </element>
-
-    
-      </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="basename" category="property" classname="org.apache.tools.ant.taskdefs.Basename">
-
-  
-    <short-description>Sets a property to the base name of a specified file, optionally minus a suffix.</short-description>
-  
-    <description>
-    Sets a property to the base name of a specified file, optionally minus a
- suffix.
-
- This task can accept the following attributes:
- &lt;ul&gt;
- &lt;li&gt;file
- &lt;li&gt;property
- &lt;li&gt;suffix
- &lt;/ul&gt;
- The &lt;b&gt;file&lt;/b&gt; and &lt;b&gt;property&lt;/b&gt; attributes are required. The
- &lt;b&gt;suffix&lt;/b&gt; attribute can be specified either with or without
- the &amp;quot;.&amp;quot;, and the result will be the same (ie., the
- returned file name will be minus the .suffix).
- &lt;p&gt;
- When this task executes, it will set the specified property to the
- value of the last element in the specified file. If file is a
- directory, the basename will be the last directory element. If file
- is a full-path filename, the basename will be the simple file name.
- If a suffix is specified, and the specified file ends in that suffix,
- the basename will be the simple file name without the suffix.
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="file" type="java.io.File" briefType="File" required="yes">
-        
-          <short-description>File or directory to get base name from.</short-description>
-        
-          <description>
-          File or directory to get base name from.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="property" type="java.lang.String" briefType="String" required="yes">
-        
-          <short-description>Property to set base name to.</short-description>
-        
-          <description>
-          Property to set base name to.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="suffix" type="java.lang.String" briefType="String" required="no">
-        
-          <short-description>Optional suffix to remove from base name.</short-description>
-        
-          <description>
-          Optional suffix to remove from base name.
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-    </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="blgenclient" category="ejb" classname="org.apache.tools.ant.taskdefs.optional.ejb.BorlandGenerateClient">
-
-  
-    <short-description>Generates a Borland Application Server 4.5 client JAR using as input the EJB JAR file.</short-description>
-  
-    <description>
-    Generates a Borland Application Server 4.5 client JAR using as
- input the EJB JAR file.
-
- Two mode are available: java mode (default) and fork mode. With the fork mode,
- it is impossible to add classpath to the commmand line.
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="classpath" type="org.apache.tools.ant.types.Path" briefType="Path" required="NOTDEFINED">
-        
-          <short-description>Path to use for classpath.</short-description>
-        
-          <description>
-          Path to use for classpath.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="classpathref" type="org.apache.tools.ant.types.Reference" briefType="Reference" required="NOTDEFINED">
-        
-          <short-description>Reference to existing path, to use as a classpath.</short-description>
-        
-          <description>
-          Reference to existing path, to use as a classpath.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="clientjar" type="java.io.File" briefType="File" required="NOTDEFINED">
-        
-          <short-description>Client JAR file name.</short-description>
-        
-          <description>
-          Client JAR file name.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="debug" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          <short-description>If true, turn on the debug mode for each of the Borland tools launched.</short-description>
-        
-          <description>
-          If true, turn on the debug mode for each of the Borland tools launched.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="ejbjar" type="java.io.File" briefType="File" required="NOTDEFINED">
-        
-          <short-description>EJB JAR file.</short-description>
-        
-          <description>
-          EJB JAR file.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="mode" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Command launching mode: java or fork.</short-description>
-        
-          <description>
-          Command launching mode: java or fork.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="version" type="int" briefType="int" required="NOTDEFINED">
-        
-          <short-description>No description.</short-description>
-        
-          <description>
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-      
-        <element name="classpath" type="org.apache.tools.ant.types.Path" briefType="Path" required="NOTDEFINED">
-        
-          <short-description>Adds path to the classpath.</short-description>
-        
-          <description>
-          Adds path to the classpath.
-        </description>
-      
-        </element>
-
-    
-      </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="buildnumber" category="other" classname="org.apache.tools.ant.taskdefs.BuildNumber">
-
-  
-    <short-description>Read, increment, and write a build number in a file It will first attempt to read a build number from a file, then set the property "build.number" to the value that was read in (or 0 if no such value).</short-description>
-  
-    <description>
-    Read, increment, and write a build number in a file
- It will first
- attempt to read a build number from a file, then set the property
- "build.number" to the value that was read in (or 0 if no such value). Then
- it will increment the build number by one and write it back out into the
- file.
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="file" type="java.io.File" briefType="File" required="no; defaults to &quot;build.number&quot;">
-        
-          <short-description>The file in which the build number is stored.</short-description>
-        
-          <description>
-          The file in which the build number is stored. Defaults to
- "build.number" if not specified.
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-    </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="bunzip2" category="packaging" classname="org.apache.tools.ant.taskdefs.BUnzip2">
-
-  
-    <short-description>Expands a file that has been compressed with the BZIP2 algorithm.</short-description>
-  
-    <description>
-    Expands a file that has been compressed with the BZIP2
- algorithm. Normally used to compress non-compressed archives such
- as TAR files.
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="dest" type="java.io.File" briefType="File" required="NOTDEFINED">
-        
-          <short-description>The destination file or directory; optional.</short-description>
-        
-          <description>
-          The destination file or directory; optional.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="src" type="java.io.File" briefType="File" required="NOTDEFINED">
-        
-          <short-description>The file to expand; required.</short-description>
-        
-          <description>
-          The file to expand; required.
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-    </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="bzip2" category="packaging" classname="org.apache.tools.ant.taskdefs.BZip2">
-
-  
-    <short-description>Compresses a file with the BZIP2 algorithm.</short-description>
-  
-    <description>
-    Compresses a file with the BZIP2 algorithm. Normally used to compress
- non-compressed archives such as TAR files.
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="src" type="java.io.File" briefType="File" required="NOTDEFINED">
-        
-          <short-description>The file to compress; required.</short-description>
-        
-          <description>
-          the file to compress; required.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="zipfile" type="java.io.File" briefType="File" required="NOTDEFINED">
-        
-          <short-description>The required destination file.</short-description>
-        
-          <description>
-          the required destination file.
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-    </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="cab" category="other" classname="org.apache.tools.ant.taskdefs.optional.Cab" matchingTask="true">
-
-  
-    <short-description>Create a CAB archive.</short-description>
-  
-    <description>
-    Create a CAB archive.
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="basedir" type="java.io.File" briefType="File" required="yes">
-        
-          <short-description>Base directory to look in for files to CAB.</short-description>
-        
-          <description>
-          Base directory to look in for files to CAB.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="cabfile" type="java.io.File" briefType="File" required="yes">
-        
-          <short-description>The name/location of where to create the .cab file.</short-description>
-        
-          <description>
-          The name/location of where to create the .cab file.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="compress" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>If true, compress the files otherwise only store them.</short-description>
-        
-          <description>
-          If true, compress the files otherwise only store them.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="options" type="java.lang.String" briefType="String" required="no">
-        
-          <short-description>Sets additional cabarc options that are not supported directly.</short-description>
-        
-          <description>
-          Sets additional cabarc options that are not supported directly.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="verbose" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>If true, display cabarc output.</short-description>
-        
-          <description>
-          If true, display cabarc output.
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-      
-        <element name="fileset" type="org.apache.tools.ant.types.FileSet" briefType="Fileset" required="NOTDEFINED">
-        
-          <short-description>Adds a set of files to archive.</short-description>
-        
-          <description>
-          Adds a set of files to archive.
-        </description>
-      
-        </element>
-
-    
-      </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="cccheckin" category="other" classname="org.apache.tools.ant.taskdefs.optional.clearcase.CCCheckin">
-
-  
-    <short-description>Performs ClearCase checkin.</short-description>
-  
-    <description>
-    Performs ClearCase checkin.
-
- &lt;p&gt;
- The following attributes are interpreted:
- &lt;table border="1"&gt;
-   &lt;tr&gt;
-     &lt;th&gt;Attribute&lt;/th&gt;
-     &lt;th&gt;Values&lt;/th&gt;
-     &lt;th&gt;Required&lt;/th&gt;
-   &lt;/tr&gt;
-   &lt;tr&gt;
-      &lt;td&gt;viewpath&lt;/td&gt;
-      &lt;td&gt;Path to the ClearCase view file or directory that the command will operate on&lt;/td&gt;
-      &lt;td&gt;No&lt;/td&gt;
-   &lt;tr&gt;
-   &lt;tr&gt;
-      &lt;td&gt;comment&lt;/td&gt;
-      &lt;td&gt;Specify a comment. Only one of comment or cfile may be used.&lt;/td&gt;
-      &lt;td&gt;No&lt;/td&gt;
-   &lt;tr&gt;
-   &lt;tr&gt;
-      &lt;td&gt;commentfile&lt;/td&gt;
-      &lt;td&gt;Specify a file containing a comment. Only one of comment or cfile may be used.&lt;/td&gt;
-      &lt;td&gt;No&lt;/td&gt;
-   &lt;tr&gt;
-   &lt;tr&gt;
-      &lt;td&gt;nowarn&lt;/td&gt;
-      &lt;td&gt;Suppress warning messages&lt;/td&gt;
-      &lt;td&gt;No&lt;/td&gt;
-   &lt;tr&gt;
-   &lt;tr&gt;
-      &lt;td&gt;preservetime&lt;/td&gt;
-      &lt;td&gt;Preserve the modification time&lt;/td&gt;
-      &lt;td&gt;No&lt;/td&gt;
-   &lt;tr&gt;
-   &lt;tr&gt;
-      &lt;td&gt;keepcopy&lt;/td&gt;
-      &lt;td&gt;Keeps a copy of the file with a .keep extension&lt;/td&gt;
-      &lt;td&gt;No&lt;/td&gt;
-   &lt;tr&gt;
-   &lt;tr&gt;
-      &lt;td&gt;identical&lt;/td&gt;
-      &lt;td&gt;Allows the file to be checked in even if it is identical to the original&lt;/td&gt;
-      &lt;td&gt;No&lt;/td&gt;
-   &lt;tr&gt;
- &lt;/table&gt;
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="cleartooldir" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Directory where the cleartool executable is located.</short-description>
-        
-          <description>
-          Set the directory where the cleartool executable is located.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="comment" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Comment string.</short-description>
-        
-          <description>
-          Sets the comment string.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="commentfile" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Specifies a file containing a comment.</short-description>
-        
-          <description>
-          Specifies a file containing a comment.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="identical" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          <short-description>If true, allows the file to be checked in even
- if it is identical to the original.</short-description>
-        
-          <description>
-          If true, allows the file to be checked in even
- if it is identical to the original.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="keepcopy" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          <short-description>If true, keeps a copy of the file with a .keep extension.</short-description>
-        
-          <description>
-          If true, keeps a copy of the file with a .keep extension.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="nowarn" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          <short-description>If true, suppress warning messages.</short-description>
-        
-          <description>
-          If true, suppress warning messages.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="preservetime" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          <short-description>If true, preserve the modification time.</short-description>
-        
-          <description>
-          If true, preserve the modification time.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="viewpath" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Path to the item in a ClearCase view to operate on.</short-description>
-        
-          <description>
-          Set the path to the item in a ClearCase view to operate on.
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-    </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="cccheckout" category="other" classname="org.apache.tools.ant.taskdefs.optional.clearcase.CCCheckout">
-
-  
-    <short-description>Performs ClearCase checkout.</short-description>
-  
-    <description>
-    Performs ClearCase checkout.
-
- &lt;p&gt;
- The following attributes are interpretted:
- &lt;table border="1"&gt;
-   &lt;tr&gt;
-     &lt;th&gt;Attribute&lt;/th&gt;
-     &lt;th&gt;Values&lt;/th&gt;
-     &lt;th&gt;Required&lt;/th&gt;
-   &lt;/tr&gt;
-   &lt;tr&gt;
-      &lt;td&gt;viewpath&lt;/td&gt;
-      &lt;td&gt;Path to the ClearCase view file or directory that the command will operate on&lt;/td&gt;
-      &lt;td&gt;No&lt;/td&gt;
-   &lt;tr&gt;
-   &lt;tr&gt;
-      &lt;td&gt;reserved&lt;/td&gt;
-      &lt;td&gt;Specifies whether to check out the file as reserved or not&lt;/td&gt;
-      &lt;td&gt;Yes&lt;/td&gt;
-   &lt;tr&gt;
-   &lt;tr&gt;
-      &lt;td&gt;out&lt;/td&gt;
-      &lt;td&gt;Creates a writable file under a different filename&lt;/td&gt;
-      &lt;td&gt;No&lt;/td&gt;
-   &lt;tr&gt;
-   &lt;tr&gt;
-      &lt;td&gt;nodata&lt;/td&gt;
-      &lt;td&gt;Checks out the file but does not create an editable file containing its data&lt;/td&gt;
-      &lt;td&gt;No&lt;/td&gt;
-   &lt;tr&gt;
-   &lt;tr&gt;
-      &lt;td&gt;branch&lt;/td&gt;
-      &lt;td&gt;Specify a branch to check out the file to&lt;/td&gt;
-      &lt;td&gt;No&lt;/td&gt;
-   &lt;tr&gt;
-   &lt;tr&gt;
-      &lt;td&gt;version&lt;/td&gt;
-      &lt;td&gt;Allows checkout of a version other than main latest&lt;/td&gt;
-      &lt;td&gt;No&lt;/td&gt;
-   &lt;tr&gt;
-   &lt;tr&gt;
-      &lt;td&gt;nowarn&lt;/td&gt;
-      &lt;td&gt;Suppress warning messages&lt;/td&gt;
-      &lt;td&gt;No&lt;/td&gt;
-   &lt;tr&gt;
-   &lt;tr&gt;
-      &lt;td&gt;comment&lt;/td&gt;
-      &lt;td&gt;Specify a comment. Only one of comment or cfile may be used.&lt;/td&gt;
-      &lt;td&gt;No&lt;/td&gt;
-   &lt;tr&gt;
-   &lt;tr&gt;
-      &lt;td&gt;commentfile&lt;/td&gt;
-      &lt;td&gt;Specify a file containing a comment. Only one of comment or cfile may be used.&lt;/td&gt;
-      &lt;td&gt;No&lt;/td&gt;
-   &lt;tr&gt;
- &lt;/table&gt;
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="branch" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Specify a branch to check out the file to.</short-description>
-        
-          <description>
-          Specify a branch to check out the file to.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="cleartooldir" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Directory where the cleartool executable is located.</short-description>
-        
-          <description>
-          Set the directory where the cleartool executable is located.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="comment" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Comment string.</short-description>
-        
-          <description>
-          Sets the comment string.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="commentfile" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Specifies a file containing a comment.</short-description>
-        
-          <description>
-          Specifies a file containing a comment.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="nodata" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          <short-description>If true, checks out the file but does not create an
- editable file containing its data.</short-description>
-        
-          <description>
-          If true, checks out the file but does not create an
- editable file containing its data.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="nowarn" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          <short-description>If true, warning messages are suppressed.</short-description>
-        
-          <description>
-          If true, warning messages are suppressed.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="out" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Creates a writable file under a different filename.</short-description>
-        
-          <description>
-          Creates a writable file under a different filename.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="reserved" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          <short-description>If true, checks out the file as reserved.</short-description>
-        
-          <description>
-          If true, checks out the file as reserved.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="version" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          <short-description>If true, allows checkout of a version other than main latest.</short-description>
-        
-          <description>
-          If true, allows checkout of a version other than main latest.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="viewpath" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Path to the item in a ClearCase view to operate on.</short-description>
-        
-          <description>
-          Set the path to the item in a ClearCase view to operate on.
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-    </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="ccmcheckin" category="other" classname="org.apache.tools.ant.taskdefs.optional.ccm.CCMCheckin">
-
-  
-    <short-description>Performs Continuus checkin command.</short-description>
-  
-    <description>
-    Performs Continuus checkin command.
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="ccmdir" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Directory where the ccm executable is located.</short-description>
-        
-          <description>
-          Set the directory where the ccm executable is located.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="comment" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Specifies a comment.</short-description>
-        
-          <description>
-          Specifies a comment.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="file" type="java.io.File" briefType="File" required="NOTDEFINED">
-        
-          <short-description>Path to the file that the command will operate on.</short-description>
-        
-          <description>
-          Sets the path to the file that the command will operate on.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="task" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Specifies the task number used to check
- in the file (may use 'default').</short-description>
-        
-          <description>
-          Specifies the task number used to check
- in the file (may use 'default').
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-    </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="ccmcheckintask" category="scm" classname="org.apache.tools.ant.taskdefs.optional.ccm.CCMCheckinDefault">
-
-  
-    <short-description>Performs Continuus Checkin Default task command.</short-description>
-  
-    <description>
-    Performs Continuus Checkin Default task command.
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="ccmdir" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Directory where the ccm executable is located.</short-description>
-        
-          <description>
-          Set the directory where the ccm executable is located.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="comment" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Specifies a comment.</short-description>
-        
-          <description>
-          Specifies a comment.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="file" type="java.io.File" briefType="File" required="NOTDEFINED">
-        
-          <short-description>Path to the file that the command will operate on.</short-description>
-        
-          <description>
-          Sets the path to the file that the command will operate on.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="task" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Specifies the task number used to check
- in the file (may use 'default').</short-description>
-        
-          <description>
-          Specifies the task number used to check
- in the file (may use 'default').
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-    </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="ccmcheckout" category="other" classname="org.apache.tools.ant.taskdefs.optional.ccm.CCMCheckout">
-
-  
-    <short-description>Performs Continuus checkout command.</short-description>
-  
-    <description>
-    Performs Continuus checkout command.
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="ccmdir" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Directory where the ccm executable is located.</short-description>
-        
-          <description>
-          Set the directory where the ccm executable is located.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="comment" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Specifies a comment.</short-description>
-        
-          <description>
-          Specifies a comment.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="file" type="java.io.File" briefType="File" required="NOTDEFINED">
-        
-          <short-description>Path to the file that the command will operate on.</short-description>
-        
-          <description>
-          Sets the path to the file that the command will operate on.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="task" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Specifies the task number used to check
- in the file (may use 'default').</short-description>
-        
-          <description>
-          Specifies the task number used to check
- in the file (may use 'default').
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-    </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="ccmcreatetask" category="scm" classname="org.apache.tools.ant.taskdefs.optional.ccm.CCMCreateTask">
-
-  
-    <short-description>Creates new Continuus ccm task and sets it as the default.</short-description>
-  
-    <description>
-    Creates new Continuus ccm task and sets it as the default.
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="ccmdir" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Directory where the ccm executable is located.</short-description>
-        
-          <description>
-          Set the directory where the ccm executable is located.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="comment" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Specifies a comment.</short-description>
-        
-          <description>
-          Specifies a comment.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="platform" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Specifies the target platform.</short-description>
-        
-          <description>
-          Specifies the target platform.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="release" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Specify the CCM release.</short-description>
-        
-          <description>
-          Specify the CCM release.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="resolver" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Specifies the resolver.</short-description>
-        
-          <description>
-          Specifies the resolver.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="subsystem" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Specifies the subsystem.</short-description>
-        
-          <description>
-          Specifies the subsystem.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="task" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Specifies the task number used to checkin
- the file (may use 'default').</short-description>
-        
-          <description>
-          Specifies the task number used to checkin
- the file (may use 'default').
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-    </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="ccmreconfigure" category="other" classname="org.apache.tools.ant.taskdefs.optional.ccm.CCMReconfigure">
-
-  
-    <short-description>Task allows to reconfigure a project, recurcively or not</short-description>
-  
-    <description>
-    Task allows to reconfigure a project, recurcively or not
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="ccmdir" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Directory where the ccm executable is located.</short-description>
-        
-          <description>
-          Set the directory where the ccm executable is located.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="ccmproject" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Ccm project on which the operation is applied.</short-description>
-        
-          <description>
-          Sets the ccm project on which the operation is applied.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="recurse" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          <short-description>If true, recurse on subproject (default false).</short-description>
-        
-          <description>
-          If true, recurse on subproject (default false).
-        </description>
-      
-        </attribute>
-      
-        <attribute name="verbose" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          <short-description>If true, do a verbose reconfigure operation (default false).</short-description>
-        
-          <description>
-          If true, do a verbose reconfigure operation (default false).
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-    </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="ccuncheckout" category="other" classname="org.apache.tools.ant.taskdefs.optional.clearcase.CCUnCheckout">
-
-  
-    <short-description>Performs ClearCase UnCheckout command.</short-description>
-  
-    <description>
-    Performs ClearCase UnCheckout command.
-
- &lt;p&gt;
- The following attributes are interpretted:
- &lt;table border="1"&gt;
-   &lt;tr&gt;
-     &lt;th&gt;Attribute&lt;/th&gt;
-     &lt;th&gt;Values&lt;/th&gt;
-     &lt;th&gt;Required&lt;/th&gt;
-   &lt;/tr&gt;
-   &lt;tr&gt;
-      &lt;td&gt;viewpath&lt;/td&gt;
-      &lt;td&gt;Path to the ClearCase view file or directory that the command will operate on&lt;/td&gt;
-      &lt;td&gt;No&lt;/td&gt;
-   &lt;tr&gt;
-   &lt;tr&gt;
-      &lt;td&gt;keepcopy&lt;/td&gt;
-      &lt;td&gt;Specifies whether to keep a copy of the file with a .keep extension or not&lt;/td&gt;
-      &lt;td&gt;No&lt;/td&gt;
-   &lt;tr&gt;
- &lt;/table&gt;
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="cleartooldir" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Directory where the cleartool executable is located.</short-description>
-        
-          <description>
-          Set the directory where the cleartool executable is located.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="keepcopy" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          <short-description>If true, keep a copy of the file with a .keep extension.</short-description>
-        
-          <description>
-          If true, keep a copy of the file with a .keep extension.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="viewpath" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Path to the item in a ClearCase view to operate on.</short-description>
-        
-          <description>
-          Set the path to the item in a ClearCase view to operate on.
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-    </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="ccupdate" category="other" classname="org.apache.tools.ant.taskdefs.optional.clearcase.CCUpdate">
-
-  
-    <short-description>Performs a ClearCase Update command.</short-description>
-  
-    <description>
-    Performs a ClearCase Update command.
-
- &lt;p&gt;
- The following attributes are interpretted:
- &lt;table border="1"&gt;
-   &lt;tr&gt;
-     &lt;th&gt;Attribute&lt;/th&gt;
-     &lt;th&gt;Values&lt;/th&gt;
-     &lt;th&gt;Required&lt;/th&gt;
-   &lt;/tr&gt;
-   &lt;tr&gt;
-      &lt;td&gt;viewpath&lt;/td&gt;
-      &lt;td&gt;Path to the ClearCase view file or directory that the command will operate on&lt;/td&gt;
-      &lt;td&gt;No&lt;/td&gt;
-   &lt;tr&gt;
-   &lt;tr&gt;
-      &lt;td&gt;graphical&lt;/td&gt;
-      &lt;td&gt;Displays a graphical dialog during the update&lt;/td&gt;
-      &lt;td&gt;No&lt;/td&gt;
-   &lt;tr&gt;
-   &lt;tr&gt;
-      &lt;td&gt;log&lt;/td&gt;
-      &lt;td&gt;Specifies a log file for ClearCase to write to&lt;/td&gt;
-      &lt;td&gt;No&lt;/td&gt;
-   &lt;tr&gt;
-   &lt;tr&gt;
-      &lt;td&gt;overwrite&lt;/td&gt;
-      &lt;td&gt;Specifies whether to overwrite hijacked files or not&lt;/td&gt;
-      &lt;td&gt;No&lt;/td&gt;
-   &lt;tr&gt;
-   &lt;tr&gt;
-      &lt;td&gt;rename&lt;/td&gt;
-      &lt;td&gt;Specifies that hijacked files should be renamed with a .keep extension&lt;/td&gt;
-      &lt;td&gt;No&lt;/td&gt;
-   &lt;tr&gt;
-   &lt;tr&gt;
-      &lt;td&gt;currenttime&lt;/td&gt;
-      &lt;td&gt;Specifies that modification time should be written as the current time. Either currenttime or preservetime can be specified.&lt;/td&gt;
-      &lt;td&gt;No&lt;/td&gt;
-   &lt;tr&gt;
-   &lt;tr&gt;
-      &lt;td&gt;preservetime&lt;/td&gt;
-      &lt;td&gt;Specifies that modification time should preserved from the VOB time. Either currenttime or preservetime can be specified.&lt;/td&gt;
-      &lt;td&gt;No&lt;/td&gt;
-   &lt;tr&gt;
- &lt;/table&gt;
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="cleartooldir" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Directory where the cleartool executable is located.</short-description>
-        
-          <description>
-          Set the directory where the cleartool executable is located.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="currenttime" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          <short-description>If true, modification time should be written as the current time.</short-description>
-        
-          <description>
-          If true, modification time should be written as the current time.
- Either currenttime or preservetime can be specified.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="graphical" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          <short-description>If true, displays a graphical dialog during the update.</short-description>
-        
-          <description>
-          If true, displays a graphical dialog during the update.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="log" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Log file where cleartool records
- the status of the command.</short-description>
-        
-          <description>
-          Sets the log file where cleartool records
- the status of the command.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="overwrite" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          <short-description>If true, overwrite hijacked files.</short-description>
-        
-          <description>
-          If true, overwrite hijacked files.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="preservetime" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          <short-description>If true, modification time should be preserved from the VOB time.</short-description>
-        
-          <description>
-          If true, modification time should be preserved from the VOB time.
- Either currenttime or preservetime can be specified.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="rename" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          <short-description>If true, hijacked files are renamed with a .keep extension.</short-description>
-        
-          <description>
-          If true, hijacked files are renamed with a .keep extension.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="viewpath" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Path to the item in a ClearCase view to operate on.</short-description>
-        
-          <description>
-          Set the path to the item in a ClearCase view to operate on.
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-    </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="checksum" category="control" classname="org.apache.tools.ant.taskdefs.Checksum" matchingTask="true">
-
-  
-    <short-description>Used to create or verify file checksums.</short-description>
-  
-    <description>
-    Used to create or verify file checksums.
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="algorithm" type="java.lang.String" briefType="String" required="no">
-        
-          <short-description>Specifies the algorithm to be used to compute the checksum.</short-description>
-        
-          <description>
-          Specifies the algorithm to be used to compute the checksum.
- Defaults to "MD5". Other popular algorithms like "SHA" may be used as well.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="file" type="java.io.File" briefType="File" required="one of either file or      at least one nested fileset element.">
-        
-          <short-description>File for which the checksum is to be calculated.</short-description>
-        
-          <description>
-          Sets the file for which the checksum is to be calculated.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="fileext" type="java.lang.String" briefType="String" required="no">
-        
-          <short-description>File extension that is be to used to
- create or identify destination file.</short-description>
-        
-          <description>
-          Sets the file extension that is be to used to
- create or identify destination file.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="forceoverwrite" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>Whether or not to overwrite existing file irrespective of 
- whether it is newer than
- the source file.</short-description>
-        
-          <description>
-          Whether or not to overwrite existing file irrespective of 
- whether it is newer than
- the source file.  Defaults to false.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="property" type="java.lang.String" briefType="String" required="no">
-        
-          <short-description>Property to hold the generated checksum.</short-description>
-        
-          <description>
-          Sets the property to hold the generated checksum.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="provider" type="java.lang.String" briefType="String" required="no">
-        
-          <short-description>MessageDigest algorithm provider to be used
- to calculate the checksum.</short-description>
-        
-          <description>
-          Sets the MessageDigest algorithm provider to be used
- to calculate the checksum.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="readbuffersize" type="int" briefType="int" required="no">
-        
-          <short-description>The size of the read buffer to use.</short-description>
-        
-          <description>
-          The size of the read buffer to use.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="verifyproperty" type="java.lang.String" briefType="String" required="no">
-        
-          <short-description>Verify property.</short-description>
-        
-          <description>
-          Sets the verify property.  This project property holds
- the result of a checksum verification - "true" or "false"
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-      
-        <element name="fileset" type="org.apache.tools.ant.types.FileSet" briefType="Fileset" required="NOTDEFINED">
-        
-          <short-description>Files to generate checksums for.</short-description>
-        
-          <description>
-          Files to generate checksums for.
-        </description>
-      
-        </element>
-
-    
-      </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="chmod" category="filesystem" classname="org.apache.tools.ant.taskdefs.Chmod">
-
-  
-    <short-description>Chmod equivalent for unix-like environments.</short-description>
-  
-    <description>
-    Chmod equivalent for unix-like environments.
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="append" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          <short-description>Whether output should be appended to or overwrite an existing file.</short-description>
-        
-          <description>
-          Whether output should be appended to or overwrite an existing file.
- Defaults to false.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="defaultexcludes" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>Sets whether default exclusions should be used or not.</short-description>
-        
-          <description>
-          Sets whether default exclusions should be used or not.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="dest" type="java.io.File" briefType="File" required="NOTDEFINED">
-        
-          <short-description>The directory where target files are to be placed.</short-description>
-        
-          <description>
-          The directory where target files are to be placed.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="dir" type="java.io.File" briefType="File" required="">
-        
-          <short-description>The directory which holds the files whose permissions must be changed.</short-description>
-        
-          <description>
-          The directory which holds the files whose permissions must be changed.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="excludes" type="java.lang.String" briefType="String" required="no">
-        
-          <short-description>Set of exclude patterns.</short-description>
-        
-          <description>
-          Sets the set of exclude patterns. Patterns may be separated by a comma
- or a space.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="executable" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>The command to execute.</short-description>
-        
-          <description>
-          The command to execute.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="failifexecutionfails" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          <short-description>Stop the build if program cannot be started.</short-description>
-        
-          <description>
-          Stop the build if program cannot be started. Defaults to true.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="failonerror" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          <short-description>Fail if the command exits with a non-zero return code.</short-description>
-        
-          <description>
-          Fail if the command exits with a non-zero return code.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="file" type="java.io.File" briefType="File" required="exactly one of the two or nested &lt;fileset&gt; elements.">
-        
-          <short-description>The file or single directory of which the permissions must be changed.</short-description>
-        
-          <description>
-          The file or single directory of which the permissions must be changed.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="includes" type="java.lang.String" briefType="String" required="no">
-        
-          <short-description>Set of include patterns.</short-description>
-        
-          <description>
-          Sets the set of include patterns. Patterns may be separated by a comma
- or a space.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="newenvironment" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          <short-description>Do not propagate old environment when new environment variables are specified.</short-description>
-        
-          <description>
-          Do not propagate old environment when new environment variables are specified.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="os" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>List of operating systems on which the command may be executed.</short-description>
-        
-          <description>
-          List of operating systems on which the command may be executed.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="output" type="java.io.File" briefType="File" required="NOTDEFINED">
-        
-          <short-description>File the output of the process is redirected to.</short-description>
-        
-          <description>
-          File the output of the process is redirected to.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="outputproperty" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Property name whose value should be set to the output of
- the process.</short-description>
-        
-          <description>
-          Property name whose value should be set to the output of
- the process.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="parallel" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>If true, run the command only once, appending all files as arguments.</short-description>
-        
-          <description>
-          If true, run the command only once, appending all files as arguments.
- If false, command will be executed once for every file. Defaults to false.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="perm" type="java.lang.String" briefType="String" required="yes">
-        
-          <short-description>The new permissions.</short-description>
-        
-          <description>
-          The new permissions.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="relative" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          <short-description>Whether the filenames should be passed on the command line as
- absolute or relative pathnames.</short-description>
-        
-          <description>
-          Whether the filenames should be passed on the command line as
- absolute or relative pathnames. Paths are relative to the base
- directory of the corresponding fileset for source files or the
- dest attribute for target files.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="resultproperty" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>The name of a property in which the return code of the
- command should be stored.</short-description>
-        
-          <description>
-          The name of a property in which the return code of the
- command should be stored. Only of interest if failonerror=false.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="skipemptyfilesets" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          <short-description>If no source files have been found or are newer than their
- corresponding target files, do not run the command.</short-description>
-        
-          <description>
-          If no source files have been found or are newer than their
- corresponding target files, do not run the command.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="type" type="org.apache.tools.ant.taskdefs.ExecuteOn.FileDirBoth" briefType="&quot;file&quot;, &quot;dir&quot;, &quot;both&quot;" required="no, default is file">
-        
-          <short-description>Whether the command works only on files, directories or both?.</short-description>
-        
-          <description>
-          Whether the command works only on files, directories or both?
-        </description>
-      
-        </attribute>
-      
-        <attribute name="vmlauncher" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          <short-description>If true, launch new process with VM, otherwise use the OS's shell.</short-description>
-        
-          <description>
-          If true, launch new process with VM, otherwise use the OS's shell.
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-      
-        <element name="env" type="org.apache.tools.ant.types.Environment.Variable" briefType="" required="NOTDEFINED">
-        
-          <short-description>Add an environment variable to the launched process.</short-description>
-        
-          <description>
-          Add an environment variable to the launched process.
-        </description>
-      
-        </element>
-
-      
-        <element name="fileset" type="org.apache.tools.ant.types.FileSet" briefType="Fileset" required="NOTDEFINED">
-        
-          <short-description>Source files to operate upon.</short-description>
-        
-          <description>
-          Source files to operate upon.
-        </description>
-      
-        </element>
-
-      
-        <element name="arg" type="org.apache.tools.ant.types.Commandline.Argument" briefType="" required="NOTDEFINED">
-        
-          <short-description>Adds a command-line argument.</short-description>
-        
-          <description>
-          Adds a command-line argument.
-        </description>
-      
-        </element>
-
-      
-        <element name="exclude" type="org.apache.tools.ant.types.PatternSet.NameEntry" briefType="" required="NOTDEFINED">
-        
-          <short-description>Add a name entry on the exclude list.</short-description>
-        
-          <description>
-          Add a name entry on the exclude list.
-        </description>
-      
-        </element>
-
-      
-        <element name="include" type="org.apache.tools.ant.types.PatternSet.NameEntry" briefType="" required="NOTDEFINED">
-        
-          <short-description>Add a name entry on the include list.</short-description>
-        
-          <description>
-          Add a name entry on the include list.
-        </description>
-      
-        </element>
-
-      
-        <element name="mapper" type="org.apache.tools.ant.types.Mapper" briefType="Mapper" required="NOTDEFINED">
-        
-          <short-description>Mapper to use for mapping source files to target files.</short-description>
-        
-          <description>
-          Mapper to use for mapping source files to target files.
-        </description>
-      
-        </element>
-
-      
-        <element name="patternset" type="org.apache.tools.ant.types.PatternSet" briefType="Patternset" required="NOTDEFINED">
-        
-          <short-description>Add a set of patterns.</short-description>
-        
-          <description>
-          Add a set of patterns.
-        </description>
-      
-        </element>
-
-      
-        <element name="srcfile" type="org.apache.tools.ant.types.Commandline.Marker" briefType="" required="NOTDEFINED">
-        
-          <short-description>Marker that indicates where the name of the source file should
- be put on the command line.</short-description>
-        
-          <description>
-          Marker that indicates where the name of the source file should
- be put on the command line.
-        </description>
-      
-        </element>
-
-      
-        <element name="targetfile" type="org.apache.tools.ant.types.Commandline.Marker" briefType="" required="NOTDEFINED">
-        
-          <short-description>Marker that indicates where the name of the target file should
- be put on the command line.</short-description>
-        
-          <description>
-          Marker that indicates where the name of the target file should
- be put on the command line.
-        </description>
-      
-        </element>
-
-    
-      </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="concat" category="other" classname="org.apache.tools.ant.taskdefs.Concat">
-
-  
-    <short-description>This class contains the 'concat' task, used to concatenate a series of files into a single stream.</short-description>
-  
-    <description>
-    This class contains the 'concat' task, used to concatenate a series
- of files into a single stream. The destination of this stream may
- be the system console, or a file. The following is a sample
- invocation:
-
- &lt;pre&gt;
- &amp;lt;concat destfile=&amp;quot;${build.dir}/index.xml&amp;quot;
-   append=&amp;quot;false&amp;quot;&amp;gt;
-
-   &amp;lt;fileset dir=&amp;quot;${xml.root.dir}&amp;quot;
-     includes=&amp;quot;*.xml&amp;quot; /&amp;gt;
-
- &amp;lt;/concat&amp;gt;
- &lt;/pre&gt;
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="append" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>Behavior when the destination file exists.</short-description>
-        
-          <description>
-          Sets the behavior when the destination file exists. If set to
- &lt;code&gt;true&lt;/code&gt; the stream data will be appended to the
- existing file, otherwise the existing file will be
- overwritten. Defaults to &lt;code&gt;false&lt;/code&gt;.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="destfile" type="java.io.File" briefType="File" required="no     ">
-        
-          <short-description>Destination file, or uses the console if not specified.</short-description>
-        
-          <description>
-          Sets the destination file, or uses the console if not specified.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="encoding" type="java.lang.String" briefType="String" required="no">
-        
-          <short-description>Encoding for the input files, used when displaying the
- data via the console.</short-description>
-        
-          <description>
-          Sets the encoding for the input files, used when displaying the
- data via the console.
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-      
-        <element name="filelist" type="org.apache.tools.ant.types.FileList" briefType="Filelist" required="NOTDEFINED">
-        
-          <short-description>List of files to concatenate.</short-description>
-        
-          <description>
-          List of files to concatenate.
-        </description>
-      
-        </element>
-
-      
-        <element name="fileset" type="org.apache.tools.ant.types.FileSet" briefType="Fileset" required="NOTDEFINED">
-        
-          <short-description>Set of files to concatenate.</short-description>
-        
-          <description>
-          Set of files to concatenate.
-        </description>
-      
-        </element>
-
-    
-      </elements>
-
-      
-      <body>
-        
-        <description>
-          This method adds text which appears in the 'concat' element.
-        </description>
-      
-      </body>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="condition" category="control" classname="org.apache.tools.ant.taskdefs.ConditionTask">
-
-  
-    <short-description>Task to set a property conditionally using &amp;lt;uptodate&amp;gt;, &amp;lt;available&amp;gt;, and many other supported conditions.</short-description>
-  
-    <description>
-    Task to set a property conditionally using &amp;lt;uptodate&amp;gt;, &amp;lt;available&amp;gt;,
- and many other supported conditions.
-
- &lt;p&gt;This task supports boolean logic as well as pluggable conditions
- to decide, whether a property should be set.&lt;/p&gt;
-
- &lt;p&gt;This task does not extend Task to take advantage of
- ConditionBase.&lt;/p&gt;
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="property" type="java.lang.String" briefType="String" required="yes">
-        
-          <short-description>The name of the property to set.</short-description>
-        
-          <description>
-          The name of the property to set. Required.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="value" type="java.lang.String" briefType="String" required="no">
-        
-          <short-description>The value for the property to set, if condition evaluates to true.</short-description>
-        
-          <description>
-          The value for the property to set, if condition evaluates to true.
- Defaults to "true".
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-      
-        <element name="and" type="org.apache.tools.ant.taskdefs.condition.And" briefType="" required="NOTDEFINED">
-        
-          <short-description>Add an &amp;lt;and&amp;gt; condition "container".</short-description>
-        
-          <description>
-          Add an &amp;lt;and&amp;gt; condition "container".
-        </description>
-      
-        </element>
-
-      
-        <element name="available" type="org.apache.tools.ant.taskdefs.Available" briefType="" required="NOTDEFINED">
-        
-          <short-description>Add an &amp;lt;available&amp;gt; condition.</short-description>
-        
-          <description>
-          Add an &amp;lt;available&amp;gt; condition.
-        </description>
-      
-        </element>
-
-      
-        <element name="checksum" type="org.apache.tools.ant.taskdefs.Checksum" briefType="" required="NOTDEFINED">
-        
-          <short-description>Add an &amp;lt;checksum&amp;gt; condition.</short-description>
-        
-          <description>
-          Add an &amp;lt;checksum&amp;gt; condition.
-        </description>
-      
-        </element>
-
-      
-        <element name="contains" type="org.apache.tools.ant.taskdefs.condition.Contains" briefType="" required="NOTDEFINED">
-        
-          <short-description>Add a &amp;lt;contains&amp;gt; condition.</short-description>
-        
-          <description>
-          Add a &amp;lt;contains&amp;gt; condition.
-        </description>
-      
-        </element>
-
-      
-        <element name="equals" type="org.apache.tools.ant.taskdefs.condition.Equals" briefType="" required="NOTDEFINED">
-        
-          <short-description>Add an &amp;lt;equals&amp;gt; condition.</short-description>
-        
-          <description>
-          Add an &amp;lt;equals&amp;gt; condition.
-        </description>
-      
-        </element>
-
-      
-        <element name="filesmatch" type="org.apache.tools.ant.taskdefs.condition.FilesMatch" briefType="" required="NOTDEFINED">
-        
-          <short-description>Add a &amp;lt;filesmatch&amp;gt; condition.</short-description>
-        
-          <description>
-          Add a &amp;lt;filesmatch&amp;gt; condition.
-        </description>
-      
-        </element>
-
-      
-        <element name="http" type="org.apache.tools.ant.taskdefs.condition.Http" briefType="" required="NOTDEFINED">
-        
-          <short-description>Add an &amp;lt;http&amp;gt; condition.</short-description>
-        
-          <description>
-          Add an &amp;lt;http&amp;gt; condition.
-        </description>
-      
-        </element>
-
-      
-        <element name="isfalse" type="org.apache.tools.ant.taskdefs.condition.IsFalse" briefType="" required="NOTDEFINED">
-        
-          <short-description>Add a &amp;lt;isfalse&amp;gt; condition.</short-description>
-        
-          <description>
-          Add a &amp;lt;isfalse&amp;gt; condition.
-        </description>
-      
-        </element>
-
-      
-        <element name="isset" type="org.apache.tools.ant.taskdefs.condition.IsSet" briefType="" required="NOTDEFINED">
-        
-          <short-description>Add an &amp;lt;isset&amp;gt; condition.</short-description>
-        
-          <description>
-          Add an &amp;lt;isset&amp;gt; condition.
-        </description>
-      
-        </element>
-
-      
-        <element name="istrue" type="org.apache.tools.ant.taskdefs.condition.IsTrue" briefType="" required="NOTDEFINED">
-        
-          <short-description>Add a &amp;lt;istrue&amp;gt; condition.</short-description>
-        
-          <description>
-          Add a &amp;lt;istrue&amp;gt; condition.
-        </description>
-      
-        </element>
-
-      
-        <element name="not" type="org.apache.tools.ant.taskdefs.condition.Not" briefType="" required="NOTDEFINED">
-        
-          <short-description>Add an &amp;lt;not&amp;gt; condition "container".</short-description>
-        
-          <description>
-          Add an &amp;lt;not&amp;gt; condition "container".
-        </description>
-      
-        </element>
-
-      
-        <element name="or" type="org.apache.tools.ant.taskdefs.condition.Or" briefType="" required="NOTDEFINED">
-        
-          <short-description>Add an &amp;lt;or&amp;gt; condition "container".</short-description>
-        
-          <description>
-          Add an &amp;lt;or&amp;gt; condition "container".
-        </description>
-      
-        </element>
-
-      
-        <element name="os" type="org.apache.tools.ant.taskdefs.condition.Os" briefType="" required="NOTDEFINED">
-        
-          <short-description>Add an &amp;lt;os&amp;gt; condition.</short-description>
-        
-          <description>
-          Add an &amp;lt;os&amp;gt; condition.
-        </description>
-      
-        </element>
-
-      
-        <element name="socket" type="org.apache.tools.ant.taskdefs.condition.Socket" briefType="" required="NOTDEFINED">
-        
-          <short-description>Add a &amp;lt;socket&amp;gt; condition.</short-description>
-        
-          <description>
-          Add a &amp;lt;socket&amp;gt; condition.
-        </description>
-      
-        </element>
-
-      
-        <element name="uptodate" type="org.apache.tools.ant.taskdefs.UpToDate" briefType="" required="NOTDEFINED">
-        
-          <short-description>Add an &amp;lt;uptodate&amp;gt; condition.</short-description>
-        
-          <description>
-          Add an &amp;lt;uptodate&amp;gt; condition.
-        </description>
-      
-        </element>
-
-    
-      </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="copy" category="filesystem" classname="org.apache.tools.ant.taskdefs.Copy">
-
-  
-    <short-description>Copies a file or directory to a new file or directory.</short-description>
-  
-    <description>
-    Copies a file or directory to a new file
- or directory.  Files are only copied if the source file is newer
- than the destination file, or when the destination file does not
- exist.  It is possible to explicitly overwrite existing files.&lt;/p&gt;
-
- &lt;p&gt;This implementation is based on Arnout Kuiper's initial design
- document, the following mailing list discussions, and the
- copyfile/copydir tasks.&lt;/p&gt;
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="encoding" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Character encoding.</short-description>
-        
-          <description>
-          Sets the character encoding
-        </description>
-      
-        </attribute>
-      
-        <attribute name="failonerror" type="boolean" briefType="boolean" required="no; defaults to true.">
-        
-          <short-description>If false, note errors to the output but keep going.</short-description>
-        
-          <description>
-          If false, note errors to the output but keep going.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="file" type="java.io.File" briefType="File" required="yes, unless a nested      &lt;fileset&gt; element is used.">
-        
-          <short-description>Single source file to copy.</short-description>
-        
-          <description>
-          Sets a single source file to copy.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="filtering" type="boolean" briefType="boolean" required="no; defaults to false.">
-        
-          <short-description>If true, enables filtering.</short-description>
-        
-          <description>
-          If true, enables filtering.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="flatten" type="boolean" briefType="boolean" required="no; defaults to false.">
-        
-          <short-description>When copying directory trees, the files can be "flattened"
- into a single directory.</short-description>
-        
-          <description>
-          When copying directory trees, the files can be "flattened"
- into a single directory.  If there are multiple files with
- the same name in the source directory tree, only the first
- file will be copied into the "flattened" directory, unless
- the forceoverwrite attribute is true.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="includeemptydirs" type="boolean" briefType="boolean" required="no; defaults to true.">
-        
-          <short-description>Used to copy empty directories.</short-description>
-        
-          <description>
-          Used to copy empty directories.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="overwrite" type="boolean" briefType="boolean" required="no; defaults to false.">
-        
-          <short-description>Overwrite any existing destination file(s).</short-description>
-        
-          <description>
-          Overwrite any existing destination file(s).
-        </description>
-      
-        </attribute>
-      
-        <attribute name="preservelastmodified" type="boolean" briefType="boolean" required="no; defaults to false.">
-        
-          <short-description>Give the copied files the same last modified time as the original files.</short-description>
-        
-          <description>
-          Give the copied files the same last modified time as the original files.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="todir" type="java.io.File" briefType="File" required="">
-        
-          <short-description>Destination directory.</short-description>
-        
-          <description>
-          Sets the destination directory.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="tofile" type="java.io.File" briefType="File" required="with the file        attribute, either tofile or todir can be used.        with nested &lt;fileset&gt; elements, if the set of files        is greater than 1, or if only the dir attribute is        specified in the &lt;fileset&gt;, or if the        file attribute is also specified, then only        todir is allowed.">
-        
-          <short-description>Destination file.</short-description>
-        
-          <description>
-          Sets the destination file.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="verbose" type="boolean" briefType="boolean" required="no; defaults to false.">
-        
-          <short-description>Used to force listing of all names of copied files.</short-description>
-        
-          <description>
-          Used to force listing of all names of copied files.
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-      
-        <element name="fileset" type="org.apache.tools.ant.types.FileSet" briefType="Fileset" required="NOTDEFINED">
-        
-          <short-description>Adds a set of files to copy.</short-description>
-        
-          <description>
-          Adds a set of files to copy.
-        </description>
-      
-        </element>
-
-      
-        <element name="filterchain" type="org.apache.tools.ant.types.FilterChain" briefType="FilterChain" required="NOTDEFINED">
-        
-          <short-description>Adds a FilterChain.</short-description>
-        
-          <description>
-          Adds a FilterChain.
-        </description>
-      
-        </element>
-
-      
-        <element name="filterset" type="org.apache.tools.ant.types.FilterSet" briefType="Filterset" required="NOTDEFINED">
-        
-          <short-description>Adds a filterset.</short-description>
-        
-          <description>
-          Adds a filterset.
-        </description>
-      
-        </element>
-
-      
-        <element name="mapper" type="org.apache.tools.ant.types.Mapper" briefType="Mapper" required="NOTDEFINED">
-        
-          <short-description>Defines the mapper to map source to destination files.</short-description>
-        
-          <description>
-          Defines the mapper to map source to destination files.
-        </description>
-      
-        </element>
-
-    
-      </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="copydir" category="other" classname="org.apache.tools.ant.taskdefs.Copydir" deprecated="true" matchingTask="true">
-
-  
-    <short-description>Copies a directory.</short-description>
-  
-    <description>
-    Copies a directory.
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="dest" type="java.io.File" briefType="File" required="yes">
-        
-          <short-description>No description.</short-description>
-        
-          <description>
-        </description>
-      
-        </attribute>
-      
-        <attribute name="filtering" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>No description.</short-description>
-        
-          <description>
-        </description>
-      
-        </attribute>
-      
-        <attribute name="flatten" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>No description.</short-description>
-        
-          <description>
-        </description>
-      
-        </attribute>
-      
-        <attribute name="forceoverwrite" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>No description.</short-description>
-        
-          <description>
-        </description>
-      
-        </attribute>
-      
-        <attribute name="src" type="java.io.File" briefType="File" required="yes">
-        
-          <short-description>No description.</short-description>
-        
-          <description>
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-    </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="copyfile" category="other" classname="org.apache.tools.ant.taskdefs.Copyfile" deprecated="true">
-
-  
-    <short-description>Copies a file.</short-description>
-  
-    <description>
-    Copies a file.
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="dest" type="java.io.File" briefType="File" required="yes">
-        
-          <short-description>No description.</short-description>
-        
-          <description>
-        </description>
-      
-        </attribute>
-      
-        <attribute name="filtering" type="java.lang.String" briefType="String" required="no">
-        
-          <short-description>No description.</short-description>
-        
-          <description>
-        </description>
-      
-        </attribute>
-      
-        <attribute name="forceoverwrite" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>No description.</short-description>
-        
-          <description>
-        </description>
-      
-        </attribute>
-      
-        <attribute name="src" type="java.io.File" briefType="File" required="yes">
-        
-          <short-description>No description.</short-description>
-        
-          <description>
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-    </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="csc" category="dotnet" classname="org.apache.tools.ant.taskdefs.optional.dotnet.CSharp" matchingTask="true">
-
-  
-    <short-description>Compiles C# source into executables or modules.</short-description>
-  
-    <description>
-    Compiles C# source into executables or modules.
-
-  The task will only work on win2K until other platforms support
-  csc.exe or an equivalent. CSC.exe must be on the execute path too. &lt;p&gt;
-
-  All parameters are optional: &amp;lt;csc/&amp;gt; should suffice to produce a debug
-  build of all *.cs files. References to external files do require explicit
-  enumeration, so are one of the first attributes to consider adding. &lt;p&gt;
-
-  The task is a directory based task, so attributes like &lt;b&gt;includes="*.cs"
-  &lt;/b&gt; and &lt;b&gt;excludes="broken.cs"&lt;/b&gt; can be used to control the files pulled
-  in. By default, all *.cs files from the project folder down are included in
-  the command. When this happens the output file -if not specified- is taken
-  as the first file in the list, which may be somewhat hard to control.
-  Specifying the output file with &lt;b&gt;'outfile'&lt;/b&gt; seems prudent. &lt;p&gt;
-
-  &lt;p&gt;
-
-  TODO
-  &lt;ol&gt;
-    &lt;li&gt; is incremental build still broken in beta-1?
-    &lt;li&gt; is Win32Icon broken?
-    &lt;li&gt; all the missing options
-  &lt;/ol&gt;
-  &lt;p&gt;
-
-  History
-  &lt;Table&gt;
-
-    &lt;tr&gt;
-
-      &lt;td&gt;
-        0.3
-      &lt;/td&gt;
-
-      &lt;td&gt;
-        Beta 1 edition
-      &lt;/td&gt;
-
-      &lt;td&gt;
-        To avoid having to remember which assemblies to include, the task
-        automatically refers to the main dotnet libraries in Beta1.
-      &lt;/tr&gt;
-
-      &lt;tr&gt;
-
-        &lt;td&gt;
-          0.2
-        &lt;/td&gt;
-
-        &lt;td&gt;
-          Slightly different
-        &lt;/td&gt;
-
-        &lt;td&gt;
-          Split command execution to a separate class;
-        &lt;/tr&gt;
-
-        &lt;tr&gt;
-
-          &lt;td&gt;
-            0.1
-          &lt;/td&gt;
-
-          &lt;td&gt;
-            "I can't believe it's so rudimentary"
-          &lt;/td&gt;
-
-          &lt;td&gt;
-            First pass; minimal builds only support;
-          &lt;/tr&gt;
-
-        &lt;/table&gt;
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="additionalmodules" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Semicolon separated list of modules to refer to.</short-description>
-        
-          <description>
-          Semicolon separated list of modules to refer to.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="debug" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          <short-description>Debug flag on or off.</short-description>
-        
-          <description>
-          set the debug flag on or off.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="definitions" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Semicolon separated list of defined constants.</short-description>
-        
-          <description>
-          Semicolon separated list of defined constants.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="destdir" type="java.io.File" briefType="File" required="NOTDEFINED">
-        
-          <short-description>Destination directory of files to be compiled.</short-description>
-        
-          <description>
-          Set the destination directory of files to be compiled.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="destfile" type="java.io.File" briefType="File" required="NOTDEFINED">
-        
-          <short-description>Name of exe/library to create.</short-description>
-        
-          <description>
-          Set the name of exe/library to create.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="docfile" type="java.io.File" briefType="File" required="NOTDEFINED">
-        
-          <short-description>File for generated XML documentation.</short-description>
-        
-          <description>
-          file for generated XML documentation
-        </description>
-      
-        </attribute>
-      
-        <attribute name="extraoptions" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Any extra options which are not explicitly supported
- by this task.</short-description>
-        
-          <description>
-          Any extra options which are not explicitly supported
- by this task.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="failonerror" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          <short-description>If true, fail on compilation errors.</short-description>
-        
-          <description>
-          If true, fail on compilation errors.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="filealign" type="int" briefType="int" required="NOTDEFINED">
-        
-          <short-description>File alignment.</short-description>
-        
-          <description>
-          Set the file alignment.
- Valid values are 0,512, 1024, 2048, 4096, 8192,
- and 16384, 0 means 'leave to the compiler'
-        </description>
-      
-        </attribute>
-      
-        <attribute name="fullpaths" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          <short-description>If true, print the full path of files on errors.</short-description>
-        
-          <description>
-          If true, print the full path of files on errors.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="includedefaultreferences" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          <short-description>If true, automatically includes the common assemblies
- in dotnet, and tells the compiler to link in mscore.dll.
-
-  set the automatic reference inclusion flag on or off this flag controls
-  the string of references and the /nostdlib option in CSC.</short-description>
-        
-          <description>
-          If true, automatically includes the common assemblies
- in dotnet, and tells the compiler to link in mscore.dll.
-
-  set the automatic reference inclusion flag on or off this flag controls
-  the string of references and the /nostdlib option in CSC
-        </description>
-      
-        </attribute>
-      
-        <attribute name="incremental" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          <short-description>Incremental compilation flag on or off.</short-description>
-        
-          <description>
-          set the incremental compilation flag on or off.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="mainclass" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Name of main class for executables.</short-description>
-        
-          <description>
-          Sets the name of main class for executables.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="noconfig" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          <short-description>A flag that tells the compiler not to read in the compiler 
- settings files 'csc.rsp' in its bin directory and then the local directory.</short-description>
-        
-          <description>
-          A flag that tells the compiler not to read in the compiler 
- settings files 'csc.rsp' in its bin directory and then the local directory
-        </description>
-      
-        </attribute>
-      
-        <attribute name="optimize" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          <short-description>If true, enables optimization flag.</short-description>
-        
-          <description>
-          If true, enables optimization flag.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="outputfile" type="java.io.File" briefType="File" required="NOTDEFINED">
-        
-          <short-description>Output file.</short-description>
-        
-          <description>
-          Set the output file
-        </description>
-      
-        </attribute>
-      
-        <attribute name="referencefiles" type="org.apache.tools.ant.types.Path" briefType="Path" required="NOTDEFINED">
-        
-          <short-description>Path of references to include.</short-description>
-        
-          <description>
-          Path of references to include.
- Wildcards should work.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="references" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Semicolon separated list of DLLs to refer to.</short-description>
-        
-          <description>
-          Semicolon separated list of DLLs to refer to.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="srcdir" type="java.io.File" briefType="File" required="NOTDEFINED">
-        
-          <short-description>Source directory of the files to be compiled.</short-description>
-        
-          <description>
-          Set the source directory of the files to be compiled.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="targettype" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Type of target.</short-description>
-        
-          <description>
-          Set the type of target.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="unsafe" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          <short-description>If true, enables the unsafe keyword.</short-description>
-        
-          <description>
-          If true, enables the unsafe keyword.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="utf8output" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          <short-description>If true, require all compiler output to be in UTF8 format.</short-description>
-        
-          <description>
-          If true, require all compiler output to be in UTF8 format.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="warnlevel" type="int" briefType="int" required="NOTDEFINED">
-        
-          <short-description>Level of warning currently between 1 and 4
- with 4 being the strictest.</short-description>
-        
-          <description>
-          Level of warning currently between 1 and 4
- with 4 being the strictest.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="win32icon" type="java.io.File" briefType="File" required="NOTDEFINED">
-        
-          <short-description>Filename of icon to include.</short-description>
-        
-          <description>
-          Set the filename of icon to include.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="win32res" type="java.io.File" briefType="File" required="NOTDEFINED">
-        
-          <short-description>Filename of a win32 resource (.RES) file to include.</short-description>
-        
-          <description>
-          Sets the filename of a win32 resource (.RES) file to include.
- This is not a .NET resource, but what Windows is used to.
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-    </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="cvs" category="scm" classname="org.apache.tools.ant.taskdefs.Cvs">
-
-  
-    <short-description>Performs operations on a CVS repository. original 1.20 NOTE: This implementation has been moved to AbstractCvsTask with the addition of some accessors for extensibility.</short-description>
-  
-    <description>
-    Performs operations on a CVS repository.
-
- original 1.20
-
-  NOTE: This implementation has been moved to AbstractCvsTask with
-  the addition of some accessors for extensibility.
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="append" type="boolean" briefType="boolean" required="no, default to &quot;false&quot;.">
-        
-          <short-description>Whether to append output/error when redirecting to a file.</short-description>
-        
-          <description>
-          Whether to append output/error when redirecting to a file.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="command" type="java.lang.String" briefType="String" required="no, default &quot;checkout&quot;.">
-        
-          <short-description>The CVS command to execute.</short-description>
-        
-          <description>
-          The CVS command to execute.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="compression" type="boolean" briefType="boolean" required="no. defaults to false.">
-        
-          <short-description>If true, this is the same as compressionlevel="3".</short-description>
-        
-          <description>
-          If true, this is the same as compressionlevel="3".
-        </description>
-      
-        </attribute>
-      
-        <attribute name="compressionlevel" type="int" briefType="int" required="no. defaults to no compression.">
-        
-          <short-description>If set to a value 1-9 it adds -zN to the cvs command line, else
- it disables compression.</short-description>
-        
-          <description>
-          If set to a value 1-9 it adds -zN to the cvs command line, else
- it disables compression.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="cvsroot" type="java.lang.String" briefType="String" required="no">
-        
-          <short-description>The CVSROOT variable.</short-description>
-        
-          <description>
-          The CVSROOT variable.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="cvsrsh" type="java.lang.String" briefType="String" required="no">
-        
-          <short-description>The CVS_RSH variable.</short-description>
-        
-          <description>
-          The CVS_RSH variable.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="date" type="java.lang.String" briefType="String" required="no">
-        
-          <short-description>Use the most recent revision no later than the given date.</short-description>
-        
-          <description>
-          Use the most recent revision no later than the given date.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="dest" type="java.io.File" briefType="File" required="no, default is project&apos;s basedir.">
-        
-          <short-description>The directory where the checked out files should be placed.</short-description>
-        
-          <description>
-          The directory where the checked out files should be placed.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="error" type="java.io.File" briefType="File" required="no, default error to ant log as msg_warn.">
-        
-          <short-description>The file to direct standard error from the command.</short-description>
-        
-          <description>
-          The file to direct standard error from the command.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="failonerror" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>Stop the build process if the command exits with
- a return code other than 0.</short-description>
-        
-          <description>
-          Stop the build process if the command exits with
- a return code other than 0.
- Defaults to false.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="noexec" type="boolean" briefType="boolean" required="no, default to &quot;false&quot;">
-        
-          <short-description>If true, report only and don't change any files.</short-description>
-        
-          <description>
-          If true, report only and don't change any files.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="output" type="java.io.File" briefType="File" required="no, default output to ant log as msg_info.">
-        
-          <short-description>The file to direct standard output from the command.</short-description>
-        
-          <description>
-          The file to direct standard output from the command.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="package" type="java.lang.String" briefType="String" required="no">
-        
-          <short-description>The package/module to operate upon.</short-description>
-        
-          <description>
-          The package/module to operate upon.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="passfile" type="java.io.File" briefType="File" required="no, default file ~/.cvspass.">
-        
-          <short-description>Password file to read passwords from.</short-description>
-        
-          <description>
-          Password file to read passwords from.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="port" type="int" briefType="int" required="no, default port 2401.">
-        
-          <short-description>Port used by CVS to communicate with the server.</short-description>
-        
-          <description>
-          Port used by CVS to communicate with the server.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="quiet" type="boolean" briefType="boolean" required="no, default &quot;false&quot;">
-        
-          <short-description>If true, suppress informational messages.</short-description>
-        
-          <description>
-          If true, suppress informational messages.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="tag" type="java.lang.String" briefType="String" required="no">
-        
-          <short-description>The tag of the package/module to operate upon.</short-description>
-        
-          <description>
-          The tag of the package/module to operate upon.
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-      
-        <element name="commandline" type="org.apache.tools.ant.types.Commandline" briefType="" required="NOTDEFINED">
-        
-          <short-description>Adds direct command-line to execute.</short-description>
-        
-          <description>
-          Adds direct command-line to execute.
-        </description>
-      
-        </element>
-
-    
-      </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="cvschangelog" category="other" classname="org.apache.tools.ant.taskdefs.cvslib.ChangeLogTask">
-
-  
-    <short-description>Examines the output of cvs log and group related changes together.</short-description>
-  
-    <description>
-    Examines the output of cvs log and group related changes together.
-
- It produces an XML output representing the list of changes.
- &lt;PRE&gt;
- &lt;FONT color=#0000ff&gt;&amp;lt;!-- Root element --&amp;gt;&lt;/FONT&gt;
- &lt;FONT color=#6a5acd&gt;&amp;lt;!ELEMENT&lt;/FONT&gt; changelog &lt;FONT color=#ff00ff&gt;(entry&lt;/FONT&gt;&lt;FONT color=#ff00ff&gt;+&lt;/FONT&gt;&lt;FONT color=#ff00ff&gt;)&lt;/FONT&gt;&lt;FONT color=#6a5acd&gt;&amp;gt;&lt;/FONT&gt;
- &lt;FONT color=#0000ff&gt;&amp;lt;!-- CVS Entry --&amp;gt;&lt;/FONT&gt;
- &lt;FONT color=#6a5acd&gt;&amp;lt;!ELEMENT&lt;/FONT&gt; entry &lt;FONT color=#ff00ff&gt;(date,author,file&lt;/FONT&gt;&lt;FONT color=#ff00ff&gt;+&lt;/FONT&gt;&lt;FONT color=#ff00ff&gt;,msg)&lt;/FONT&gt;&lt;FONT color=#6a5acd&gt;&amp;gt;&lt;/FONT&gt;
- &lt;FONT color=#0000ff&gt;&amp;lt;!-- Date of cvs entry --&amp;gt;&lt;/FONT&gt;
- &lt;FONT color=#6a5acd&gt;&amp;lt;!ELEMENT&lt;/FONT&gt; date &lt;FONT color=#ff00ff&gt;(#PCDATA)&lt;/FONT&gt;&lt;FONT color=#6a5acd&gt;&amp;gt;&lt;/FONT&gt;
- &lt;FONT color=#0000ff&gt;&amp;lt;!-- Author of change --&amp;gt;&lt;/FONT&gt;
- &lt;FONT color=#6a5acd&gt;&amp;lt;!ELEMENT&lt;/FONT&gt; author &lt;FONT color=#ff00ff&gt;(#PCDATA)&lt;/FONT&gt;&lt;FONT color=#6a5acd&gt;&amp;gt;&lt;/FONT&gt;
- &lt;FONT color=#0000ff&gt;&amp;lt;!-- List of files affected --&amp;gt;&lt;/FONT&gt;
- &lt;FONT color=#6a5acd&gt;&amp;lt;!ELEMENT&lt;/FONT&gt; msg &lt;FONT color=#ff00ff&gt;(#PCDATA)&lt;/FONT&gt;&lt;FONT color=#6a5acd&gt;&amp;gt;&lt;/FONT&gt;
- &lt;FONT color=#0000ff&gt;&amp;lt;!-- File changed --&amp;gt;&lt;/FONT&gt;
- &lt;FONT color=#6a5acd&gt;&amp;lt;!ELEMENT&lt;/FONT&gt; file &lt;FONT color=#ff00ff&gt;(name,revision,prevrevision&lt;/FONT&gt;&lt;FONT color=#ff00ff&gt;?&lt;/FONT&gt;&lt;FONT color=#ff00ff&gt;)&lt;/FONT&gt;&lt;FONT color=#6a5acd&gt;&amp;gt;&lt;/FONT&gt;
- &lt;FONT color=#0000ff&gt;&amp;lt;!-- Name of the file --&amp;gt;&lt;/FONT&gt;
- &lt;FONT color=#6a5acd&gt;&amp;lt;!ELEMENT&lt;/FONT&gt; name &lt;FONT color=#ff00ff&gt;(#PCDATA)&lt;/FONT&gt;&lt;FONT color=#6a5acd&gt;&amp;gt;&lt;/FONT&gt;
- &lt;FONT color=#0000ff&gt;&amp;lt;!-- Revision number --&amp;gt;&lt;/FONT&gt;
- &lt;FONT color=#6a5acd&gt;&amp;lt;!ELEMENT&lt;/FONT&gt; revision &lt;FONT color=#ff00ff&gt;(#PCDATA)&lt;/FONT&gt;&lt;FONT color=#6a5acd&gt;&amp;gt;&lt;/FONT&gt;
- &lt;FONT color=#0000ff&gt;&amp;lt;!-- Previous revision number --&amp;gt;&lt;/FONT&gt;
- &lt;FONT color=#6a5acd&gt;&amp;lt;!ELEMENT&lt;/FONT&gt; prevrevision &lt;FONT color=#ff00ff&gt;(#PCDATA)&lt;/FONT&gt;&lt;FONT color=#6a5acd&gt;&amp;gt;&lt;/FONT&gt;
- &lt;/PRE&gt;
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="daysinpast" type="int" briefType="int" required="NOTDEFINED">
-        
-          <short-description>Number of days worth of log entries to process.</short-description>
-        
-          <description>
-          Set the number of days worth of log entries to process.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="destfile" type="java.io.File" briefType="File" required="NOTDEFINED">
-        
-          <short-description>Output file for the log.</short-description>
-        
-          <description>
-          Set the output file for the log.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="dir" type="java.io.File" briefType="File" required="NOTDEFINED">
-        
-          <short-description>Base dir for cvs.</short-description>
-        
-          <description>
-          Set the base dir for cvs.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="end" type="java.util.Date" briefType="Date" required="NOTDEFINED">
-        
-          <short-description>Date at which the changelog should stop.</short-description>
-        
-          <description>
-          Set the date at which the changelog should stop.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="start" type="java.util.Date" briefType="Date" required="NOTDEFINED">
-        
-          <short-description>Date at which the changelog should start.</short-description>
-        
-          <description>
-          Set the date at which the changelog should start.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="usersfile" type="java.io.File" briefType="File" required="NOTDEFINED">
-        
-          <short-description>Lookup list of user names &amp; addresses.</short-description>
-        
-          <description>
-          Set a lookup list of user names &amp; addresses
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-      
-        <element name="fileset" type="org.apache.tools.ant.types.FileSet" briefType="Fileset" required="NOTDEFINED">
-        
-          <short-description>Adds a set of files about which cvs logs will be generated.</short-description>
-        
-          <description>
-          Adds a set of files about which cvs logs will be generated.
-        </description>
-      
-        </element>
-
-      
-        <element name="user" type="org.apache.tools.ant.taskdefs.cvslib.CvsUser" briefType="" required="NOTDEFINED">
-        
-          <short-description>Add a user to list changelog knows about.</short-description>
-        
-          <description>
-          Add a user to list changelog knows about.
-        </description>
-      
-        </element>
-
-    
-      </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="cvspass" category="scm" classname="org.apache.tools.ant.taskdefs.CVSPass">
-
-  
-    <short-description>Adds an new entry to a CVS password file.</short-description>
-  
-    <description>
-    Adds an new entry to a CVS password file.
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="cvsroot" type="java.lang.String" briefType="String" required="yes">
-        
-          <short-description>The CVS repository to add an entry for.</short-description>
-        
-          <description>
-          The CVS repository to add an entry for.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="passfile" type="java.io.File" briefType="File" required="no, default is ~/.cvspass.">
-        
-          <short-description>Password file to add the entry to.</short-description>
-        
-          <description>
-          Password file to add the entry to.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="password" type="java.lang.String" briefType="String" required="yes">
-        
-          <short-description>Password to be added to the password file.</short-description>
-        
-          <description>
-          Password to be added to the password file.
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-    </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="cvstagdiff" category="other" classname="org.apache.tools.ant.taskdefs.cvslib.CvsTagDiff">
-
-  
-    <short-description>Examines the output of cvs rdiff between two tags.</short-description>
-  
-    <description>
-    Examines the output of cvs rdiff between two tags.
-
- It produces an XML output representing the list of changes.
- &lt;PRE&gt;
- &amp;lt;!-- Root element --&amp;gt;
- &amp;lt;!ELEMENT tagdiff ( entry+ ) &amp;gt;
- &amp;lt;!-- Start tag of the report --&amp;gt;
- &amp;lt;!ATTLIST tagdiff startTag NMTOKEN #IMPLIED &amp;gt;
- &amp;lt;!-- End tag of the report --&amp;gt;
- &amp;lt;!ATTLIST tagdiff endTag NMTOKEN #IMPLIED &amp;gt;
- &amp;lt;!-- Start date of the report --&amp;gt;
- &amp;lt;!ATTLIST tagdiff startDate NMTOKEN #IMPLIED &amp;gt;
- &amp;lt;!-- End date of the report --&amp;gt;
- &amp;lt;!ATTLIST tagdiff endDate NMTOKEN #IMPLIED &amp;gt;
-
- &amp;lt;!-- CVS tag entry --&amp;gt;
- &amp;lt;!ELEMENT entry ( file ) &amp;gt;
- &amp;lt;!-- File added, changed or removed --&amp;gt;
- &amp;lt;!ELEMENT file ( name, revision?, prevrevision? ) &amp;gt;
- &amp;lt;!-- Name of the file --&amp;gt;
- &amp;lt;!ELEMENT name ( #PCDATA ) &amp;gt;
- &amp;lt;!-- Revision number --&amp;gt;
- &amp;lt;!ELEMENT revision ( #PCDATA ) &amp;gt;
- &amp;lt;!-- Previous revision number --&amp;gt;
- &amp;lt;!ELEMENT prevrevision ( #PCDATA ) &amp;gt;
- &lt;/PRE&gt;
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="compression" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          <short-description>If true, this is the same as compressionlevel="3".</short-description>
-        
-          <description>
-          If true, this is the same as compressionlevel="3".
-        </description>
-      
-        </attribute>
-      
-        <attribute name="compressionlevel" type="int" briefType="int" required="NOTDEFINED">
-        
-          <short-description>If set to a value 1-9 it adds -zN to the cvs command line, else
- it disables compression.</short-description>
-        
-          <description>
-          If set to a value 1-9 it adds -zN to the cvs command line, else
- it disables compression.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="cvsroot" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>The CVSROOT variable.</short-description>
-        
-          <description>
-          The CVSROOT variable.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="cvsrsh" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>The CVS_RSH variable.</short-description>
-        
-          <description>
-          The CVS_RSH variable.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="destfile" type="java.io.File" briefType="File" required="yes">
-        
-          <short-description>Output file for the diff.</short-description>
-        
-          <description>
-          Set the output file for the diff.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="enddate" type="java.lang.String" briefType="String" required="">
-        
-          <short-description>End date.</short-description>
-        
-          <description>
-          Set the end date.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="endtag" type="java.lang.String" briefType="String" required="exactly one of the two.">
-        
-          <short-description>End tag.</short-description>
-        
-          <description>
-          Set the end tag.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="failonerror" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          <short-description>Stop the build process if the command exits with
- a return code other than 0.</short-description>
-        
-          <description>
-          Stop the build process if the command exits with
- a return code other than 0.
- Defaults to false.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="package" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>The package/module to analyze.</short-description>
-        
-          <description>
-          The package/module to analyze.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="passfile" type="java.io.File" briefType="File" required="NOTDEFINED">
-        
-          <short-description>Password file to read passwords from.</short-description>
-        
-          <description>
-          Password file to read passwords from.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="port" type="int" briefType="int" required="NOTDEFINED">
-        
-          <short-description>Port used by CVS to communicate with the server.</short-description>
-        
-          <description>
-          Port used by CVS to communicate with the server.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="quiet" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          <short-description>If true, suppress informational messages.</short-description>
-        
-          <description>
-          If true, suppress informational messages.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="startdate" type="java.lang.String" briefType="String" required="">
-        
-          <short-description>Start date.</short-description>
-        
-          <description>
-          Set the start date.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="starttag" type="java.lang.String" briefType="String" required="exactly one of the two.">
-        
-          <short-description>Start tag.</short-description>
-        
-          <description>
-          Set the start tag.
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-    </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="ddcreator" category="other" classname="org.apache.tools.ant.taskdefs.optional.ejb.DDCreator" matchingTask="true">
-
-  
-    <short-description>Builds a serialized deployment descriptor given a text file description of the descriptor in the format supported by WebLogic.</short-description>
-  
-    <description>
-    Builds a serialized deployment descriptor given a text file description of the
- descriptor in the format supported by WebLogic.
-
- This ant task is a front end for the weblogic DDCreator tool.
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="classpath" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Classpath to be used for this compilation.</short-description>
-        
-          <description>
-          Set the classpath to be used for this compilation.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="descriptors" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Directory from where the text descriptions of the deployment descriptors are
- to be read.</short-description>
-        
-          <description>
-          Set the directory from where the text descriptions of the deployment descriptors are
- to be read.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="dest" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Directory into which the serialized deployment descriptors are to
- be written.</short-description>
-        
-          <description>
-          Set the directory into which the serialized deployment descriptors are to
- be written.
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-    </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="delete" category="filesystem" classname="org.apache.tools.ant.taskdefs.Delete" matchingTask="true">
-
-  
-    <short-description>Deletes a file or directory, or set of files defined by a fileset.</short-description>
-  
-    <description>
-    Deletes a file or directory, or set of files defined by a fileset.
- The original delete task would delete a file, or a set of files 
- using the include/exclude syntax.  The deltree task would delete a 
- directory tree.  This task combines the functionality of these two
- originally distinct tasks.
- &lt;p&gt;Currently Delete extends MatchingTask.  This is intend &lt;i&gt;only&lt;/i&gt;
- to provide backwards compatibility for a release.  The future position
- is to use nested filesets exclusively.&lt;/p&gt;
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="defaultexcludes" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>Sets whether default exclusions should be used or not.</short-description>
-        
-          <description>
-          Sets whether default exclusions should be used or not.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="dir" type="java.io.File" briefType="File" required="">
-        
-          <short-description>Directory from which files are to be deleted.</short-description>
-        
-          <description>
-          Set the directory from which files are to be deleted
-        </description>
-      
-        </attribute>
-      
-        <attribute name="excludes" type="java.lang.String" briefType="String" required="no">
-        
-          <short-description>Set of exclude patterns.</short-description>
-        
-          <description>
-          Sets the set of exclude patterns. Patterns may be separated by a comma
- or a space.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="excludesfile" type="java.io.File" briefType="File" required="no">
-        
-          <short-description>Name of the file containing the includes patterns.</short-description>
-        
-          <description>
-          Sets the name of the file containing the includes patterns.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="failonerror" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>If false, note errors but continue.</short-description>
-        
-          <description>
-          If false, note errors but continue.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="file" type="java.io.File" briefType="File" required="at least one of the two,       unless a &lt;fileset&gt; is specified.">
-        
-          <short-description>Name of a single file to be removed.</short-description>
-        
-          <description>
-          Set the name of a single file to be removed.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="includeemptydirs" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>If true, delete empty directories.</short-description>
-        
-          <description>
-          If true, delete empty directories.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="includes" type="java.lang.String" briefType="String" required="no">
-        
-          <short-description>Set of include patterns.</short-description>
-        
-          <description>
-          Sets the set of include patterns. Patterns may be separated by a comma
- or a space.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="includesfile" type="java.io.File" briefType="File" required="no">
-        
-          <short-description>Name of the file containing the includes patterns.</short-description>
-        
-          <description>
-          Sets the name of the file containing the includes patterns.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="quiet" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>If true and the file does not exist, do not display a diagnostic
- message or modify the exit status to reflect an error.</short-description>
-        
-          <description>
-          If true and the file does not exist, do not display a diagnostic
- message or modify the exit status to reflect an error.
- This means that if a file or directory cannot be deleted,
- then no error is reported. This setting emulates the
- -f option to the Unix &amp;quot;rm&amp;quot; command.
- Default is false meaning things are &amp;quot;noisy&amp;quot;
-        </description>
-      
-        </attribute>
-      
-        <attribute name="verbose" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>If true, list all names of deleted files.</short-description>
-        
-          <description>
-          If true, list all names of deleted files.
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-      
-        <element name="fileset" type="org.apache.tools.ant.types.FileSet" briefType="Fileset" required="NOTDEFINED">
-        
-          <short-description>Adds a set of files to be deleted.</short-description>
-        
-          <description>
-          Adds a set of files to be deleted.
-        </description>
-      
-        </element>
-
-      
-        <element name="exclude" type="org.apache.tools.ant.types.PatternSet.NameEntry" briefType="" required="NOTDEFINED">
-        
-          <short-description>Add a name entry on the exclude list.</short-description>
-        
-          <description>
-          add a name entry on the exclude list
-        </description>
-      
-        </element>
-
-      
-        <element name="excludesfile" type="org.apache.tools.ant.types.PatternSet.NameEntry" briefType="" required="NOTDEFINED">
-        
-          <short-description>Add a name entry on the include files list.</short-description>
-        
-          <description>
-          add a name entry on the include files list
-        </description>
-      
-        </element>
-
-      
-        <element name="include" type="org.apache.tools.ant.types.PatternSet.NameEntry" briefType="" required="NOTDEFINED">
-        
-          <short-description>Add a name entry on the include list.</short-description>
-        
-          <description>
-          add a name entry on the include list
-        </description>
-      
-        </element>
-
-      
-        <element name="includesfile" type="org.apache.tools.ant.types.PatternSet.NameEntry" briefType="" required="NOTDEFINED">
-        
-          <short-description>Add a name entry on the include files list.</short-description>
-        
-          <description>
-          add a name entry on the include files list
-        </description>
-      
-        </element>
-
-      
-        <element name="patternset" type="org.apache.tools.ant.types.PatternSet" briefType="Patternset" required="NOTDEFINED">
-        
-          <short-description>Add a set of patterns.</short-description>
-        
-          <description>
-          add a set of patterns
-        </description>
-      
-        </element>
-
-    
-      </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="deltree" category="other" classname="org.apache.tools.ant.taskdefs.Deltree" deprecated="true">
-
-  
-    <short-description>No Description.</short-description>
-  
-    <description>
-    
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="dir" type="java.io.File" briefType="File" required="yes">
-        
-          <short-description>Directory to be deleted.</short-description>
-        
-          <description>
-          Set the directory to be deleted
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-    </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="depend" category="other" classname="org.apache.tools.ant.taskdefs.optional.depend.Depend" matchingTask="true">
-
-  
-    <short-description>Generates a dependency file for a given set of classes.</short-description>
-  
-    <description>
-    Generates a dependency file for a given set of classes.
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="cache" type="java.io.File" briefType="File" required="no">
-        
-          <short-description>Dependency cache file.</short-description>
-        
-          <description>
-          Sets the dependency cache file.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="classpath" type="org.apache.tools.ant.types.Path" briefType="Path" required="no">
-        
-          <short-description>Classpath to be used for this dependency check.</short-description>
-        
-          <description>
-          Set the classpath to be used for this dependency check.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="classpathref" type="org.apache.tools.ant.types.Reference" briefType="Reference" required="NOTDEFINED">
-        
-          <short-description>Adds a reference to a classpath defined elsewhere.</short-description>
-        
-          <description>
-          Adds a reference to a classpath defined elsewhere.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="closure" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>If true, transitive dependencies are followed until the
- closure of the dependency set if reached.</short-description>
-        
-          <description>
-          If true, transitive dependencies are followed until the
- closure of the dependency set if reached.
- When not set, the depend task will only follow
- direct dependencies between classes.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="destdir" type="org.apache.tools.ant.types.Path" briefType="Path" required="no">
-        
-          <short-description>Destination directory where the compiled Java files exist.</short-description>
-        
-          <description>
-          Set the destination directory where the compiled Java files exist.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="dump" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>If true, the dependency information will be written
- to the debug level log.</short-description>
-        
-          <description>
-          If true, the dependency information will be written
- to the debug level log.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="srcdir" type="org.apache.tools.ant.types.Path" briefType="Path" required="yes">
-        
-          <short-description>Directories path to find the Java source files.</short-description>
-        
-          <description>
-          Set the directories path to find the Java source files.
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-      
-        <element name="classpath" type="org.apache.tools.ant.types.Path" briefType="Path" required="NOTDEFINED">
-        
-          <short-description>Adds a classpath to be used for this dependency check.</short-description>
-        
-          <description>
-          Adds a classpath to be used for this dependency check.
-        </description>
-      
-        </element>
-
-    
-      </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="dependset" category="filesystem" classname="org.apache.tools.ant.taskdefs.DependSet" matchingTask="true">
-
-  
-    <short-description>Examines and removes out of date target files.</short-description>
-  
-    <description>
-    Examines and removes out of date target files.  If any of the target files
- are out of date with respect to any of the source files, all target
- files are removed.  This is useful where dependencies cannot be
- computed (for example, dynamically interpreted parameters or files
- that need to stay in synch but are not directly linked) or where
- the ant task in question could compute them but does not (for
- example, the linked DTD for an XML file using the style task).
-
- nested arguments:
- &lt;ul&gt;
- &lt;li&gt;srcfileset     (fileset describing the source files to examine)
- &lt;li&gt;srcfilelist    (filelist describing the source files to examine)
- &lt;li&gt;targetfileset  (fileset describing the target files to examine)
- &lt;li&gt;targetfilelist (filelist describing the target files to examine)
- &lt;/ul&gt;
- At least one instance of either a fileset or filelist for both source and 
- target are required.
- &lt;p&gt;
- This task will examine each of the source files against each of the target 
- files. If any target files are out of date with respect to any of the source 
- files, all targets are removed. If any files named in a (src or target) 
- filelist do not exist, all targets are removed.
- Hint: If missing files should be ignored, specify them as include patterns 
- in filesets, rather than using filelists.
- &lt;/p&gt;&lt;p&gt;
- This task attempts to optimize speed of dependency checking.  It will stop 
- after the first out of date file is found and remove all targets, rather 
- than exhaustively checking every source vs target combination unnecessarily.
- &lt;/p&gt;&lt;p&gt;
- Example uses: 
- &lt;ul&gt;&lt;li&gt;
- Record the fact that an XML file must be up to date
- with respect to its XSD (Schema file), even though the XML file
- itself includes no reference to its XSD.
- &lt;/li&gt;&lt;li&gt;
- Record the fact that an XSL stylesheet includes other
- sub-stylesheets
- &lt;/li&gt;&lt;li&gt;
- Record the fact that java files must be recompiled if the ant build
- file changes
- &lt;/li&gt;&lt;/ul&gt;
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-    </attributes>
-
-    
-      <elements>
-      
-        <element name="srcfilelist" type="org.apache.tools.ant.types.FileList" briefType="Filelist" required="NOTDEFINED">
-        
-          <short-description>Add a list of source files.</short-description>
-        
-          <description>
-          Add a list of source files.
-        </description>
-      
-        </element>
-
-      
-        <element name="srcfileset" type="org.apache.tools.ant.types.FileSet" briefType="Fileset" required="NOTDEFINED">
-        
-          <short-description>Add a set of source files.</short-description>
-        
-          <description>
-          Add a set of source files.
-        </description>
-      
-        </element>
-
-      
-        <element name="targetfilelist" type="org.apache.tools.ant.types.FileList" briefType="Filelist" required="NOTDEFINED">
-        
-          <short-description>Add a list of target files.</short-description>
-        
-          <description>
-          Add a list of target files.
-        </description>
-      
-        </element>
-
-      
-        <element name="targetfileset" type="org.apache.tools.ant.types.FileSet" briefType="Fileset" required="NOTDEFINED">
-        
-          <short-description>Add a set of target files.</short-description>
-        
-          <description>
-          Add a set of target files.
-        </description>
-      
-        </element>
-
-    
-      </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="dirname" category="property" classname="org.apache.tools.ant.taskdefs.Dirname">
-
-  
-    <short-description>Determines the directory name of the specified file.</short-description>
-  
-    <description>
-    Determines the directory name of the specified file.
-
- This task can accept the following attributes:
- &lt;ul&gt;
- &lt;li&gt;file
- &lt;li&gt;property
- &lt;/ul&gt;
- Both &lt;b&gt;file&lt;/b&gt; and &lt;b&gt;property&lt;/b&gt; are required.
- &lt;p&gt;
- When this task executes, it will set the specified property to the
- value of the specified file up to, but not including, the last path
- element. If file is a file, the directory will be the current
- directory.
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="file" type="java.io.File" briefType="File" required="yes">
-        
-          <short-description>Path to take the dirname of.</short-description>
-        
-          <description>
-          Path to take the dirname of.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="property" type="java.lang.String" briefType="String" required="yes">
-        
-          <short-description>The name of the property to set.</short-description>
-        
-          <description>
-          The name of the property to set.
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-    </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="ear" category="packaging" classname="org.apache.tools.ant.taskdefs.Ear" matchingTask="true">
-
-  
-    <short-description>Creates a EAR archive.</short-description>
-  
-    <description>
-    Creates a EAR archive. Based on WAR task
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="appxml" type="java.io.File" briefType="File" required="yes, unless update is set to true">
-        
-          <short-description>File to incorporate as application.xml.</short-description>
-        
-          <description>
-          File to incorporate as application.xml.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="basedir" type="java.io.File" briefType="File" required="no">
-        
-          <short-description>Directory from which to archive files; optional.</short-description>
-        
-          <description>
-          Directory from which to archive files; optional.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="compress" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>Whether we want to compress the files or only store them;
- optional, default=true;.</short-description>
-        
-          <description>
-          Whether we want to compress the files or only store them;
- optional, default=true;
-        </description>
-      
-        </attribute>
-      
-        <attribute name="destfile" type="java.io.File" briefType="File" required="yes">
-        
-          <short-description>The file to create; required.</short-description>
-        
-          <description>
-          The file to create; required.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="duplicate" type="org.apache.tools.ant.taskdefs.Zip.Duplicate" briefType="&quot;add&quot;, &quot;preserve&quot;, &quot;fail&quot;" required="no">
-        
-          <short-description>Sets behavior for when a duplicate file is about to be added -
- one of &lt;code&gt;keep&lt;/code&gt;, &lt;code&gt;skip&lt;/code&gt; or &lt;code&gt;overwrite&lt;/code&gt;.</short-description>
-        
-          <description>
-          Sets behavior for when a duplicate file is about to be added -
- one of &lt;code&gt;keep&lt;/code&gt;, &lt;code&gt;skip&lt;/code&gt; or &lt;code&gt;overwrite&lt;/code&gt;.
- Possible values are: &lt;code&gt;keep&lt;/code&gt; (keep both
- of the files); &lt;code&gt;skip&lt;/code&gt; (keep the first version
- of the file found); &lt;code&gt;overwrite&lt;/code&gt; overwrite the file
- with the new file
- Default for zip tasks is &lt;code&gt;keep&lt;/code&gt;
-        </description>
-      
-        </attribute>
-      
-        <attribute name="encoding" type="java.lang.String" briefType="String" required="no">
-        
-          <short-description>Encoding to use for filenames, defaults to the platform's
- default encoding.</short-description>
-        
-          <description>
-          Encoding to use for filenames, defaults to the platform's
- default encoding.
-
- &lt;p&gt;For a list of possible values see &lt;a
- href="http://java.sun.com/products/jdk/1.2/docs/guide/internat/encoding.doc.html"&gt;http://java.sun.com/products/jdk/1.2/docs/guide/internat/encoding.doc.html&lt;/a&gt;.&lt;/p&gt;
-        </description>
-      
-        </attribute>
-      
-        <attribute name="filesonly" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>If true, emulate Sun's jar utility by not adding parent directories;
- optional, defaults to false.</short-description>
-        
-          <description>
-          If true, emulate Sun's jar utility by not adding parent directories;
- optional, defaults to false.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="index" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          <short-description>Set whether or not to create an index list for classes.</short-description>
-        
-          <description>
-          Set whether or not to create an index list for classes.
- This may speed up classloading in some cases.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="manifest" type="java.io.File" briefType="File" required="no">
-        
-          <short-description>The manifest file to use.</short-description>
-        
-          <description>
-          The manifest file to use. This can be either the location of a manifest,
- or the name of a jar added through a fileset. If its the name of an added
- jar, the task expects the manifest to be in the jar at META-INF/MANIFEST.MF.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="update" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>If true, updates an existing file, otherwise overwrite
- any existing one; optional defaults to false.</short-description>
-        
-          <description>
-          If true, updates an existing file, otherwise overwrite
- any existing one; optional defaults to false.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="whenempty" type="org.apache.tools.ant.taskdefs.Zip.WhenEmpty" briefType="&quot;fail&quot;, &quot;skip&quot;, &quot;create&quot;" required="NOTDEFINED">
-        
-          <short-description>Sets behavior of the task when no files match.</short-description>
-        
-          <description>
-          Sets behavior of the task when no files match.
- Possible values are: &lt;code&gt;fail&lt;/code&gt; (throw an exception
- and halt the build); &lt;code&gt;skip&lt;/code&gt; (do not create
- any archive, but issue a warning); &lt;code&gt;create&lt;/code&gt;
- (make an archive with no entries).
- Default for zip tasks is &lt;code&gt;skip&lt;/code&gt;;
- for jar tasks, &lt;code&gt;create&lt;/code&gt;.
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-      
-        <element name="archives" type="org.apache.tools.ant.types.ZipFileSet" briefType="ZipFileset" required="NOTDEFINED">
-        
-          <short-description>Adds zipfileset.</short-description>
-        
-          <description>
-          Adds zipfileset.
-        </description>
-      
-        </element>
-
-      
-        <element name="manifest" type="org.apache.tools.ant.taskdefs.Manifest" briefType="" required="NOTDEFINED">
-        
-          <short-description>Allows the manifest for the archive file to be provided inline
- in the buildfile rather than in an external file.</short-description>
-        
-          <description>
-          Allows the manifest for the archive file to be provided inline
- in the buildfile rather than in an external file.
-        </description>
-      
-        </element>
-
-      
-        <element name="fileset" type="org.apache.tools.ant.types.FileSet" briefType="Fileset" required="NOTDEFINED">
-        
-          <short-description>Adds a set of files.</short-description>
-        
-          <description>
-          Adds a set of files.
-        </description>
-      
-        </element>
-
-      
-        <element name="metainf" type="org.apache.tools.ant.types.ZipFileSet" briefType="ZipFileset" required="NOTDEFINED">
-        
-          <short-description>Adds a zipfileset to include in the META-INF directory.</short-description>
-        
-          <description>
-          Adds a zipfileset to include in the META-INF directory.
-        </description>
-      
-        </element>
-
-      
-        <element name="zipgroupfileset" type="org.apache.tools.ant.types.FileSet" briefType="Fileset" required="NOTDEFINED">
-        
-          <short-description>Adds a group of zip files.</short-description>
-        
-          <description>
-          Adds a group of zip files.
-        </description>
-      
-        </element>
-
-      
-        <element name="zipfileset" type="org.apache.tools.ant.types.ZipFileSet" briefType="ZipFileset" required="NOTDEFINED">
-        
-          <short-description>Adds a set of files that can be
- read from an archive and be given a prefix/fullpath.</short-description>
-        
-          <description>
-          Adds a set of files that can be
- read from an archive and be given a prefix/fullpath.
-        </description>
-      
-        </element>
-
-    
-      </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="echo" category="utility" classname="org.apache.tools.ant.taskdefs.Echo">
-
-  
-    <short-description>Writes a message to the Ant logging facilities.</short-description>
-  
-    <description>
-    Writes a message to the Ant logging facilities.
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="append" type="boolean" briefType="boolean" required="no - default is false.">
-        
-          <short-description>If true, append to existing file.</short-description>
-        
-          <description>
-          If true, append to existing file.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="file" type="java.io.File" briefType="File" required="no">
-        
-          <short-description>File to write to.</short-description>
-        
-          <description>
-          File to write to.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="level" type="org.apache.tools.ant.taskdefs.Echo.EchoLevel" briefType="&quot;error&quot;, &quot;warning&quot;, &quot;info&quot;, &quot;verbose&quot;, &quot;debug&quot;" required="no - default is &quot;warning&quot;.">
-        
-          <short-description>Logging level.</short-description>
-        
-          <description>
-          Set the logging level. Level should be one of
- &lt;ul&gt;
-  &lt;li&gt;error&lt;/li&gt;
-  &lt;li&gt;warning&lt;/li&gt;
-  &lt;li&gt;info&lt;/li&gt;
-  &lt;li&gt;verbose&lt;/li&gt;
-  &lt;li&gt;debug&lt;/li&gt;
- &lt;/ul&gt;
- &lt;p&gt;The default is &amp;quot;warning&amp;quot; to ensure that messages are
- displayed by default when using the -quiet command line option.&lt;/p&gt;
-        </description>
-      
-        </attribute>
-      
-        <attribute name="message" type="java.lang.String" briefType="String" required="yes, unless data is included in a        character section within this element.">
-        
-          <short-description>Message to write.</short-description>
-        
-          <description>
-          Message to write.
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-    </elements>
-
-      
-      <body>
-        
-        <description>
-          Set a multiline message.
-        </description>
-      
-      </body>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="echoproperties" category="other" classname="org.apache.tools.ant.taskdefs.optional.EchoProperties">
-
-  
-    <short-description>Displays all the current properties in the build.</short-description>
-  
-    <description>
-    Displays all the current properties in the build. The output can be sent to
-  a file if desired. &lt;P&gt;
-
-  Attribute "destfile" defines a file to send the properties to. This can be
-  processed as a standard property file later. &lt;P&gt;
-
-  Attribute "prefix" defines a prefix which is used to filter the properties
-  only those properties starting with this prefix will be echoed. &lt;P&gt;
-
-  By default, the "failonerror" attribute is enabled. If an error occurs while
-  writing the properties to a file, and this attribute is enabled, then a
-  BuildException will be thrown. If disabled, then IO errors will be reported
-  as a log statement, but no error will be thrown. &lt;P&gt;
-
-  Examples: &lt;pre&gt;
-  &amp;lt;echoproperties  /&amp;gt;
- &lt;/pre&gt; Report the current properties to the log. &lt;P&gt;
-
-  &lt;pre&gt;
-  &amp;lt;echoproperties destfile="my.properties" /&amp;gt;
- &lt;/pre&gt; Report the current properties to the file "my.properties", and will
-  fail the build if the file could not be created or written to. &lt;P&gt;
-
-  &lt;pre&gt;
-  &amp;lt;echoproperties destfile="my.properties" failonerror="false"
-      prefix="ant" /&amp;gt;
- &lt;/pre&gt; Report all properties beginning with 'ant' to the file
-  "my.properties", and will log a message if the file could not be created or
-  written to, but will still allow the build to continue.
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="destfile" type="java.io.File" briefType="File" required="no">
-        
-          <short-description>File to store the property output.</short-description>
-        
-          <description>
-          Set a file to store the property output.  If this is never specified,
-  then the output will be sent to the Ant log.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="failonerror" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>If true, the task will fail if an error occurs writing the properties
- file, otherwise errors are just logged.</short-description>
-        
-          <description>
-          If true, the task will fail if an error occurs writing the properties
- file, otherwise errors are just logged.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="prefix" type="java.lang.String" briefType="String" required="no">
-        
-          <short-description>If the prefix is set, then only properties which start with this
-  prefix string will be recorded.</short-description>
-        
-          <description>
-          If the prefix is set, then only properties which start with this
-  prefix string will be recorded.  If this is never set, or it is set
-  to an empty string or &lt;tt&gt;null&lt;/tt&gt;, then all properties will be
-  recorded. &lt;P&gt;
-
-  For example, if the property is set as:
-    &lt;PRE&gt;&amp;lt;echoproperties  prefix="ant." /&amp;gt;&lt;/PRE&gt;
-  then the property "ant.home" will be recorded, but "ant-example"
-  will not.
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-    </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="ejbc" category="other" classname="org.apache.tools.ant.taskdefs.optional.ejb.Ejbc" matchingTask="true">
-
-  
-    <short-description>Builds EJB support classes using WebLogic's ejbc tool from a directory containing a set of deployment descriptors.</short-description>
-  
-    <description>
-    Builds EJB support classes using WebLogic's ejbc tool from a directory containing
- a set of deployment descriptors.
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="classpath" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Classpath to be used for this compilation.</short-description>
-        
-          <description>
-          Set the classpath to be used for this compilation.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="descriptors" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Directory from where the serialized deployment descriptors are
- to be read.</short-description>
-        
-          <description>
-          Set the directory from where the serialized deployment descriptors are
- to be read.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="dest" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Directory into which the support classes, RMI stubs, etc are to be written.</short-description>
-        
-          <description>
-          Set the directory into which the support classes, RMI stubs, etc are to be written.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="keepgenerated" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>If true, ejbc will keep the
- intermediate Java files used to build the class files.</short-description>
-        
-          <description>
-          If true, ejbc will keep the
- intermediate Java files used to build the class files.
- This can be useful when debugging.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="manifest" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Name of the generated manifest file.</short-description>
-        
-          <description>
-          Set the name of the generated manifest file.
-
- For each EJB that is processed an entry is created in this file. This can then be used
- to create a jar file for dploying the beans.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="src" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Directory containing the source code for the home interface, remote interface
- and public key class definitions.</short-description>
-        
-          <description>
-          Set the directory containing the source code for the home interface, remote interface
- and public key class definitions.
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-    </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="ejbjar" category="other" classname="org.apache.tools.ant.taskdefs.optional.ejb.EjbJar" matchingTask="true">
-
-  
-    <short-description>Provides automated EJB JAR file creation.</short-description>
-  
-    <description>
-    Provides automated EJB JAR file creation.
- &lt;p&gt;
- Extends the
- MatchingTask class provided in the default ant distribution to provide a
- directory scanning EJB jarfile generator.
- &lt;/p&gt;
-
- &lt;p&gt;
- The task works by taking the deployment descriptors one at a time and
- parsing them to locate the names of the classes which should be placed in
- the jar. The classnames are translated to java.io.Files by replacing
- periods with File.separatorChar and resolving the generated filename as a
- relative path under the srcDir attribute. All necessary files are then
- assembled into a jarfile. One jarfile is constructed for each deployment
- descriptor found.
- &lt;/p&gt;
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="basejarname" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Base name of the EJB JAR that is to be created if it is not
- to be determined from the name of the deployment descriptor files.</short-description>
-        
-          <description>
-          Set the base name of the EJB JAR that is to be created if it is not
- to be determined from the name of the deployment descriptor files.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="basenameterminator" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>The string which terminates the bean name.</short-description>
-        
-          <description>
-          The string which terminates the bean name.
- The convention used by this task is
- that bean descriptors are named as the BeanName with some suffix. The
- baseNameTerminator string separates the bean name and the suffix and
- is used to determine the bean name.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="classpath" type="org.apache.tools.ant.types.Path" briefType="Path" required="NOTDEFINED">
-        
-          <short-description>Classpath to use when resolving classes for inclusion in the jar.</short-description>
-        
-          <description>
-          Set the classpath to use when resolving classes for inclusion in the jar.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="dependency" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Analyzer to use when adding in dependencies to the JAR.</short-description>
-        
-          <description>
-          Set the analyzer to use when adding in dependencies to the JAR.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="descriptordir" type="java.io.File" briefType="File" required="NOTDEFINED">
-        
-          <short-description>Descriptor directory.</short-description>
-        
-          <description>
-          Set the descriptor directory. The descriptor directory contains the
- EJB deployment descriptors. These are XML files that declare the
- properties of a bean in a particular deployment scenario. Such
- properties include, for example, the transactional nature of the bean
- and the security access control to the bean's methods.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="destdir" type="java.io.File" briefType="File" required="NOTDEFINED">
-        
-          <short-description>Destination directory.</short-description>
-        
-          <description>
-          Set the destination directory. The EJB jar files will be written into
- this directory. The jar files that exist in this directory are also
- used when determining if the contents of the jar file have changed.
- Note that this parameter is only used if no deployment tools are
- specified. Typically each deployment tool will specify its own
- destination directory.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="flatdestdir" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          <short-description>Controls whether the
- destination JARs are written out in the destination directory with
- the same hierarchical structure from which the deployment descriptors
- have been read.</short-description>
-        
-          <description>
-          Controls whether the
- destination JARs are written out in the destination directory with
- the same hierarchical structure from which the deployment descriptors
- have been read. If this is set to true the generated EJB jars are
- written into the root of the destination directory, otherwise they
- are written out in the same relative position as the deployment
- descriptors in the descriptor directory.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="genericjarsuffix" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Suffix for the generated jar file.</short-description>
-        
-          <description>
-          Set the suffix for the generated jar file. When generic jars are
- generated, they have a suffix which is appended to the the bean name
- to create the name of the jar file. Note that this suffix includes
- the extension fo te jar file and should therefore end with an
- appropriate extension such as .jar or .ear
-        </description>
-      
-        </attribute>
-      
-        <attribute name="manifest" type="java.io.File" briefType="File" required="NOTDEFINED">
-        
-          <short-description>Manifest file to use when jarring.</short-description>
-        
-          <description>
-          Set the Manifest file to use when jarring. As of EJB 1.1, manifest
- files are no longer used to configure the EJB. However, they still
- have a vital importance if the EJB is intended to be packaged in an
- EAR file. By adding "Class-Path" settings to a Manifest file, the EJB
- can look for classes inside the EAR file itself, allowing for easier
- deployment. This is outlined in the J2EE specification, and all J2EE
- components are meant to support it.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="naming" type="org.apache.tools.ant.taskdefs.optional.ejb.EjbJar.NamingScheme" briefType="&quot;ejb-name&quot;, &quot;directory&quot;, &quot;descriptor&quot;, &quot;basejarname&quot;" required="NOTDEFINED">
-        
-          <short-description>Naming scheme used to determine the name of the generated jars
- from the deployment descriptor.</short-description>
-        
-          <description>
-          Set the naming scheme used to determine the name of the generated jars
- from the deployment descriptor
-        </description>
-      
-        </attribute>
-      
-        <attribute name="srcdir" type="java.io.File" briefType="File" required="NOTDEFINED">
-        
-          <short-description>Source directory, which is the directory that
- contains the classes that will be added to the EJB jar.</short-description>
-        
-          <description>
-          Sets the source directory, which is the directory that
- contains the classes that will be added to the EJB jar. Typically
- this will include the home and remote interfaces and the bean class.
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-      
-        <element name="borland" type="org.apache.tools.ant.taskdefs.optional.ejb.BorlandDeploymentTool" briefType="" required="NOTDEFINED">
-        
-          <short-description>Adds a deployment tool for Borland server.</short-description>
-        
-          <description>
-          Adds a deployment tool for Borland server.
-        </description>
-      
-        </element>
-
-      
-        <element name="classpath" type="org.apache.tools.ant.types.Path" briefType="Path" required="NOTDEFINED">
-        
-          <short-description>Adds to the classpath used to locate the super classes and
- interfaces of the classes that will make up the EJB JAR.</short-description>
-        
-          <description>
-          Adds to the classpath used to locate the super classes and
- interfaces of the classes that will make up the EJB JAR.
-        </description>
-      
-        </element>
-
-      
-        <element name="dtd" type="org.apache.tools.ant.taskdefs.optional.ejb.EjbJar.DTDLocation" briefType="" required="NOTDEFINED">
-        
-          <short-description>Create a DTD location record.</short-description>
-        
-          <description>
-          Create a DTD location record. This stores the location of a DTD. The
- DTD is identified by its public Id. The location may either be a file
- location or a resource location.
-        </description>
-      
-        </element>
-
-      
-        <element name="iplanet" type="org.apache.tools.ant.taskdefs.optional.ejb.IPlanetDeploymentTool" briefType="" required="NOTDEFINED">
-        
-          <short-description>Adds a deployment tool for iPlanet Application Server.</short-description>
-        
-          <description>
-          Adds a deployment tool for iPlanet Application Server.
-        </description>
-      
-        </element>
-
-      
-        <element name="jboss" type="org.apache.tools.ant.taskdefs.optional.ejb.JbossDeploymentTool" briefType="" required="NOTDEFINED">
-        
-          <short-description>Adds a deployment tool for JBoss server.</short-description>
-        
-          <description>
-          Adds a deployment tool for JBoss server.
-        </description>
-      
-        </element>
-
-      
-        <element name="jonas" type="org.apache.tools.ant.taskdefs.optional.ejb.JonasDeploymentTool" briefType="" required="NOTDEFINED">
-        
-          <short-description>Adds a deployment tool for JOnAS server.</short-description>
-        
-          <description>
-          Adds a deployment tool for JOnAS server.
-        </description>
-      
-        </element>
-
-      
-        <element name="support" type="org.apache.tools.ant.types.FileSet" briefType="Fileset" required="NOTDEFINED">
-        
-          <short-description>Adds a fileset for support elements.</short-description>
-        
-          <description>
-          Adds a fileset for support elements.
-        </description>
-      
-        </element>
-
-      
-        <element name="weblogic" type="org.apache.tools.ant.taskdefs.optional.ejb.WeblogicDeploymentTool" briefType="" required="NOTDEFINED">
-        
-          <short-description>Adds a deployment tool for Weblogic server.</short-description>
-        
-          <description>
-          Adds a deployment tool for Weblogic server.
-        </description>
-      
-        </element>
-
-      
-        <element name="weblogictoplink" type="org.apache.tools.ant.taskdefs.optional.ejb.WeblogicTOPLinkDeploymentTool" briefType="" required="NOTDEFINED">
-        
-          <short-description>Adds a deployment tool for Weblogic when using the Toplink
- Object-Relational mapping.</short-description>
-        
-          <description>
-          Adds a deployment tool for Weblogic when using the Toplink
- Object-Relational mapping.
-        </description>
-      
-        </element>
-
-      
-        <element name="websphere" type="org.apache.tools.ant.taskdefs.optional.ejb.WebsphereDeploymentTool" briefType="" required="NOTDEFINED">
-        
-          <short-description>Adds a deployment tool for Websphere 4.0 server.</short-description>
-        
-          <description>
-          Adds a deployment tool for Websphere 4.0 server.
-        </description>
-      
-        </element>
-
-    
-      </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="exec" category="control" classname="org.apache.tools.ant.taskdefs.ExecTask">
-
-  
-    <short-description>Executes a given command if the os platform is appropriate.</short-description>
-  
-    <description>
-    Executes a given command if the os platform is appropriate.
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="append" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>Whether output should be appended to or overwrite an existing file.</short-description>
-        
-          <description>
-          Whether output should be appended to or overwrite an existing file.
- Defaults to false.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="dir" type="java.io.File" briefType="File" required="no">
-        
-          <short-description>The working directory of the process.</short-description>
-        
-          <description>
-          The working directory of the process.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="executable" type="java.lang.String" briefType="String" required="">
-        
-          <short-description>The command to execute.</short-description>
-        
-          <description>
-          The command to execute.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="failifexecutionfails" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>Stop the build if program cannot be started.</short-description>
-        
-          <description>
-          Stop the build if program cannot be started. Defaults to true.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="failonerror" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>Fail if the command exits with a non-zero return code.</short-description>
-        
-          <description>
-          Fail if the command exits with a non-zero return code.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="newenvironment" type="boolean" briefType="boolean" required="no, default is false">
-        
-          <short-description>Do not propagate old environment when new environment variables are specified.</short-description>
-        
-          <description>
-          Do not propagate old environment when new environment variables are specified.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="os" type="java.lang.String" briefType="String" required="no">
-        
-          <short-description>List of operating systems on which the command may be executed.</short-description>
-        
-          <description>
-          List of operating systems on which the command may be executed.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="output" type="java.io.File" briefType="File" required="no">
-        
-          <short-description>File the output of the process is redirected to.</short-description>
-        
-          <description>
-          File the output of the process is redirected to.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="outputproperty" type="java.lang.String" briefType="String" required="no">
-        
-          <short-description>Property name whose value should be set to the output of
- the process.</short-description>
-        
-          <description>
-          Property name whose value should be set to the output of
- the process.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="resultproperty" type="java.lang.String" briefType="String" required="no">
-        
-          <short-description>The name of a property in which the return code of the
- command should be stored.</short-description>
-        
-          <description>
-          The name of a property in which the return code of the
- command should be stored. Only of interest if failonerror=false.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="vmlauncher" type="boolean" briefType="boolean" required="no, default is true">
-        
-          <short-description>If true, launch new process with VM, otherwise use the OS's shell.</short-description>
-        
-          <description>
-          If true, launch new process with VM, otherwise use the OS's shell.
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-      
-        <element name="env" type="org.apache.tools.ant.types.Environment.Variable" briefType="" required="NOTDEFINED">
-        
-          <short-description>Add an environment variable to the launched process.</short-description>
-        
-          <description>
-          Add an environment variable to the launched process.
-        </description>
-      
-        </element>
-
-      
-        <element name="arg" type="org.apache.tools.ant.types.Commandline.Argument" briefType="" required="NOTDEFINED">
-        
-          <short-description>Adds a command-line argument.</short-description>
-        
-          <description>
-          Adds a command-line argument.
-        </description>
-      
-        </element>
-
-    
-      </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="fail" category="control" classname="org.apache.tools.ant.taskdefs.Exit">
-
-  
-    <short-description>Exits the active build, giving an additional message if available.</short-description>
-  
-    <description>
-    Exits the active build, giving an additional message
- if available.
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="if" type="java.lang.String" briefType="String" required="no">
-        
-          <short-description>Only fail if a property of the given name exists in the current project.</short-description>
-        
-          <description>
-          Only fail if a property of the given name exists in the current project.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="message" type="java.lang.String" briefType="String" required="no">
-        
-          <short-description>A message giving further information on why the build exited.</short-description>
-        
-          <description>
-          A message giving further information on why the build exited.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="unless" type="java.lang.String" briefType="String" required="no">
-        
-          <short-description>Only fail if a property of the given name does not
- exist in the current project.</short-description>
-        
-          <description>
-          Only fail if a property of the given name does not
- exist in the current project.
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-    </elements>
-
-      
-      <body>
-        
-        <description>
-          Set a multiline message.
-        </description>
-      
-      </body>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="filter" category="filesystem" classname="org.apache.tools.ant.taskdefs.Filter">
-
-  
-    <short-description>Sets a token filter that is used by the file copy tasks to do token substitution.</short-description>
-  
-    <description>
-    Sets a token filter that is used by the file copy tasks
- to do token substitution. Sets mutiple tokens by
- reading these from a file.
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="filtersfile" type="java.io.File" briefType="File" required="yes*">
-        
-          <short-description>The file from which the filters must be read.</short-description>
-        
-          <description>
-          The file from which the filters must be read.
- This file must be a formatted as a property file.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="token" type="java.lang.String" briefType="String" required="yes*">
-        
-          <short-description>The token string without @ delimiters.</short-description>
-        
-          <description>
-          The token string without @ delimiters.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="value" type="java.lang.String" briefType="String" required="yes*">
-        
-          <short-description>The string that should replace the token during filtered copies.</short-description>
-        
-          <description>
-          The string that should replace the token during filtered copies.
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-    </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="fixcrlf" category="filesystem" classname="org.apache.tools.ant.taskdefs.FixCRLF" matchingTask="true">
-
-  
-    <short-description>Converts text source files to local OS formatting conventions, as well as repair text files damaged by misconfigured or misguided editors or file transfer programs.</short-description>
-  
-    <description>
-    Converts text source files to local OS formatting conventions, as
- well as repair text files damaged by misconfigured or misguided editors or
- file transfer programs.
- &lt;p&gt;
- This task can take the following arguments:
- &lt;ul&gt;
- &lt;li&gt;srcdir
- &lt;li&gt;destdir
- &lt;li&gt;include
- &lt;li&gt;exclude
- &lt;li&gt;cr
- &lt;li&gt;eol
- &lt;li&gt;tab
- &lt;li&gt;eof
- &lt;li&gt;encoding
- &lt;/ul&gt;
- Of these arguments, only &lt;b&gt;sourcedir&lt;/b&gt; is required.
- &lt;p&gt;
- When this task executes, it will scan the srcdir based on the include
- and exclude properties.
- &lt;p&gt;
- This version generalises the handling of EOL characters, and allows
- for CR-only line endings (which I suspect is the standard on Macs.)
- Tab handling has also been generalised to accommodate any tabwidth
- from 2 to 80, inclusive.  Importantly, it will leave untouched any
- literal TAB characters embedded within string or character constants.
- &lt;p&gt;
- &lt;em&gt;Warning:&lt;/em&gt; do not run on binary files.
- &lt;em&gt;Caution:&lt;/em&gt; run with care on carefully formatted files.
- This may sound obvious, but if you don't specify asis, presume that
- your files are going to be modified.  If "tabs" is "add" or "remove",
- whitespace characters may be added or removed as necessary.  Similarly,
- for CR's - in fact "eol"="crlf" or cr="add" can result in cr
- characters being removed in one special case accommodated, i.e.,
- CRCRLF is regarded as a single EOL to handle cases where other
- programs have converted CRLF into CRCRLF.
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="destdir" type="java.io.File" briefType="File" required="no">
-        
-          <short-description>Destination where the fixed files should be placed.</short-description>
-        
-          <description>
-          Set the destination where the fixed files should be placed.
- Default is to replace the original file.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="encoding" type="java.lang.String" briefType="String" required="no - defaults to default jvm encoding">
-        
-          <short-description>Specifies the encoding Ant expects the files to be in -
- defaults to the platforms default encoding.</short-description>
-        
-          <description>
-          Specifies the encoding Ant expects the files to be in -
- defaults to the platforms default encoding.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="eof" type="org.apache.tools.ant.taskdefs.FixCRLF.AddAsisRemove" briefType="&quot;add&quot;, &quot;asis&quot;, &quot;remove&quot;" required="no">
-        
-          <short-description>Specify how DOS EOF (control-z) characters are to be handled.</short-description>
-        
-          <description>
-          Specify how DOS EOF (control-z) characters are to be handled.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="eol" type="org.apache.tools.ant.taskdefs.FixCRLF.CrLf" briefType="&quot;asis&quot;, &quot;cr&quot;, &quot;lf&quot;, &quot;crlf&quot;" required="no">
-        
-          <short-description>Specify how EndOfLine characters are to be handled.</short-description>
-        
-          <description>
-          Specify how EndOfLine characters are to be handled.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="javafiles" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>Set to true if modifying Java source files.</short-description>
-        
-          <description>
-          Set to true if modifying Java source files.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="srcdir" type="java.io.File" briefType="File" required="yes">
-        
-          <short-description>Source dir to find the source text files.</short-description>
-        
-          <description>
-          Set the source dir to find the source text files.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="tab" type="org.apache.tools.ant.taskdefs.FixCRLF.AddAsisRemove" briefType="&quot;add&quot;, &quot;asis&quot;, &quot;remove&quot;" required="no">
-        
-          <short-description>Specify how tab characters are to be handled.</short-description>
-        
-          <description>
-          Specify how tab characters are to be handled.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="tablength" type="int" briefType="int" required="no">
-        
-          <short-description>Specify tab length in characters.</short-description>
-        
-          <description>
-          Specify tab length in characters.
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-    </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="ftp" category="other" classname="org.apache.tools.ant.taskdefs.optional.net.FTP">
-
-  
-    <short-description>Basic FTP client.</short-description>
-  
-    <description>
-    Basic FTP client. Performs the following actions:
- &lt;ul&gt;
-   &lt;li&gt; &lt;strong&gt;send&lt;/strong&gt; - send files to a remote server. This is the
-   default action.&lt;/li&gt;
-   &lt;li&gt; &lt;strong&gt;get&lt;/strong&gt; - retrive files from a remote server.&lt;/li&gt;
-   &lt;li&gt; &lt;strong&gt;del&lt;/strong&gt; - delete files from a remote server.&lt;/li&gt;
-   &lt;li&gt; &lt;strong&gt;list&lt;/strong&gt; - create a file listing.&lt;/li&gt;
-   &lt;li&gt; &lt;strong&gt;chmod&lt;/strong&gt; - change unix file permissions.&lt;/li&gt;
- &lt;/ul&gt;
- &lt;strong&gt;Note:&lt;/strong&gt; Some FTP servers - notably the Solaris server - seem
- to hold data ports open after a "retr" operation, allowing them to timeout
- instead of shutting them down cleanly. This happens in active or passive
- mode, and the ports will remain open even after ending the FTP session. FTP
- "send" operations seem to close ports immediately. This behavior may cause
- problems on some systems when downloading large sets of files.
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="action" type="org.apache.tools.ant.taskdefs.optional.net.FTP.Action" briefType="&quot;send&quot;, &quot;put&quot;, &quot;recv&quot;, &quot;get&quot;, &quot;del&quot;, &quot;delete&quot;, &quot;list&quot;, &quot;mkdir&quot;, &quot;chmod&quot;" required="no">
-        
-          <short-description>FTP action to be taken.</short-description>
-        
-          <description>
-          Sets the FTP action to be taken. Currently accepts "put", "get", "del",
- "mkdir", "chmod" and "list".
-        </description>
-      
-        </attribute>
-      
-        <attribute name="binary" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>If true, uses binary mode, otherwise text mode (default is binary).</short-description>
-        
-          <description>
-          If true, uses binary mode, otherwise text mode (default is binary).
-        </description>
-      
-        </attribute>
-      
-        <attribute name="chmod" type="java.lang.String" briefType="String" required="no">
-        
-          <short-description>File permission mode (Unix only) for files sent to the server.</short-description>
-        
-          <description>
-          Sets the file permission mode (Unix only) for files sent to the server.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="depends" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>Set to true to transmit only files that are new or changed from their
- remote counterparts.</short-description>
-        
-          <description>
-          Set to true to transmit only files that are new or changed from their
- remote counterparts. The default is to transmit all files.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="ignorenoncriticalerrors" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>Flag to skip errors on directory creation.
- (and maybe later other server specific errors).</short-description>
-        
-          <description>
-          set the flag to skip errors on directory creation.
- (and maybe later other server specific errors)
-        </description>
-      
-        </attribute>
-      
-        <attribute name="listing" type="java.io.File" briefType="File" required="no">
-        
-          <short-description>The output file for the "list" action.</short-description>
-        
-          <description>
-          The output file for the "list" action. This attribute is ignored for
- any other actions.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="newer" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>A synonym for &lt;tt&gt;depends&lt;/tt&gt;.</short-description>
-        
-          <description>
-          A synonym for &lt;tt&gt;depends&lt;/tt&gt;. Set to true to transmit only new or changed
- files.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="passive" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>Specifies whether to use passive mode.</short-description>
-        
-          <description>
-          Specifies whether to use passive mode. Set to true if you are behind a
- firewall and cannot connect without it. Passive mode is disabled by
- default.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="password" type="java.lang.String" briefType="String" required="yes">
-        
-          <short-description>Login password for the given user id.</short-description>
-        
-          <description>
-          Sets the login password for the given user id.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="port" type="int" briefType="int" required="no">
-        
-          <short-description>FTP port used by the remote server.</short-description>
-        
-          <description>
-          Sets the FTP port used by the remote server.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="remotedir" type="java.lang.String" briefType="String" required="no">
-        
-          <short-description>Remote directory where files will be placed.</short-description>
-        
-          <description>
-          Sets the remote directory where files will be placed. This may be a
- relative or absolute path, and must be in the path syntax expected by
- the remote server. No correction of path syntax will be performed.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="separator" type="java.lang.String" briefType="String" required="no">
-        
-          <short-description>Remote file separator character.</short-description>
-        
-          <description>
-          Sets the remote file separator character. This normally defaults to the
- Unix standard forward slash, but can be manually overridden using this
- call if the remote server requires some other separator. Only the first
- character of the string is used.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="server" type="java.lang.String" briefType="String" required="yes">
-        
-          <short-description>FTP server to send files to.</short-description>
-        
-          <description>
-          Sets the FTP server to send files to.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="skipfailedtransfers" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>If true, enables unsuccessful file put, delete and get
- operations to be skipped with a warning and the remainder
- of the files still transferred.</short-description>
-        
-          <description>
-          If true, enables unsuccessful file put, delete and get
- operations to be skipped with a warning and the remainder
- of the files still transferred.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="umask" type="java.lang.String" briefType="String" required="no">
-        
-          <short-description>Default mask for file creation on a unix server.</short-description>
-        
-          <description>
-          Sets the default mask for file creation on a unix server.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="userid" type="java.lang.String" briefType="String" required="yes">
-        
-          <short-description>Login user id to use on the specified server.</short-description>
-        
-          <description>
-          Sets the login user id to use on the specified server.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="verbose" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>Set to true to receive notification about each file as it is
- transferred.</short-description>
-        
-          <description>
-          Set to true to receive notification about each file as it is
- transferred.
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-      
-        <element name="fileset" type="org.apache.tools.ant.types.FileSet" briefType="Fileset" required="NOTDEFINED">
-        
-          <short-description>A set of files to upload or download.</short-description>
-        
-          <description>
-          A set of files to upload or download
-        </description>
-      
-        </element>
-
-    
-      </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="genkey" category="java" classname="org.apache.tools.ant.taskdefs.GenerateKey">
-
-  
-    <short-description>Generates a key in a keystore.</short-description>
-  
-    <description>
-    Generates a key in a keystore.
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="alias" type="java.lang.String" briefType="String" required="yes.">
-        
-          <short-description>The alias to add under.</short-description>
-        
-          <description>
-          The alias to add under.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="dname" type="java.lang.String" briefType="String" required="yes if dname element unspecified">
-        
-          <short-description>The distinguished name for entity.</short-description>
-        
-          <description>
-          The distinguished name for entity.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="keyalg" type="java.lang.String" briefType="String" required="no">
-        
-          <short-description>The method to use when generating name-value pair.</short-description>
-        
-          <description>
-          The method to use when generating name-value pair.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="keypass" type="java.lang.String" briefType="String" required="no">
-        
-          <short-description>Password for private key (if different).</short-description>
-        
-          <description>
-          Password for private key (if different).
-        </description>
-      
-        </attribute>
-      
-        <attribute name="keysize" type="java.lang.String" briefType="String" required="no">
-        
-          <short-description>Indicates the size of key generated.</short-description>
-        
-          <description>
-          Indicates the size of key generated.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="keystore" type="java.lang.String" briefType="String" required="no">
-        
-          <short-description>Keystore location.</short-description>
-        
-          <description>
-          Keystore location.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="sigalg" type="java.lang.String" briefType="String" required="no">
-        
-          <short-description>The algorithm to use in signing.</short-description>
-        
-          <description>
-          The algorithm to use in signing.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="storepass" type="java.lang.String" briefType="String" required="yes.">
-        
-          <short-description>Password for keystore integrity.</short-description>
-        
-          <description>
-          Password for keystore integrity.
- Must be at least 6 characters long.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="storetype" type="java.lang.String" briefType="String" required="no">
-        
-          <short-description>Keystore type.</short-description>
-        
-          <description>
-          Keystore type.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="validity" type="java.lang.String" briefType="String" required="no">
-        
-          <short-description>Indicates how many days certificate is valid.</short-description>
-        
-          <description>
-          Indicates how many days certificate is valid.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="verbose" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>If true, verbose output when signing.</short-description>
-        
-          <description>
-          If true, verbose output when signing.
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-      
-        <element name="dname" type="org.apache.tools.ant.taskdefs.GenerateKey.DistinguishedName" briefType="" required="NOTDEFINED">
-        
-          <short-description>Distinguished name list.</short-description>
-        
-          <description>
-          Distinguished name list.
-        </description>
-      
-        </element>
-
-    
-      </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="get" category="network" classname="org.apache.tools.ant.taskdefs.Get">
-
-  
-    <short-description>Gets a particular file from a URL source.</short-description>
-  
-    <description>
-    Gets a particular file from a URL source.
- Options include verbose reporting, timestamp based fetches and controlling
- actions on failures. NB: access through a firewall only works if the whole
- Java runtime is correctly configured.
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="dest" type="java.io.File" briefType="File" required="yes">
-        
-          <short-description>Where to copy the source file.</short-description>
-        
-          <description>
-          Where to copy the source file.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="ignoreerrors" type="boolean" briefType="boolean" required="no; default &quot;false&quot;">
-        
-          <short-description>If true, log errors but do not treat as fatal.</short-description>
-        
-          <description>
-          If true, log errors but do not treat as fatal.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="password" type="java.lang.String" briefType="String" required="if username is set">
-        
-          <short-description>Password for the basic authentication.</short-description>
-        
-          <description>
-          password for the basic authentication.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="src" type="java.net.URL" briefType="URL" required="yes">
-        
-          <short-description>URL to get.</short-description>
-        
-          <description>
-          Set the URL to get.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="usetimestamp" type="boolean" briefType="boolean" required="no; default &quot;false&quot;">
-        
-          <short-description>If true, conditionally download a file based on the timestamp
- of the local copy.</short-description>
-        
-          <description>
-          If true, conditionally download a file based on the timestamp
- of the local copy.
-
- &lt;p&gt;In this situation, the if-modified-since header is set so
- that the file is only fetched if it is newer than the local
- file (or there is no local file) This flag is only valid on
- HTTP connections, it is ignored in other cases.  When the flag
- is set, the local copy of the downloaded file will also have
- its timestamp set to the remote file time.&lt;/p&gt;
-
- &lt;p&gt;Note that remote files of date 1/1/1970 (GMT) are treated as
- 'no timestamp', and web servers often serve files with a
- timestamp in the future by replacing their timestamp with that
- of the current time. Also, inter-computer clock differences can
- cause no end of grief.&lt;/p&gt;
-        </description>
-      
-        </attribute>
-      
-        <attribute name="username" type="java.lang.String" briefType="String" required="if password is set">
-        
-          <short-description>Username for basic auth.</short-description>
-        
-          <description>
-          Username for basic auth.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="verbose" type="boolean" briefType="boolean" required="no; default &quot;false&quot;">
-        
-          <short-description>If true, show verbose progress information.</short-description>
-        
-          <description>
-          If true, show verbose progress information.
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-    </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="gunzip" category="packaging" classname="org.apache.tools.ant.taskdefs.GUnzip">
-
-  
-    <short-description>Expands a file that has been compressed with the GZIP algorithm.</short-description>
-  
-    <description>
-    Expands a file that has been compressed with the GZIP
- algorithm. Normally used to compress non-compressed archives such
- as TAR files.
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="dest" type="java.io.File" briefType="File" required="NOTDEFINED">
-        
-          <short-description>The destination file or directory; optional.</short-description>
-        
-          <description>
-          The destination file or directory; optional.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="src" type="java.io.File" briefType="File" required="NOTDEFINED">
-        
-          <short-description>The file to expand; required.</short-description>
-        
-          <description>
-          The file to expand; required.
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-    </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="gzip" category="packaging" classname="org.apache.tools.ant.taskdefs.GZip">
-
-  
-    <short-description>Compresses a file with the GZIP algorithm.</short-description>
-  
-    <description>
-    Compresses a file with the GZIP algorithm. Normally used to compress
- non-compressed archives such as TAR files.
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="src" type="java.io.File" briefType="File" required="NOTDEFINED">
-        
-          <short-description>The file to compress; required.</short-description>
-        
-          <description>
-          the file to compress; required.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="zipfile" type="java.io.File" briefType="File" required="NOTDEFINED">
-        
-          <short-description>The required destination file.</short-description>
-        
-          <description>
-          the required destination file.
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-    </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="icontract" category="other" classname="org.apache.tools.ant.taskdefs.optional.IContract" matchingTask="true">
-
-  
-    <short-description>Instruments Java classes with iContract DBC preprocessor.</short-description>
-  
-    <description>
-    Instruments Java classes with iContract DBC preprocessor.
- &lt;br/&gt;
- The task can generate a properties file for &lt;a href="http://hjem.sol.no/hellesoy/icontrol.html"&gt;iControl&lt;/a&gt;,
- a graphical user interface that lets you turn on/off assertions. iControl generates a control file that you can refer to
- from this task using the controlfile attribute.
- iContract is at &lt;a href="http://www.reliable-systems.com/tools/"&gt;http://www.reliable-systems.com/tools/&lt;/a&gt;
- &lt;p/&gt;
- Thanks to Rainer Schmitz for enhancements and comments.
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="builddir" type="java.io.File" briefType="File" required="no">
-        
-          <short-description>Build directory for instrumented classes.</short-description>
-        
-          <description>
-          Sets the build directory for instrumented classes.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="classdir" type="java.io.File" briefType="File" required="only if updateicontrol=true">
-        
-          <short-description>Class directory (uninstrumented classes).</short-description>
-        
-          <description>
-          Sets the class directory (uninstrumented classes).
-        </description>
-      
-        </attribute>
-      
-        <attribute name="classpath" type="org.apache.tools.ant.types.Path" briefType="Path" required="NOTDEFINED">
-        
-          <short-description>Classpath to be used for invocation of iContract.</short-description>
-        
-          <description>
-          Sets the classpath to be used for invocation of iContract.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="classpathref" type="org.apache.tools.ant.types.Reference" briefType="Reference" required="NOTDEFINED">
-        
-          <short-description>Adds a reference to a classpath defined elsewhere.</short-description>
-        
-          <description>
-          Adds a reference to a classpath defined elsewhere.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="controlfile" type="java.io.File" briefType="File" required="only if updateicontrol=true">
-        
-          <short-description>Control file to pass to iContract.</short-description>
-        
-          <description>
-          Sets the control file to pass to iContract.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="failthrowable" type="java.lang.String" briefType="String" required="no">
-        
-          <short-description>Throwable (Exception) to be thrown on assertion violation.</short-description>
-        
-          <description>
-          Sets the Throwable (Exception) to be thrown on assertion violation.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="instrumentdir" type="java.io.File" briefType="File" required="yes">
-        
-          <short-description>Instrumentation directory.</short-description>
-        
-          <description>
-          Sets the instrumentation directory.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="invariant" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>Turns on/off invariant instrumentation.</short-description>
-        
-          <description>
-          Turns on/off invariant instrumentation.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="post" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>Turns on/off postcondition instrumentation.</short-description>
-        
-          <description>
-          Turns on/off postcondition instrumentation.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="pre" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>Turns on/off precondition instrumentation.</short-description>
-        
-          <description>
-          Turns on/off precondition instrumentation.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="quiet" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>Tells iContract to be quiet.</short-description>
-        
-          <description>
-          Tells iContract to be quiet.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="repbuilddir" type="java.io.File" briefType="File" required="NOTDEFINED">
-        
-          <short-description>Build directory for instrumented classes.</short-description>
-        
-          <description>
-          Sets the build directory for instrumented classes.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="repositorydir" type="java.io.File" briefType="File" required="yes">
-        
-          <short-description>Build directory for repository classes.</short-description>
-        
-          <description>
-          Sets the build directory for repository classes.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="srcdir" type="java.io.File" briefType="File" required="yes">
-        
-          <short-description>Source directory.</short-description>
-        
-          <description>
-          Sets the source directory.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="targets" type="java.io.File" briefType="File" required="no">
-        
-          <short-description>Name of the file where targets will be written.</short-description>
-        
-          <description>
-          Sets the name of the file where targets will be written. That is the
- file that tells iContract what files to process.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="updateicontrol" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>If true, updates iControl properties file.</short-description>
-        
-          <description>
-          If true, updates iControl properties file
-        </description>
-      
-        </attribute>
-      
-        <attribute name="verbosity" type="java.lang.String" briefType="String" required="no">
-        
-          <short-description>Verbosity level of iContract.</short-description>
-        
-          <description>
-          Sets the verbosity level of iContract. Any combination of
- error*,warning*,note*,info*,progress*,debug* (comma separated) can be
- used. Defaults to error*,warning*
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-      
-        <element name="classpath" type="org.apache.tools.ant.types.Path" briefType="Path" required="NOTDEFINED">
-        
-          <short-description>Classpath.</short-description>
-        
-          <description>
-          Sets the classpath.
-        </description>
-      
-        </element>
-
-    
-      </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="ilasm" category="other" classname="org.apache.tools.ant.taskdefs.optional.dotnet.Ilasm" matchingTask="true">
-
-  
-    <short-description>Assembles .NET Intermediate Language files.</short-description>
-  
-    <description>
-    Assembles .NET Intermediate Language files. The task will only work
-  on win2K until other platforms support csc.exe or an equivalent. ilasm.exe
-  must be on the execute path too. &lt;p&gt;
-
-  &lt;p&gt;
-
-  All parameters are optional: &amp;lt;il/&amp;gt; should suffice to produce a debug
-  build of all *.il files. The option set is roughly compatible with the
-  CSharp class; even though the command line options are only vaguely
-  equivalent. [The low level commands take things like /OUT=file, csc wants
-  /out:file ... /verbose is used some places; /quiet here in ildasm... etc.]
-  It would be nice if someone made all the command line tools consistent (and
-  not as brittle as the java cmdline tools) &lt;p&gt;
-
-  The task is a directory based task, so attributes like &lt;b&gt;includes="*.il"
-  &lt;/b&gt; and &lt;b&gt;excludes="broken.il"&lt;/b&gt; can be used to control the files pulled
-  in. Each file is built on its own, producing an appropriately named output
-  file unless manually specified with &lt;b&gt;outfile&lt;/b&gt;
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="debug" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          <short-description>Debug flag on or off.</short-description>
-        
-          <description>
-          set the debug flag on or off.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="extraoptions" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Any extra options which are not explicitly
- supported by this task.</short-description>
-        
-          <description>
-          Any extra options which are not explicitly
- supported by this task.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="failonerror" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          <short-description>If true, fails if ilasm tool fails.</short-description>
-        
-          <description>
-          If true, fails if ilasm tool fails.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="keyfile" type="java.io.File" briefType="File" required="NOTDEFINED">
-        
-          <short-description>The name of a file containing a private key.</short-description>
-        
-          <description>
-          the name of a file containing a private key.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="listing" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          <short-description>If true, produce a listing (off by default).</short-description>
-        
-          <description>
-          If true, produce a listing (off by default).
-        </description>
-      
-        </attribute>
-      
-        <attribute name="outputfile" type="java.io.File" briefType="File" required="NOTDEFINED">
-        
-          <short-description>Output file.</short-description>
-        
-          <description>
-          Set the output file.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="resourcefile" type="java.io.File" briefType="File" required="NOTDEFINED">
-        
-          <short-description>Name of resource file to include.</short-description>
-        
-          <description>
-          name of resource file to include.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="srcdir" type="java.io.File" briefType="File" required="NOTDEFINED">
-        
-          <short-description>Source directory containing the files to be compiled.</short-description>
-        
-          <description>
-          Set the source directory containing the files to be compiled.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="targettype" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Type of target, either "exe" or "library".</short-description>
-        
-          <description>
-          Sets the type of target, either "exe" or "library".
-        </description>
-      
-        </attribute>
-      
-        <attribute name="verbose" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          <short-description>If true, enable verbose ILASM output.</short-description>
-        
-          <description>
-          If true, enable verbose ILASM output.
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-    </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="input" category="control" classname="org.apache.tools.ant.taskdefs.Input">
-
-  
-    <short-description>Reads an input line from the console.</short-description>
-  
-    <description>
-    Reads an input line from the console.
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="addproperty" type="java.lang.String" briefType="String" required="no">
-        
-          <short-description>Defines the name of a property to be created from input.</short-description>
-        
-          <description>
-          Defines the name of a property to be created from input. Behaviour is
- according to property task which means that existing properties
- cannot be overriden.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="message" type="java.lang.String" briefType="String" required="no">
-        
-          <short-description>Message which gets displayed to the user during the build run.</short-description>
-        
-          <description>
-          Sets the Message which gets displayed to the user during the build run.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="validargs" type="java.lang.String" briefType="String" required="no">
-        
-          <short-description>Defines valid input parameters as comma separated strings.</short-description>
-        
-          <description>
-          Defines valid input parameters as comma separated strings. If set, input
- task will reject any input not defined as accepted and requires the user
- to reenter it. Validargs are case sensitive. If you want 'a' and 'A' to
- be accepted you need to define both values as accepted arguments.
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-    </elements>
-
-      
-      <body>
-        
-        <description>
-          Set a multiline message.
-        </description>
-      
-      </body>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="iplanet-ejbc" category="ejb" classname="org.apache.tools.ant.taskdefs.optional.ejb.IPlanetEjbcTask">
-
-  
-    <short-description>Compiles EJB stubs and skeletons for the iPlanet Application Server.</short-description>
-  
-    <description>
-    Compiles EJB stubs and skeletons for the iPlanet Application Server.
- The EJBs to be processed are specified by the EJB 1.1 standard XML
- descriptor, and additional attributes are obtained from the iPlanet Application
- Server-specific XML descriptor.  Since the XML descriptors can include
- multiple EJBs, this is a convenient way of specifying many EJBs in a single
- Ant task.  The following attributes are allowed:
-   &lt;ul&gt;
-     &lt;li&gt;&lt;i&gt;ejbdescriptor&lt;/i&gt; -- Standard EJB 1.1 XML descriptor (typically
-                                 titled "ejb-jar.xml").  This attribute is
-                                 required.
-     &lt;li&gt;&lt;i&gt;iasdescriptor&lt;/i&gt; -- EJB XML descriptor for iPlanet Application
-                                 Server (typically titled "ias-ejb-jar.xml).
-                                 This attribute is required.
-     &lt;li&gt;&lt;i&gt;dest&lt;/i&gt; -- The is the base directory where the RMI stubs and
-                        skeletons are written.  In addition, the class files
-                        for each bean (home interface, remote interface, and
-                        EJB implementation) must be found in this directory.
-                        This attribute is required.
-     &lt;li&gt;&lt;i&gt;classpath&lt;/i&gt; -- The classpath used when generating EJB stubs and
-                             skeletons.  This is an optional attribute (if
-                             omitted, the classpath specified when Ant was
-                             started will be used).  Nested "classpath"
-                             elements may also be used.
-     &lt;li&gt;&lt;i&gt;keepgenerated&lt;/i&gt; -- Indicates whether or not the Java source
-                                 files which are generated by ejbc will be
-                                 saved or automatically deleted.  If "yes",
-                                 the source files will be retained.  This is
-                                 an optional attribute (if omitted, it
-                                 defaults to "no").
-     &lt;li&gt;&lt;i&gt;debug&lt;/i&gt; -- Indicates whether or not the ejbc utility should
-                         log additional debugging statements to the standard
-                         output.  If "yes", the additional debugging statements
-                         will be generated (if omitted, it defaults to "no").
-     &lt;li&gt;&lt;i&gt;iashome&lt;/i&gt; -- May be used to specify the "home" directory for
-                           this iPlanet Application Server installation.  This
-                           is used to find the ejbc utility if it isn't
-                           included in the user's system path.  This is an
-                           optional attribute (if specified, it should refer
-                           to the &lt;code&gt;[install-location]/iplanet/ias6/ias
-                           &lt;/code&gt; directory).  If omitted, the ejbc utility
-                           must be on the user's system path.
-   &lt;/ul&gt;
- &lt;p&gt;
- For each EJB specified, this task will locate the three classes that comprise
- the EJB.  If these class files cannot be located in the &lt;code&gt;dest&lt;/code&gt;
- directory, the task will fail.  The task will also attempt to locate the EJB
- stubs and skeletons in this directory.  If found, the timestamps on the
- stubs and skeletons will be checked to ensure they are up to date.  Only if
- these files cannot be found or if they are out of date will ejbc be called
- to generate new stubs and skeletons.
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="classpath" type="org.apache.tools.ant.types.Path" briefType="Path" required="NOTDEFINED">
-        
-          <short-description>Classpath to be used when compiling the EJB stubs and skeletons.</short-description>
-        
-          <description>
-          Sets the classpath to be used when compiling the EJB stubs and skeletons.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="debug" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          <short-description>If true, debugging output will be generated when ejbc is
- executed.</short-description>
-        
-          <description>
-          If true, debugging output will be generated when ejbc is
- executed.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="dest" type="java.io.File" briefType="File" required="NOTDEFINED">
-        
-          <short-description>Destination directory where the EJB source classes must exist
- and where the stubs and skeletons will be written.</short-description>
-        
-          <description>
-          Sets the destination directory where the EJB source classes must exist
- and where the stubs and skeletons will be written.  The destination
- directory must exist before this task is executed.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="ejbdescriptor" type="java.io.File" briefType="File" required="NOTDEFINED">
-        
-          <short-description>Location of the standard XML EJB descriptor.</short-description>
-        
-          <description>
-          Sets the location of the standard XML EJB descriptor.  Typically, this
- file is named "ejb-jar.xml".
-        </description>
-      
-        </attribute>
-      
-        <attribute name="iasdescriptor" type="java.io.File" briefType="File" required="NOTDEFINED">
-        
-          <short-description>Location of the iAS-specific XML EJB descriptor.</short-description>
-        
-          <description>
-          Sets the location of the iAS-specific XML EJB descriptor.  Typically,
- this file is named "ias-ejb-jar.xml".
-        </description>
-      
-        </attribute>
-      
-        <attribute name="iashome" type="java.io.File" briefType="File" required="NOTDEFINED">
-        
-          <short-description>May be used to specify the "home" directory for this iAS installation.</short-description>
-        
-          <description>
-          May be used to specify the "home" directory for this iAS installation.
- The directory specified should typically be
- &lt;code&gt;[install-location]/iplanet/ias6/ias&lt;/code&gt;.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="keepgenerated" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          <short-description>If true, the Java source files which are generated by ejbc will be saved .</short-description>
-        
-          <description>
-          If true, the Java source files which are generated by ejbc will be saved .
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-      
-        <element name="classpath" type="org.apache.tools.ant.types.Path" briefType="Path" required="NOTDEFINED">
-        
-          <short-description>Adds to the classpath used when compiling the EJB stubs and skeletons.</short-description>
-        
-          <description>
-          Adds to the classpath used when compiling the EJB stubs and skeletons.
-        </description>
-      
-        </element>
-
-    
-      </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="jar" category="packaging" classname="org.apache.tools.ant.taskdefs.Jar" matchingTask="true">
-
-  
-    <short-description>Creates a JAR archive.</short-description>
-  
-    <description>
-    Creates a JAR archive.
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="basedir" type="java.io.File" briefType="File" required="no">
-        
-          <short-description>Directory from which to archive files; optional.</short-description>
-        
-          <description>
-          Directory from which to archive files; optional.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="compress" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>Whether we want to compress the files or only store them;
- optional, default=true;.</short-description>
-        
-          <description>
-          Whether we want to compress the files or only store them;
- optional, default=true;
-        </description>
-      
-        </attribute>
-      
-        <attribute name="destfile" type="java.io.File" briefType="File" required="yes">
-        
-          <short-description>The file to create; required.</short-description>
-        
-          <description>
-          The file to create; required.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="duplicate" type="org.apache.tools.ant.taskdefs.Zip.Duplicate" briefType="&quot;add&quot;, &quot;preserve&quot;, &quot;fail&quot;" required="no">
-        
-          <short-description>Sets behavior for when a duplicate file is about to be added -
- one of &lt;code&gt;keep&lt;/code&gt;, &lt;code&gt;skip&lt;/code&gt; or &lt;code&gt;overwrite&lt;/code&gt;.</short-description>
-        
-          <description>
-          Sets behavior for when a duplicate file is about to be added -
- one of &lt;code&gt;keep&lt;/code&gt;, &lt;code&gt;skip&lt;/code&gt; or &lt;code&gt;overwrite&lt;/code&gt;.
- Possible values are: &lt;code&gt;keep&lt;/code&gt; (keep both
- of the files); &lt;code&gt;skip&lt;/code&gt; (keep the first version
- of the file found); &lt;code&gt;overwrite&lt;/code&gt; overwrite the file
- with the new file
- Default for zip tasks is &lt;code&gt;keep&lt;/code&gt;
-        </description>
-      
-        </attribute>
-      
-        <attribute name="encoding" type="java.lang.String" briefType="String" required="no">
-        
-          <short-description>Encoding to use for filenames, defaults to the platform's
- default encoding.</short-description>
-        
-          <description>
-          Encoding to use for filenames, defaults to the platform's
- default encoding.
-
- &lt;p&gt;For a list of possible values see &lt;a
- href="http://java.sun.com/products/jdk/1.2/docs/guide/internat/encoding.doc.html"&gt;http://java.sun.com/products/jdk/1.2/docs/guide/internat/encoding.doc.html&lt;/a&gt;.&lt;/p&gt;
-        </description>
-      
-        </attribute>
-      
-        <attribute name="filesonly" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>If true, emulate Sun's jar utility by not adding parent directories;
- optional, defaults to false.</short-description>
-        
-          <description>
-          If true, emulate Sun's jar utility by not adding parent directories;
- optional, defaults to false.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="index" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>Set whether or not to create an index list for classes.</short-description>
-        
-          <description>
-          Set whether or not to create an index list for classes.
- This may speed up classloading in some cases.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="manifest" type="java.io.File" briefType="File" required="no">
-        
-          <short-description>The manifest file to use.</short-description>
-        
-          <description>
-          The manifest file to use. This can be either the location of a manifest,
- or the name of a jar added through a fileset. If its the name of an added
- jar, the task expects the manifest to be in the jar at META-INF/MANIFEST.MF.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="update" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>If true, updates an existing file, otherwise overwrite
- any existing one; optional defaults to false.</short-description>
-        
-          <description>
-          If true, updates an existing file, otherwise overwrite
- any existing one; optional defaults to false.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="whenempty" type="org.apache.tools.ant.taskdefs.Zip.WhenEmpty" briefType="&quot;fail&quot;, &quot;skip&quot;, &quot;create&quot;" required="no">
-        
-          <short-description>Sets behavior of the task when no files match.</short-description>
-        
-          <description>
-          Sets behavior of the task when no files match.
- Possible values are: &lt;code&gt;fail&lt;/code&gt; (throw an exception
- and halt the build); &lt;code&gt;skip&lt;/code&gt; (do not create
- any archive, but issue a warning); &lt;code&gt;create&lt;/code&gt;
- (make an archive with no entries).
- Default for zip tasks is &lt;code&gt;skip&lt;/code&gt;;
- for jar tasks, &lt;code&gt;create&lt;/code&gt;.
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-      
-        <element name="manifest" type="org.apache.tools.ant.taskdefs.Manifest" briefType="" required="NOTDEFINED">
-        
-          <short-description>Allows the manifest for the archive file to be provided inline
- in the buildfile rather than in an external file.</short-description>
-        
-          <description>
-          Allows the manifest for the archive file to be provided inline
- in the buildfile rather than in an external file.
-        </description>
-      
-        </element>
-
-      
-        <element name="fileset" type="org.apache.tools.ant.types.FileSet" briefType="Fileset" required="NOTDEFINED">
-        
-          <short-description>Adds a set of files.</short-description>
-        
-          <description>
-          Adds a set of files.
-        </description>
-      
-        </element>
-
-      
-        <element name="metainf" type="org.apache.tools.ant.types.ZipFileSet" briefType="ZipFileset" required="NOTDEFINED">
-        
-          <short-description>Adds a zipfileset to include in the META-INF directory.</short-description>
-        
-          <description>
-          Adds a zipfileset to include in the META-INF directory.
-        </description>
-      
-        </element>
-
-      
-        <element name="zipgroupfileset" type="org.apache.tools.ant.types.FileSet" briefType="Fileset" required="NOTDEFINED">
-        
-          <short-description>Adds a group of zip files.</short-description>
-        
-          <description>
-          Adds a group of zip files.
-        </description>
-      
-        </element>
-
-      
-        <element name="zipfileset" type="org.apache.tools.ant.types.ZipFileSet" briefType="ZipFileset" required="NOTDEFINED">
-        
-          <short-description>Adds a set of files that can be
- read from an archive and be given a prefix/fullpath.</short-description>
-        
-          <description>
-          Adds a set of files that can be
- read from an archive and be given a prefix/fullpath.
-        </description>
-      
-        </element>
-
-    
-      </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="jarlib-available" category="other" classname="org.apache.tools.ant.taskdefs.optional.extension.JarLibAvailableTask">
-
-  
-    <short-description>Checks whether an extension is present in a fileset or an extensionSet.</short-description>
-  
-    <description>
-    Checks whether an extension is present in a fileset or an extensionSet.
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="file" type="java.io.File" briefType="File" required="no, one of file, nested      extensionset or nested fileset must be present.">
-        
-          <short-description>The JAR library to check.</short-description>
-        
-          <description>
-          The JAR library to check.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="property" type="java.lang.String" briefType="String" required="yes">
-        
-          <short-description>The name of property to set if extensions are available.</short-description>
-        
-          <description>
-          The name of property to set if extensions are available.
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-      
-        <element name="extension" type="org.apache.tools.ant.taskdefs.optional.extension.ExtensionAdapter" briefType="" required="NOTDEFINED">
-        
-          <short-description>Extension looking for.</short-description>
-        
-          <description>
-          Set the Extension looking for.
-        </description>
-      
-        </element>
-
-      
-        <element name="extensionset" type="org.apache.tools.ant.taskdefs.optional.extension.ExtensionSet" briefType="" required="NOTDEFINED">
-        
-          <short-description>Adds a set of extensions to search in.</short-description>
-        
-          <description>
-          Adds a set of extensions to search in.
-        </description>
-      
-        </element>
-
-    
-      </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="jarlib-display" category="other" classname="org.apache.tools.ant.taskdefs.optional.extension.JarLibDisplayTask">
-
-  
-    <short-description>Displays the "Optional Package" and "Package Specification" information contained within the specified JARs.</short-description>
-  
-    <description>
-    Displays the "Optional Package" and "Package Specification" information
- contained within the specified JARs.
-
- &lt;p&gt;Prior to JDK1.3, an "Optional Package" was known as an Extension.
- The specification for this mechanism is available in the JDK1.3
- documentation in the directory
- $JDK_HOME/docs/guide/extensions/versioning.html. Alternatively it is
- available online at &lt;a href="http://java.sun.com/j2se/1.3/docs/guide/extensions/versioning.html"&gt;
- http://java.sun.com/j2se/1.3/docs/guide/extensions/versioning.html&lt;/a&gt;.&lt;/p&gt;
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="file" type="java.io.File" briefType="File" required="no, but one of file or fileset must be      present.">
-        
-          <short-description>The JAR library to display information for.</short-description>
-        
-          <description>
-          The JAR library to display information for.
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-      
-        <element name="fileset" type="org.apache.tools.ant.types.FileSet" briefType="Fileset" required="NOTDEFINED">
-        
-          <short-description>Adds a set of files about which library data will be displayed.</short-description>
-        
-          <description>
-          Adds a set of files about which library data will be displayed.
-        </description>
-      
-        </element>
-
-    
-      </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="jarlib-manifest" category="other" classname="org.apache.tools.ant.taskdefs.optional.extension.JarLibManifestTask">
-
-  
-    <short-description>Generates a manifest that declares all the dependencies.</short-description>
-  
-    <description>
-    Generates a manifest that declares all the dependencies.
- The dependencies are determined by looking in the
- specified path and searching for Extension / "Optional Package"
- specifications in the manifests of the jars.
-
- &lt;p&gt;Prior to JDK1.3, an "Optional Package" was known as an Extension.
- The specification for this mechanism is available in the JDK1.3
- documentation in the directory
- $JDK_HOME/docs/guide/extensions/versioning.html. Alternatively it is
- available online at &lt;a href="http://java.sun.com/j2se/1.3/docs/guide/extensions/versioning.html"&gt;
- http://java.sun.com/j2se/1.3/docs/guide/extensions/versioning.html&lt;/a&gt;.&lt;/p&gt;
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="destfile" type="java.io.File" briefType="File" required="yes.">
-        
-          <short-description>The location where generated manifest is placed.</short-description>
-        
-          <description>
-          The location where generated manifest is placed.
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-      
-        <element name="attribute" type="org.apache.tools.ant.taskdefs.optional.extension.ExtraAttribute" briefType="" required="NOTDEFINED">
-        
-          <short-description>Adds an attribute that is to be put in main section of manifest.</short-description>
-        
-          <description>
-          Adds an attribute that is to be put in main section of manifest.
-        </description>
-      
-        </element>
-
-      
-        <element name="depends" type="org.apache.tools.ant.taskdefs.optional.extension.ExtensionSet" briefType="" required="NOTDEFINED">
-        
-          <short-description>Adds a set of extensions that this library requires.</short-description>
-        
-          <description>
-          Adds a set of extensions that this library requires.
-        </description>
-      
-        </element>
-
-      
-        <element name="extension" type="org.apache.tools.ant.taskdefs.optional.extension.ExtensionAdapter" briefType="" required="NOTDEFINED">
-        
-          <short-description>Adds an extension that this library implements.</short-description>
-        
-          <description>
-          Adds an extension that this library implements.
-        </description>
-      
-        </element>
-
-      
-        <element name="options" type="org.apache.tools.ant.taskdefs.optional.extension.ExtensionSet" briefType="" required="NOTDEFINED">
-        
-          <short-description>Adds a set of extensions that this library optionally requires.</short-description>
-        
-          <description>
-          Adds a set of extensions that this library optionally requires.
-        </description>
-      
-        </element>
-
-    
-      </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="jarlib-resolve" category="other" classname="org.apache.tools.ant.taskdefs.optional.extension.JarLibResolveTask">
-
-  
-    <short-description>Tries to locate a JAR to satisfy an extension and place location of JAR into property.</short-description>
-  
-    <description>
-    Tries to locate a JAR to satisfy an extension and place
- location of JAR into property.
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="checkextension" type="boolean" briefType="boolean" required="no, defaults to true.">
-        
-          <short-description>If true, libraries returned by nested resolvers should be
- checked to see if they supply extension.</short-description>
-        
-          <description>
-          If true, libraries returned by nested resolvers should be
- checked to see if they supply extension.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="failonerror" type="boolean" briefType="boolean" required="no, defaults to true.">
-        
-          <short-description>If true, failure to locate library should fail build.</short-description>
-        
-          <description>
-          If true, failure to locate library should fail build.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="property" type="java.lang.String" briefType="String" required="yes">
-        
-          <short-description>The name of the property in which the location of
- library is stored.</short-description>
-        
-          <description>
-          The name of the property in which the location of
- library is stored.
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-      
-        <element name="ant" type="org.apache.tools.ant.taskdefs.optional.extension.resolvers.AntResolver" briefType="" required="NOTDEFINED">
-        
-          <short-description>Adds Ant resolver to run an Ant buildfile to generate a library.</short-description>
-        
-          <description>
-          Adds Ant resolver to run an Ant buildfile to generate a library.
-        </description>
-      
-        </element>
-
-      
-        <element name="extension" type="org.apache.tools.ant.taskdefs.optional.extension.ExtensionAdapter" briefType="" required="NOTDEFINED">
-        
-          <short-description>Extension looking for.</short-description>
-        
-          <description>
-          Set the Extension looking for.
-        </description>
-      
-        </element>
-
-      
-        <element name="location" type="org.apache.tools.ant.taskdefs.optional.extension.resolvers.LocationResolver" briefType="" required="NOTDEFINED">
-        
-          <short-description>Adds location resolver to look for a library in a location
- relative to project directory.</short-description>
-        
-          <description>
-          Adds location resolver to look for a library in a location
- relative to project directory.
-        </description>
-      
-        </element>
-
-      
-        <element name="url" type="org.apache.tools.ant.taskdefs.optional.extension.resolvers.URLResolver" briefType="" required="NOTDEFINED">
-        
-          <short-description>Adds a URL resolver to download a library from a URL
- to a local file.</short-description>
-        
-          <description>
-          Adds a URL resolver to download a library from a URL
- to a local file.
-        </description>
-      
-        </element>
-
-    
-      </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="java" category="java" classname="org.apache.tools.ant.taskdefs.Java">
-
-  
-    <short-description>Launcher for Java applications.</short-description>
-  
-    <description>
-    Launcher for Java applications. Allows use of
- the same JVM for the called application thus resulting in much
- faster operation.
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="append" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>If true, append output to existing file.</short-description>
-        
-          <description>
-          If true, append output to existing file.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="classname" type="java.lang.String" briefType="String" required="either jar or classname">
-        
-          <short-description>Java class to execute.</short-description>
-        
-          <description>
-          Sets the Java class to execute.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="classpath" type="org.apache.tools.ant.types.Path" briefType="Path" required="no">
-        
-          <short-description>Classpath to be used when running the Java class.</short-description>
-        
-          <description>
-          Set the classpath to be used when running the Java class
-        </description>
-      
-        </attribute>
-      
-        <attribute name="classpathref" type="org.apache.tools.ant.types.Reference" briefType="Reference" required="no">
-        
-          <short-description>Classpath to use, by reference.</short-description>
-        
-          <description>
-          Classpath to use, by reference.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="dir" type="java.io.File" briefType="File" required="no">
-        
-          <short-description>The working directory of the process.</short-description>
-        
-          <description>
-          The working directory of the process
-        </description>
-      
-        </attribute>
-      
-        <attribute name="failonerror" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>If true, then fail if the command exits with a
- returncode other than 0.</short-description>
-        
-          <description>
-          If true, then fail if the command exits with a
- returncode other than 0
-        </description>
-      
-        </attribute>
-      
-        <attribute name="fork" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>If true, execute in a new VM.</short-description>
-        
-          <description>
-          If true, execute in a new VM.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="jvmversion" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>JVM version.</short-description>
-        
-          <description>
-          Sets the JVM version.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="jar" type="java.io.File" briefType="File" required="either jar or classname">
-        
-          <short-description>The location of the JAR file to execute.</short-description>
-        
-          <description>
-          The location of the JAR file to execute.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="jvm" type="java.lang.String" briefType="String" required="no">
-        
-          <short-description>Command used to start the VM (only if not forking).</short-description>
-        
-          <description>
-          Set the command used to start the VM (only if not forking).
-        </description>
-      
-        </attribute>
-      
-        <attribute name="jvmargs" type="java.lang.String" briefType="String" required="no">
-        
-          <short-description>Command line arguments for the JVM.</short-description>
-        
-          <description>
-          Set the command line arguments for the JVM.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="maxmemory" type="java.lang.String" briefType="String" required="no">
-        
-          <short-description>Corresponds to -mx or -Xmx depending on VM version.</short-description>
-        
-          <description>
-          Corresponds to -mx or -Xmx depending on VM version.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="newenvironment" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>If true, use a completely new environment.</short-description>
-        
-          <description>
-          If true, use a completely new environment.
-
- &lt;p&gt;Will be ignored if we are not forking a new VM.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="output" type="java.io.File" briefType="File" required="no">
-        
-          <short-description>File the output of the process is redirected to.</short-description>
-        
-          <description>
-          File the output of the process is redirected to.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="timeout" type="java.lang.Long" briefType="long" required="no">
-        
-          <short-description>Timeout in milliseconds after which the process will be killed.</short-description>
-        
-          <description>
-          Timeout in milliseconds after which the process will be killed.
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-      
-        <element name="env" type="org.apache.tools.ant.types.Environment.Variable" briefType="" required="NOTDEFINED">
-        
-          <short-description>Adds an environment variable.</short-description>
-        
-          <description>
-          Adds an environment variable.
-
- &lt;p&gt;Will be ignored if we are not forking a new VM.
-        </description>
-      
-        </element>
-
-      
-        <element name="sysproperty" type="org.apache.tools.ant.types.Environment.Variable" briefType="" required="NOTDEFINED">
-        
-          <short-description>Adds a system property.</short-description>
-        
-          <description>
-          Adds a system property.
-        </description>
-      
-        </element>
-
-      
-        <element name="arg" type="org.apache.tools.ant.types.Commandline.Argument" briefType="" required="NOTDEFINED">
-        
-          <short-description>Adds a command-line argument.</short-description>
-        
-          <description>
-          Adds a command-line argument.
-        </description>
-      
-        </element>
-
-      
-        <element name="classpath" type="org.apache.tools.ant.types.Path" briefType="Path" required="NOTDEFINED">
-        
-          <short-description>Adds a path to the classpath.</short-description>
-        
-          <description>
-          Adds a path to the classpath.
-        </description>
-      
-        </element>
-
-      
-        <element name="jvmarg" type="org.apache.tools.ant.types.Commandline.Argument" briefType="" required="NOTDEFINED">
-        
-          <short-description>Adds a JVM argument.</short-description>
-        
-          <description>
-          Adds a JVM argument.
-        </description>
-      
-        </element>
-
-    
-      </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="javac" category="java" classname="org.apache.tools.ant.taskdefs.Javac" matchingTask="true">
-
-  
-
-    <external>
-
-      <description>
-
-
-        <p>Compiles a Java source tree.</p>
-
-
-        <p>The source and destination directory will be recursively scanned for Java
-source files to compile. Only Java files that have no corresponding class file
-or where the class file is older than the java file will be compiled.</p>
-
-
-        <p>Note: Ant uses only the names of the source and class files to find
-the classes that need a rebuild. It will not scan the source and therefor
-will have no knowledge about nested classes, classes that are named different
-from the source file and so on.</p>
-
-
-        <p>The directory structure of the source tree should follow the package
-hierarchy.</p>
-
-
-        <p>It is possible to refine the set of files that are being compiled/copied.
-This can be done with the 
-          <i>includes</i>, 
-          <i>includesfile</i>, 
-          <i>excludes</i>, 
-          <i>excludesfile</i> and 
-          <i>defaultexcludes</i>
-attributes. With the 
-          <i>includes</i> or 
-          <i>includesfile</i> attribute you specify the files you want to
-have included by using patterns. The 
-          <i>exclude</i> or 
-          <i>excludesfile</i> attribute is used to specify
-the files you want to have excluded. This is also done with patterns. And
-finally with the 
-          <i>defaultexcludes</i> attribute, you can specify whether you
-want to use default exclusions or not. See the section on 
-          <a href="../dirtasks.html#directorybasedtasks">directory based tasks</a>, on how the
-inclusion/exclusion of files works, and how to write patterns.
-        </p>
-
-
-        <p>It is possible to use different compilers. This can be selected with the
-"build.compiler" property or the compiler attribute. Here are the choices:-</p>
-
-        <ul>
-  
-          <li>classic (the standard compiler of JDK 1.1/1.2) - javac1.1 and
-     javac1.2 can be used as aliases</li>
-  
-          <li>modern (the standard compiler of JDK 1.3/1.4) - javac1.3 and
-     javac1.4 can be used as aliases</li>
-  
-          <li>jikes (the 
-            <a href="http://oss.software.ibm.com/developerworks/opensource/jikes/project" target="_top">Jikes</a>
-    compiler)
-          </li>
-  
-          <li>jvc (the Command-Line Compiler from Microsoft's SDK for Java /
-    Visual J++) - microsoft can be used as an alias</li>
-  
-          <li>kjc (the 
-            <a href="http://www.dms.at/kopi/" target="_top">kopi</a>
-    compiler)
-          </li>
-  
-          <li>gcj (the gcj compiler from gcc)</li>
-  
-          <li>sj (Symantec java compiler) - symantec can be used as an alias</li>
-  
-          <li>extJavac (run either modern or classic in a JVM of its own)</li>
-
-        </ul>
-
-        <p>For JDK 1.1/1.2, classic is the default. For JDK 1.3/1.4, modern is the default.
-If you wish to use a different compiler interface than those
-supplied, write a class that implements the CompilerAdapter interface
-(package org.apache.tools.ant.taskdefs.compilers). Supply the full
-classname in the "build.compiler" property.</p>
-
-
-        <p>The fork attribute overrides the build.compiler setting and expects
-a JDK1.1 or higher to be set in java.home.</p>
-
-
-        <p>This task will drop all entries that point to non-existent
-files/directories from the CLASSPATH it passes to the compiler.</p>
-
-
-        <p>
-          <strong>Windows Note:</strong>When the modern compiler is used
-in unforked mode on Windows, it locks up the files present in the
-classpath of the &lt;javac&gt; task, and does not release them.  The side
-effect of this is that you will not be able to delete or move
-those files later on in the build.  The workaround is to fork when
-invoking the compiler.
-        </p>
-
-
-      </description>
-
-
-      <section anchor="examples" name="Examples">
-
-        <pre>  &lt;javac srcdir="${src}"
-         destdir="${build}"
-         classpath="xyz.jar"
-         debug="on"
-  /&gt;</pre>
-
-        <p>compiles all 
-          <code>.java</code> files under the 
-          <code>${src}</code>
-directory, and stores
-the 
-          <code>.class</code> files in the 
-          <code>${build}</code> directory.
-The classpath used contains 
-          <code>xyz.jar</code>, and debug information is on.
-        </p>
-
-
-        <pre>  &lt;javac srcdir="${src}"
-         destdir="${build}"
-         fork="true"
-  /&gt;</pre>
-
-        <p>compiles all 
-          <code>.java</code> files under the 
-          <code>${src}</code>
-directory, and stores the 
-          <code>.class</code> files in the
-
-          <code>${build}</code> directory.  This will fork off the javac
-compiler using the default javac executable.
-        </p>
-
-
-        <pre>  &lt;javac srcdir="${src}"
-         destdir="${build}"
-         fork="java$$javac.exe"
-  /&gt;</pre>
-
-        <p>compiles all 
-          <code>.java</code> files under the 
-          <code>${src}</code>
-directory, and stores the 
-          <code>.class</code> files in the
-
-          <code>${build}</code> directory.  This will fork off the javac
-compiler using the executable named 
-          <code>java$javac.exe</code>.  Note
-that the 
-          <code>$</code> sign needs to be escaped by a second one.
-        </p>
-
-
-        <pre>  &lt;javac srcdir="${src}"
-         destdir="${build}"
-         includes="mypackage/p1/**,mypackage/p2/**"
-         excludes="mypackage/p1/testpackage/**"
-         classpath="xyz.jar"
-         debug="on"
-  /&gt;</pre>
-
-        <p>compiles 
-          <code>.java</code> files under the 
-          <code>${src}</code>
-directory, and stores the
-
-          <code>.class</code> files in the 
-          <code>${build}</code> directory.
-The classpath used contains 
-          <code>xyz.jar</code>, and debug information is on.
-Only files under 
-          <code>mypackage/p1</code> and 
-          <code>mypackage/p2</code> are
-used. Files in the 
-          <code>mypackage/p1/testpackage</code> directory are excluded
-from compilation.
-        </p>
-
-
-        <pre>  &lt;javac srcdir="${src}:${src2}"
-         destdir="${build}"
-         includes="mypackage/p1/**,mypackage/p2/**"
-         excludes="mypackage/p1/testpackage/**"
-         classpath="xyz.jar"
-         debug="on"
-  /&gt;</pre>
-
-
-        <p>is the same as the previous example, with the addition of a second
-source path, defined by
-the property 
-          <code>src2</code>. This can also be represented using nested
-
-          <code>&lt;src&gt;</code> elements as follows:
-        </p>
-
-
-        <pre>  &lt;javac destdir="${build}"
-         classpath="xyz.jar"
-         debug="on"&gt;
-    &lt;src path="${src}"/&gt;
-    &lt;src path="${src2}"/&gt;
-    &lt;include name="mypackage/p1/**"/&gt;
-    &lt;include name="mypackage/p2/**"/&gt;
-    &lt;exclude name="mypackage/p1/testpackage/**"/&gt;
-  &lt;/javac&gt;</pre>
-
-
-        <p>
-          <b>Note:</b> If you are using Ant on Windows and a new DOS window pops up
-for every use of an external compiler, this may be a problem of the JDK you are using.
-This problem may occur with all JDKs &lt; 1.2.
-        </p>
-
-
-        <p>
-          <b>Note:</b> If you wish to compile only source-files located in some packages below a
-common root you should not include these packages in the srcdir-attribute. Use include/exclude-attributes
-or elements to filter for these packages. If you include part of your package-structure inside the srcdir-attribute
-(or nested src-elements) Ant will start to recompile your sources every time you call it.
-        </p>
-
-
-      </section>
-
-
-      <section anchor="jikes" name="Jikes Notes">
-
-
-        <p>Jikes supports some extra options, which can be set be defining
-properties prior to invoking the task. The ant developers are aware that
-this is ugly and inflexible -expect a better solution in the future. All
-the options are boolean, and must be set to "true" or "yes" to be
-interpreted as anything other than false; by default
-build.compiler.warnings is "true" while all others are "false"</p>
-
-
-        <table border="1" cellpadding="2" cellspacing="0">
-  
-          <tr>
-    
-            <td valign="top">
-	build.compiler.emacs
-	</td>
-	
-            <td valign="top">
-	Enable emacs compatible error messages
-    </td>
-  
-          </tr>
-  
-          <tr>
-    
-            <td valign="top">
-	build.compiler.warnings
-              <br />
-        
-              <b>This property has been deprecated, use the nowarn attribute
-          instead</b>
-	
-            </td>
-	
-            <td valign="top">
-	don't disable warning messages
-    </td>
-  
-          </tr>
-  
-          <tr>
-    
-            <td valign="top">
-	build.compiler.pedantic
-	</td>
-	
-            <td valign="top">
-	enable pedantic warnings
-    </td>
-  
-          </tr>
-  
-          <tr>
-    
-            <td valign="top">
-	build.compiler.fulldepend
-	</td>
-	
-            <td valign="top">
-	enable full dependency checking,
-              <br />
-	"+F" in the jikes manual.
-    
-            </td>
-  
-          </tr>
-
-        </table>
-
-
-      </section>
-
-    </external>
-
-  
-    <short-description>Compiles Java source files.</short-description>
-  
-    <description>
-    Compiles Java source files. This task can take the following
- arguments:
- &lt;ul&gt;
- &lt;li&gt;sourcedir
- &lt;li&gt;destdir
- &lt;li&gt;deprecation
- &lt;li&gt;classpath
- &lt;li&gt;bootclasspath
- &lt;li&gt;extdirs
- &lt;li&gt;optimize
- &lt;li&gt;debug
- &lt;li&gt;encoding
- &lt;li&gt;target
- &lt;li&gt;depend
- &lt;li&gt;vebose
- &lt;li&gt;failonerror
- &lt;li&gt;includeantruntime
- &lt;li&gt;includejavaruntime
- &lt;li&gt;source
- &lt;li&gt;compiler
- &lt;/ul&gt;
- Of these arguments, the &lt;b&gt;sourcedir&lt;/b&gt; and &lt;b&gt;destdir&lt;/b&gt; are required.
- &lt;p&gt;
- When this task executes, it will recursively scan the sourcedir and
- destdir looking for Java source files to compile. This task makes its
- compile decision based on timestamp.
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="bootclasspathref" type="org.apache.tools.ant.types.Reference" briefType="Reference" required="no">
-        
-          <short-description>Adds a reference to a classpath defined elsewhere.</short-description>
-        
-          <description>
-          Adds a reference to a classpath defined elsewhere.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="bootclasspath" type="org.apache.tools.ant.types.Path" briefType="Path" required="no">
-        
-          <short-description>Bootclasspath that will be used to compile the classes
- against.</short-description>
-        
-          <description>
-          Sets the bootclasspath that will be used to compile the classes
- against.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="classpath" type="org.apache.tools.ant.types.Path" briefType="Path" required="no">
-        
-          <short-description>Classpath to be used for this compilation.</short-description>
-        
-          <description>
-          Set the classpath to be used for this compilation.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="classpathref" type="org.apache.tools.ant.types.Reference" briefType="Reference" required="no">
-        
-          <short-description>Adds a reference to a classpath defined elsewhere.</short-description>
-        
-          <description>
-          Adds a reference to a classpath defined elsewhere.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="compiler" type="java.lang.String" briefType="String" required="no">
-        
-          <short-description>Choose the implementation for this particular task.</short-description>
-        
-          <description>
-          Choose the implementation for this particular task.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="debug" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>Indicates whether source should be compiled
- with debug information; defaults to off.</short-description>
-        
-          <description>
-          Indicates whether source should be compiled
- with debug information; defaults to off.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="debuglevel" type="java.lang.String" briefType="String" required="no">
-        
-          <short-description>Keyword list to be appended to the -g command-line switch.</short-description>
-        
-          <description>
-          Keyword list to be appended to the -g command-line switch.
-
- This will be ignored by all implementations except modern
- and classic(ver &gt;= 1.2). Legal values are none or a
- comma-separated list of the following keywords: lines, vars,
- and source. If debuglevel is not specified, by default, :none
- will be appended to -g. If debug is not turned on, this attribute
- will be ignored.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="depend" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>Enables dependency-tracking for compilers
- that support this (jikes and classic).</short-description>
-        
-          <description>
-          Enables dependency-tracking for compilers
- that support this (jikes and classic).
-        </description>
-      
-        </attribute>
-      
-        <attribute name="deprecation" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>Indicates whether source should be
- compiled with deprecation information; defaults to off.</short-description>
-        
-          <description>
-          Indicates whether source should be
- compiled with deprecation information; defaults to off.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="destdir" type="java.io.File" briefType="File" required="no">
-        
-          <short-description>Destination directory into which the Java source
- files should be compiled.</short-description>
-        
-          <description>
-          Set the destination directory into which the Java source
- files should be compiled.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="encoding" type="java.lang.String" briefType="String" required="no">
-        
-          <short-description>Java source file encoding name.</short-description>
-        
-          <description>
-          Set the Java source file encoding name.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="executable" type="java.lang.String" briefType="String" required="no">
-        
-          <short-description>The name of the javac executable.</short-description>
-        
-          <description>
-          Sets the the name of the javac executable.
-
- &lt;p&gt;Ignored unless fork is true or extJavac has been specified
- as the compiler.&lt;/p&gt;
-        </description>
-      
-        </attribute>
-      
-        <attribute name="extdirs" type="org.apache.tools.ant.types.Path" briefType="Path" required="no">
-        
-          <short-description>Extension directories that will be used during the
- compilation.</short-description>
-        
-          <description>
-          Sets the extension directories that will be used during the
- compilation.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="failonerror" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>Indicates whether the build will continue
- even if there are compilation errors; defaults to true.</short-description>
-        
-          <description>
-          Indicates whether the build will continue
- even if there are compilation errors; defaults to true.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="fork" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>If true, forks the javac compiler.</short-description>
-        
-          <description>
-          If true, forks the javac compiler.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="includeantruntime" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>If true, includes Ant's own classpath in the classpath.</short-description>
-        
-          <description>
-          If true, includes Ant's own classpath in the classpath.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="includejavaruntime" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>If true, includes the Java runtime libraries in the classpath.</short-description>
-        
-          <description>
-          If true, includes the Java runtime libraries in the classpath.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="listfiles" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>If true, list the source files being handed off to the compiler.</short-description>
-        
-          <description>
-          If true, list the source files being handed off to the compiler.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="memoryinitialsize" type="java.lang.String" briefType="String" required="no">
-        
-          <short-description>The initial size of the memory for the underlying VM
- if javac is run externally; ignored otherwise.</short-description>
-        
-          <description>
-          The initial size of the memory for the underlying VM
- if javac is run externally; ignored otherwise.
- Defaults to the standard VM memory setting.
- (Examples: 83886080, 81920k, or 80m)
-        </description>
-      
-        </attribute>
-      
-        <attribute name="memorymaximumsize" type="java.lang.String" briefType="String" required="no">
-        
-          <short-description>The maximum size of the memory for the underlying VM
- if javac is run externally; ignored otherwise.</short-description>
-        
-          <description>
-          The maximum size of the memory for the underlying VM
- if javac is run externally; ignored otherwise.
- Defaults to the standard VM memory setting.
- (Examples: 83886080, 81920k, or 80m)
-        </description>
-      
-        </attribute>
-      
-        <attribute name="nowarn" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>If true, enables the -nowarn option.</short-description>
-        
-          <description>
-          If true, enables the -nowarn option.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="optimize" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>If true, compiles with optimization enabled.</short-description>
-        
-          <description>
-          If true, compiles with optimization enabled.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="source" type="java.lang.String" briefType="String" required="no">
-        
-          <short-description>Value of the -source command-line switch; will be ignored
- by all implementations except modern and jikes.</short-description>
-        
-          <description>
-          Value of the -source command-line switch; will be ignored
- by all implementations except modern and jikes.
-
- If you use this attribute together with jikes, you must
- make sure that your version of jikes supports the -source switch.
- Legal values are 1.3 and 1.4 - by default, no -source argument
- will be used at all.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="sourcepath" type="org.apache.tools.ant.types.Path" briefType="Path" required="no">
-        
-          <short-description>Sourcepath to be used for this compilation.</short-description>
-        
-          <description>
-          Set the sourcepath to be used for this compilation.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="sourcepathref" type="org.apache.tools.ant.types.Reference" briefType="Reference" required="no">
-        
-          <short-description>Adds a reference to a source path defined elsewhere.</short-description>
-        
-          <description>
-          Adds a reference to a source path defined elsewhere.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="srcdir" type="org.apache.tools.ant.types.Path" briefType="Path" required="yes, unless nested &lt;src&gt; elements are present.">
-        
-          <short-description>Source directories to find the source Java files.</short-description>
-        
-          <description>
-          Set the source directories to find the source Java files.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="target" type="java.lang.String" briefType="String" required="no">
-        
-          <short-description>Target VM that the classes will be compiled for.</short-description>
-        
-          <description>
-          Sets the target VM that the classes will be compiled for. Valid
- strings are "1.1", "1.2", and "1.3".
-        </description>
-      
-        </attribute>
-      
-        <attribute name="verbose" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>If true, asks the compiler for verbose output.</short-description>
-        
-          <description>
-          If true, asks the compiler for verbose output.
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-      
-        <element name="bootclasspath" type="org.apache.tools.ant.types.Path" briefType="Path" required="NOTDEFINED">
-        
-          <short-description>Adds a path to the bootclasspath.</short-description>
-        
-          <description>
-          Adds a path to the bootclasspath.
-        </description>
-      
-        </element>
-
-      
-        <element name="classpath" type="org.apache.tools.ant.types.Path" briefType="Path" required="NOTDEFINED">
-        
-          <short-description>Adds a path to the classpath.</short-description>
-        
-          <description>
-          Adds a path to the classpath.
-        </description>
-      
-        </element>
-
-      
-        <element name="compilerarg" type="org.apache.tools.ant.taskdefs.Javac.ImplementationSpecificArgument" briefType="" required="NOTDEFINED">
-        
-          <short-description>Adds an implementation specific command-line argument.</short-description>
-        
-          <description>
-          Adds an implementation specific command-line argument.
-        </description>
-      
-        </element>
-
-      
-        <element name="extdirs" type="org.apache.tools.ant.types.Path" briefType="Path" required="NOTDEFINED">
-        
-          <short-description>Adds a path to extdirs.</short-description>
-        
-          <description>
-          Adds a path to extdirs.
-        </description>
-      
-        </element>
-
-      
-        <element name="sourcepath" type="org.apache.tools.ant.types.Path" briefType="Path" required="NOTDEFINED">
-        
-          <short-description>Adds a path to sourcepath.</short-description>
-        
-          <description>
-          Adds a path to sourcepath.
-        </description>
-      
-        </element>
-
-      
-        <element name="src" type="org.apache.tools.ant.types.Path" briefType="Path" required="NOTDEFINED">
-        
-          <short-description>Adds a path for source compilation.</short-description>
-        
-          <description>
-          Adds a path for source compilation.
-        </description>
-      
-        </element>
-
-    
-      </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="javacc" category="other" classname="org.apache.tools.ant.taskdefs.optional.javacc.JavaCC">
-
-  
-    <short-description>JavaCC compiler compiler task.</short-description>
-  
-    <description>
-    JavaCC compiler compiler task.
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="buildparser" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>BUILD_PARSER grammar option.</short-description>
-        
-          <description>
-          Sets the BUILD_PARSER grammar option.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="buildtokenmanager" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>BUILD_TOKEN_MANAGER grammar option.</short-description>
-        
-          <description>
-          Sets the BUILD_TOKEN_MANAGER grammar option.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="cachetokens" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>CACHE_TOKENS grammar option.</short-description>
-        
-          <description>
-          Sets the CACHE_TOKENS grammar option.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="choiceambiguitycheck" type="int" briefType="int" required="no">
-        
-          <short-description>CHOICE_AMBIGUITY_CHECK grammar option.</short-description>
-        
-          <description>
-          Sets the CHOICE_AMBIGUITY_CHECK grammar option.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="commontokenaction" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>COMMON_TOKEN_ACTION grammar option.</short-description>
-        
-          <description>
-          Sets the COMMON_TOKEN_ACTION grammar option.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="debuglookahead" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>DEBUG_LOOKAHEAD grammar option.</short-description>
-        
-          <description>
-          Sets the DEBUG_LOOKAHEAD grammar option.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="debugparser" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>DEBUG_PARSER grammar option.</short-description>
-        
-          <description>
-          Sets the DEBUG_PARSER grammar option.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="debugtokenmanager" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>DEBUG_TOKEN_MANAGER grammar option.</short-description>
-        
-          <description>
-          Sets the DEBUG_TOKEN_MANAGER grammar option.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="errorreporting" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>ERROR_REPORTING grammar option.</short-description>
-        
-          <description>
-          Sets the ERROR_REPORTING grammar option.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="forcelacheck" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>FORCE_LA_CHECK grammar option.</short-description>
-        
-          <description>
-          Sets the FORCE_LA_CHECK grammar option.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="ignorecase" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>IGNORE_CASE grammar option.</short-description>
-        
-          <description>
-          Sets the IGNORE_CASE grammar option.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="javacchome" type="java.io.File" briefType="File" required="yes">
-        
-          <short-description>The directory containing the JavaCC distribution.</short-description>
-        
-          <description>
-          The directory containing the JavaCC distribution.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="javaunicodeescape" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>JAVA_UNICODE_ESCAPE grammar option.</short-description>
-        
-          <description>
-          Sets the JAVA_UNICODE_ESCAPE grammar option.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="lookahead" type="int" briefType="int" required="no">
-        
-          <short-description>LOOKAHEAD grammar option.</short-description>
-        
-          <description>
-          Sets the LOOKAHEAD grammar option.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="optimizetokenmanager" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>OPTIMIZE_TOKEN_MANAGER grammar option.</short-description>
-        
-          <description>
-          Sets the OPTIMIZE_TOKEN_MANAGER grammar option.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="otherambiguitycheck" type="int" briefType="int" required="no">
-        
-          <short-description>OTHER_AMBIGUITY_CHECK grammar option.</short-description>
-        
-          <description>
-          Sets the OTHER_AMBIGUITY_CHECK grammar option.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="outputdirectory" type="java.io.File" briefType="File" required="no">
-        
-          <short-description>The directory to write the generated files to.</short-description>
-        
-          <description>
-          The directory to write the generated files to.
- If not set, the files are written to the directory
- containing the grammar file.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="sanitycheck" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>SANITY_CHECK grammar option.</short-description>
-        
-          <description>
-          Sets the SANITY_CHECK grammar option.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="static" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>STATIC grammar option.</short-description>
-        
-          <description>
-          Sets the STATIC grammar option.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="target" type="java.io.File" briefType="File" required="yes">
-        
-          <short-description>The grammar file to process.</short-description>
-        
-          <description>
-          The grammar file to process.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="unicodeinput" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>UNICODE_INPUT grammar option.</short-description>
-        
-          <description>
-          Sets the UNICODE_INPUT grammar option.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="usercharstream" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>USER_CHAR_STREAM grammar option.</short-description>
-        
-          <description>
-          Sets the USER_CHAR_STREAM grammar option.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="usertokenmanager" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>USER_TOKEN_MANAGER grammar option.</short-description>
-        
-          <description>
-          Sets the USER_TOKEN_MANAGER grammar option.
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-    </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="javadoc" category="java" classname="org.apache.tools.ant.taskdefs.Javadoc">
-
-  
-
-    <external>
-
-      <description>
-
-
-        <p>Generates code documentation using the javadoc tool.</p>
-
-
-        <p>The source directory will be recursively scanned for Java source files to process
-but only those matching the inclusion rules, and not matching the exclusions rules
-will be passed to the javadoc tool. This
-allows wildcards to be used to choose between package names, reducing verbosity
-and management costs over time. This task, however, has no notion of
-"changed" files, unlike the 
-          <a href="javac.html">javac</a> task. This means
-all packages will be processed each time this task is run. In general, however,
-this task is used much less frequently.
-        </p>
-
-
-        <p>This task works seamlessly between different javadoc versions (1.1 and 1.2),
-with the obvious restriction that the 1.2 attributes will be ignored if run in a
-1.1 VM.</p>
-
-
-        <p>NOTE: since javadoc calls System.exit(), javadoc cannot be run inside the
-same VM as ant without breaking functionality. For this reason, this task
-always forks the VM. This overhead is not significant since javadoc is normally a heavy
-application and will be called infrequently.</p>
-
-
-        <p>NOTE: the packagelist attribute allows you to specify the list of packages to
-document outside of the Ant file. It's a much better practice to include everything
-inside the build.xml file. This option was added in order to make it easier to
-migrate from regular makefiles, where you would use this option of javadoc.
-The packages listed in packagelist are not checked, so the task performs even
-if some packages are missing or broken. Use this option if you wish to convert from
-an existing makefile. Once things are running you should then switch to the regular
-notation. </p>
-
-
-        <p>
-          <i>
-            <b>DEPRECATION:</b> the javadoc2 task simply points to the javadoc task and it's
-there for back compatibility reasons. Since this task will be removed in future
-versions, you are strongly encouraged to use 
-            <a href="javadoc.html">javadoc</a>
-instead.
-          </i>
-        </p>
-
-      </description>
-
-
-      <section anchor="examples" name="Example">
-
-        <pre>  &lt;javadoc packagenames="com.dummy.test.*"
-           sourcepath="src"
-           excludepackagenames="com.dummy.test.doc-files.*"
-           defaultexcludes="yes"
-           destdir="docs/api"
-           author="true"
-           version="true"
-           use="true"
-           windowtitle="Test API"&gt;
-    &lt;doctitle&gt;&lt;![CDATA[&lt;h1&gt;Test&lt;/h1&gt;]]&gt;&lt;/doctitle&gt;
-    &lt;bottom&gt;&lt;![CDATA[&lt;i&gt;Copyright &amp;#169; 2000 Dummy Corp. All Rights Reserved.&lt;/i&gt;]]&gt;&lt;/bottom&gt;
-    &lt;tag name="todo" scope="all" description="To do:" /&gt;
-    &lt;group title="Group 1 Packages" packages="com.dummy.test.a*"/&gt;
-    &lt;group title="Group 2 Packages" packages="com.dummy.test.b*:com.dummy.test.c*"/&gt;
-    &lt;link offline="true" href="http://java.sun.com/products/jdk/1.2/docs/api/" packagelistLoc="C:\tmp"/&gt;
-    &lt;link href="http://developer.java.sun.com/developer/products/xml/docs/api/"/&gt;
-  &lt;/javadoc&gt;</pre>
-
-      </section>
-
-    </external>
-
-  
-    <short-description>Generates Javadoc documentation for a collection of source code.</short-description>
-  
-    <description>
-    Generates Javadoc documentation for a collection
- of source code.
-
- &lt;P&gt;Current known limitations are:
-
- &lt;P&gt;&lt;UL&gt;
-    &lt;LI&gt;patterns must be of the form "xxx.*", every other pattern doesn't
-        work.
-    &lt;LI&gt;there is no control on arguments sanity since they are left
-        to the javadoc implementation.
-    &lt;LI&gt;argument J in javadoc1 is not supported (what is that for anyway?)
- &lt;/UL&gt;
-
- &lt;P&gt;If no &lt;CODE&gt;doclet&lt;/CODE&gt; is set, then the &lt;CODE&gt;version&lt;/CODE&gt; and
- &lt;CODE&gt;author&lt;/CODE&gt; are by default &lt;CODE&gt;"yes"&lt;/CODE&gt;.
-
- &lt;P&gt;Note: This task is run on another VM because the Javadoc code calls
- &lt;CODE&gt;System.exit()&lt;/CODE&gt; which would break Ant functionality.
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="access" type="org.apache.tools.ant.taskdefs.Javadoc.AccessType" briefType="&quot;protected&quot;, &quot;public&quot;, &quot;package&quot;, &quot;private&quot;" required="no (default protected)">
-        
-          <short-description>Scope to be processed.</short-description>
-        
-          <description>
-          Set the scope to be processed. This is an alternative to the
- use of the setPublic, setPrivate, etc methods. It gives better build
- file control over what scope is processed.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="additionalparam" type="java.lang.String" briefType="String" required="no">
-        
-          <short-description>Set an additional parameter on the command line.</short-description>
-        
-          <description>
-          Set an additional parameter on the command line
-        </description>
-      
-        </attribute>
-      
-        <attribute name="author" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>Include the author tag in the generated documentation.</short-description>
-        
-          <description>
-          Include the author tag in the generated documentation.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="bootclasspathref" type="org.apache.tools.ant.types.Reference" briefType="Reference" required="no">
-        
-          <short-description>Adds a reference to a CLASSPATH defined elsewhere.</short-description>
-        
-          <description>
-          Adds a reference to a CLASSPATH defined elsewhere.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="bootclasspath" type="org.apache.tools.ant.types.Path" briefType="Path" required="no">
-        
-          <short-description>Boot classpath to use.</short-description>
-        
-          <description>
-          Set the boot classpath to use.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="bottom" type="java.lang.String" briefType="String" required="no">
-        
-          <short-description>Text to be placed at the bottom of each output file.</short-description>
-        
-          <description>
-          Set the text to be placed at the bottom of each output file.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="charset" type="java.lang.String" briefType="String" required="no">
-        
-          <short-description>Charset for cross-platform viewing of generated documentation.</short-description>
-        
-          <description>
-          Charset for cross-platform viewing of generated documentation.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="classpath" type="org.apache.tools.ant.types.Path" briefType="Path" required="no">
-        
-          <short-description>Classpath to be used for this javadoc run.</short-description>
-        
-          <description>
-          Set the classpath to be used for this javadoc run.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="classpathref" type="org.apache.tools.ant.types.Reference" briefType="Reference" required="no">
-        
-          <short-description>Adds a reference to a CLASSPATH defined elsewhere.</short-description>
-        
-          <description>
-          Adds a reference to a CLASSPATH defined elsewhere.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="defaultexcludes" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>Sets whether default exclusions should be used or not.</short-description>
-        
-          <description>
-          Sets whether default exclusions should be used or not.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="destdir" type="java.io.File" briefType="File" required="yes, unless a doclet has been specified.">
-        
-          <short-description>Directory where the Javadoc output will be generated.</short-description>
-        
-          <description>
-          Set the directory where the Javadoc output will be generated.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="docencoding" type="java.lang.String" briefType="String" required="no">
-        
-          <short-description>Output file encoding name.</short-description>
-        
-          <description>
-          Output file encoding name.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="doclet" type="java.lang.String" briefType="String" required="no">
-        
-          <short-description>Class that starts the doclet used in generating the 
- documentation.</short-description>
-        
-          <description>
-          Set the class that starts the doclet used in generating the 
- documentation.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="docletpath" type="org.apache.tools.ant.types.Path" briefType="Path" required="no">
-        
-          <short-description>Classpath used to find the doclet class.</short-description>
-        
-          <description>
-          Set the classpath used to find the doclet class.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="docletpathref" type="org.apache.tools.ant.types.Reference" briefType="Reference" required="no">
-        
-          <short-description>Classpath used to find the doclet class by reference.</short-description>
-        
-          <description>
-          Set the classpath used to find the doclet class by reference.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="doctitle" type="java.lang.String" briefType="String" required="no">
-        
-          <short-description>Title of the generated overview page.</short-description>
-        
-          <description>
-          Set the title of the generated overview page.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="encoding" type="java.lang.String" briefType="String" required="no">
-        
-          <short-description>Encoding name of the source files,.</short-description>
-        
-          <description>
-          Set the encoding name of the source files,
-        </description>
-      
-        </attribute>
-      
-        <attribute name="excludepackagenames" type="java.lang.String" briefType="String" required="no">
-        
-          <short-description>List of packages to be excluded.</short-description>
-        
-          <description>
-          Set the list of packages to be excluded.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="extdirs" type="org.apache.tools.ant.types.Path" briefType="Path" required="no">
-        
-          <short-description>Location of the extensions directories.</short-description>
-        
-          <description>
-          Set the location of the extensions directories.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="failonerror" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>Should the build process fail if javadoc fails (as indicated by
- a non zero return code)?.</short-description>
-        
-          <description>
-          Should the build process fail if javadoc fails (as indicated by
- a non zero return code)?
-
- &lt;p&gt;Default is false.&lt;/p&gt;
-        </description>
-      
-        </attribute>
-      
-        <attribute name="footer" type="java.lang.String" briefType="String" required="no">
-        
-          <short-description>Footer text to be placed at the bottom of each output file.</short-description>
-        
-          <description>
-          Set the footer text to be placed at the bottom of each output file.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="group" type="java.lang.String" briefType="String" required="no">
-        
-          <short-description>Group specified packages together in overview page.</short-description>
-        
-          <description>
-          Group specified packages together in overview page.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="header" type="java.lang.String" briefType="String" required="no">
-        
-          <short-description>Header text to be placed at the top of each output file.</short-description>
-        
-          <description>
-          Set the header text to be placed at the top of each output file.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="helpfile" type="java.io.File" briefType="File" required="no">
-        
-          <short-description>Specifies the HTML help file to use.</short-description>
-        
-          <description>
-          Specifies the HTML help file to use.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="link" type="java.lang.String" briefType="String" required="no">
-        
-          <short-description>Create links to javadoc output at the given URL.</short-description>
-        
-          <description>
-          Create links to javadoc output at the given URL.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="linkoffline" type="java.lang.String" briefType="String" required="no">
-        
-          <short-description>Link to docs at "url" using package list at "url2"
- - separate the URLs by using a space character.</short-description>
-        
-          <description>
-          Link to docs at "url" using package list at "url2"
- - separate the URLs by using a space character.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="locale" type="java.lang.String" briefType="String" required="no">
-        
-          <short-description>Local to use in documentation generation.</short-description>
-        
-          <description>
-          Set the local to use in documentation generation.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="maxmemory" type="java.lang.String" briefType="String" required="no">
-        
-          <short-description>Maximum memory to be used by the javadoc process.</short-description>
-        
-          <description>
-          Set the maximum memory to be used by the javadoc process
-        </description>
-      
-        </attribute>
-      
-        <attribute name="nodeprecated" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>If true, do not include @deprecated information.</short-description>
-        
-          <description>
-          If true, do not include @deprecated information.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="nodeprecatedlist" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>If true, do not generate deprecated list.</short-description>
-        
-          <description>
-          If true, do not generate deprecated list.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="nohelp" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>If true, do not generate help link.</short-description>
-        
-          <description>
-          If true, do not generate help link
-        </description>
-      
-        </attribute>
-      
-        <attribute name="noindex" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>If true, do not generate index.</short-description>
-        
-          <description>
-          If true, do not generate index.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="nonavbar" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>If true, do not generate navigation bar.</short-description>
-        
-          <description>
-          If true, do not generate navigation bar.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="notree" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>If true, do not generate class hierarchy.</short-description>
-        
-          <description>
-          If true, do not generate class hierarchy.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="old" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>Indicate whether Javadoc should produce old style (JDK 1.1) 
- documentation.</short-description>
-        
-          <description>
-          Indicate whether Javadoc should produce old style (JDK 1.1) 
- documentation.
-
- This is not supported by JDK 1.1 and has been phased out in JDK 1.4
-        </description>
-      
-        </attribute>
-      
-        <attribute name="overview" type="java.io.File" briefType="File" required="no">
-        
-          <short-description>Specify the file containing the overview to be included in the generated
- documentation.</short-description>
-        
-          <description>
-          Specify the file containing the overview to be included in the generated
- documentation.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="package" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>Indicate whether only package, protected and public classes and 
- members are to be included in the scope processed.</short-description>
-        
-          <description>
-          Indicate whether only package, protected and public classes and 
- members are to be included in the scope processed
-        </description>
-      
-        </attribute>
-      
-        <attribute name="packagelist" type="java.lang.String" briefType="String" required="no">
-        
-          <short-description>The name of a file containing the packages to process.</short-description>
-        
-          <description>
-          The name of a file containing the packages to process.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="packagenames" type="java.lang.String" briefType="String" required="no">
-        
-          <short-description>Package names to be processed.</short-description>
-        
-          <description>
-          Set the package names to be processed.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="private" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>Indicate whether all classes and 
- members are to be included in the scope processed.</short-description>
-        
-          <description>
-          Indicate whether all classes and 
- members are to be included in the scope processed
-        </description>
-      
-        </attribute>
-      
-        <attribute name="protected" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>Indicate whether only protected and public classes and members are to 
- be included in the scope processed.</short-description>
-        
-          <description>
-          Indicate whether only protected and public classes and members are to 
- be included in the scope processed
-        </description>
-      
-        </attribute>
-      
-        <attribute name="public" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>Indicate whether only public classes and members are to be included in 
- the scope processed.</short-description>
-        
-          <description>
-          Indicate whether only public classes and members are to be included in 
- the scope processed
-        </description>
-      
-        </attribute>
-      
-        <attribute name="serialwarn" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>If true, generate warning about @serial tag.</short-description>
-        
-          <description>
-          If true, generate warning about @serial tag.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="source" type="java.lang.String" briefType="String" required="no">
-        
-          <short-description>Enables the -source switch, will be ignored if javadoc is not
- the 1.4 version or a different doclet than the standard doclet
- is used.</short-description>
-        
-          <description>
-          Enables the -source switch, will be ignored if javadoc is not
- the 1.4 version or a different doclet than the standard doclet
- is used.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="sourcefiles" type="java.lang.String" briefType="String" required="">
-        
-          <short-description>List of source files to process.</short-description>
-        
-          <description>
-          Set the list of source files to process.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="sourcepath" type="org.apache.tools.ant.types.Path" briefType="Path" required="at least one of the three or nested      &lt;sourcepath&gt;, &lt;fileset&gt; or      &lt;packageset&gt;">
-        
-          <short-description>Specify where to find source file.</short-description>
-        
-          <description>
-          Specify where to find source file
-        </description>
-      
-        </attribute>
-      
-        <attribute name="sourcepathref" type="org.apache.tools.ant.types.Reference" briefType="Reference" required="">
-        
-          <short-description>Adds a reference to a CLASSPATH defined elsewhere.</short-description>
-        
-          <description>
-          Adds a reference to a CLASSPATH defined elsewhere.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="splitindex" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>Generate a split index.</short-description>
-        
-          <description>
-          Generate a split index
-        </description>
-      
-        </attribute>
-      
-        <attribute name="stylesheetfile" type="java.io.File" briefType="File" required="no">
-        
-          <short-description>Specifies the CSS stylesheet file to use.</short-description>
-        
-          <description>
-          Specifies the CSS stylesheet file to use.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="use" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>Generate the &amp;quot;use&amp;quot page for each package.</short-description>
-        
-          <description>
-          Generate the &amp;quot;use&amp;quot page for each package.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="useexternalfile" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>Work around command line length limit by using an external file
- for the sourcefiles.</short-description>
-        
-          <description>
-          Work around command line length limit by using an external file
- for the sourcefiles.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="verbose" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>Run javadoc in verbose mode.</short-description>
-        
-          <description>
-          Run javadoc in verbose mode
-        </description>
-      
-        </attribute>
-      
-        <attribute name="version" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>Include the version tag in the generated documentation.</short-description>
-        
-          <description>
-          Include the version tag in the generated documentation.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="windowtitle" type="java.lang.String" briefType="String" required="no">
-        
-          <short-description>Title to be placed in the HTML &amp;lt;title&amp;gt; tag of the 
- generated documentation.</short-description>
-        
-          <description>
-          Set the title to be placed in the HTML &amp;lt;title&amp;gt; tag of the 
- generated documentation.
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-      
-        <element name="bottom" type="org.apache.tools.ant.taskdefs.Javadoc.Html" briefType="" required="NOTDEFINED">
-        
-          <short-description>Text to be placed at the bottom of each output file.</short-description>
-        
-          <description>
-          Set the text to be placed at the bottom of each output file.
-        </description>
-      
-        </element>
-
-      
-        <element name="doctitle" type="org.apache.tools.ant.taskdefs.Javadoc.Html" briefType="" required="NOTDEFINED">
-        
-          <short-description>Add a document title to use for the overview page.</short-description>
-        
-          <description>
-          Add a document title to use for the overview page.
-        </description>
-      
-        </element>
-
-      
-        <element name="excludepackage" type="org.apache.tools.ant.taskdefs.Javadoc.PackageName" briefType="" required="NOTDEFINED">
-        
-          <short-description>Add a package to be excluded from the javadoc run.</short-description>
-        
-          <description>
-          Add a package to be excluded from the javadoc run.
-        </description>
-      
-        </element>
-
-      
-        <element name="fileset" type="org.apache.tools.ant.types.FileSet" briefType="Fileset" required="NOTDEFINED">
-        
-          <short-description>Adds a fileset.</short-description>
-        
-          <description>
-          Adds a fileset.
-
- &lt;p&gt;All included files will be added as sourcefiles.  The task
- will automatically add
- &lt;code&gt;includes=&amp;quot;**&amp;#47;*.java&amp;quot;&lt;/code&gt; to the
- fileset.&lt;/p&gt;
-        </description>
-      
-        </element>
-
-      
-        <element name="footer" type="org.apache.tools.ant.taskdefs.Javadoc.Html" briefType="" required="NOTDEFINED">
-        
-          <short-description>Footer text to be placed at the bottom of each output file.</short-description>
-        
-          <description>
-          Set the footer text to be placed at the bottom of each output file.
-        </description>
-      
-        </element>
-
-      
-        <element name="header" type="org.apache.tools.ant.taskdefs.Javadoc.Html" briefType="" required="NOTDEFINED">
-        
-          <short-description>Header text to be placed at the top of each output file.</short-description>
-        
-          <description>
-          Set the header text to be placed at the top of each output file.
-        </description>
-      
-        </element>
-
-      
-        <element name="package" type="org.apache.tools.ant.taskdefs.Javadoc.PackageName" briefType="" required="NOTDEFINED">
-        
-          <short-description>Add a single package to be processed.</short-description>
-        
-          <description>
-          Add a single package to be processed.
-
- If the package name ends with &amp;quot;.*&amp;quot; the Javadoc task
- will find and process all subpackages.
-        </description>
-      
-        </element>
-
-      
-        <element name="packageset" type="org.apache.tools.ant.types.DirSet" briefType="Dirset" required="NOTDEFINED">
-        
-          <short-description>Adds a packageset.</short-description>
-        
-          <description>
-          Adds a packageset.
-
- &lt;p&gt;All included directories will be translated into package
- names be converting the directory separator into dots.&lt;/p&gt;
-        </description>
-      
-        </element>
-
-      
-        <element name="source" type="org.apache.tools.ant.taskdefs.Javadoc.SourceFile" briefType="" required="NOTDEFINED">
-        
-          <short-description>Add a single source file.</short-description>
-        
-          <description>
-          Add a single source file.
-        </description>
-      
-        </element>
-
-      
-        <element name="taglet" type="org.apache.tools.ant.taskdefs.Javadoc.ExtensionInfo" briefType="" required="NOTDEFINED">
-        
-          <short-description>Add a taglet.</short-description>
-        
-          <description>
-          Add a taglet
-        </description>
-      
-        </element>
-
-      
-        <element name="bootclasspath" type="org.apache.tools.ant.types.Path" briefType="Path" required="NOTDEFINED">
-        
-          <short-description>Create a Path to be configured with the boot classpath.</short-description>
-        
-          <description>
-          Create a Path to be configured with the boot classpath
-        </description>
-      
-        </element>
-
-      
-        <element name="classpath" type="org.apache.tools.ant.types.Path" briefType="Path" required="NOTDEFINED">
-        
-          <short-description>Create a Path to be configured with the classpath to use.</short-description>
-        
-          <description>
-          Create a Path to be configured with the classpath to use
-        </description>
-      
-        </element>
-
-      
-        <element name="doclet" type="org.apache.tools.ant.taskdefs.Javadoc.DocletInfo" briefType="" required="NOTDEFINED">
-        
-          <short-description>Create a doclet to be used in the documentation generation.</short-description>
-        
-          <description>
-          Create a doclet to be used in the documentation generation.
-        </description>
-      
-        </element>
-
-      
-        <element name="group" type="org.apache.tools.ant.taskdefs.Javadoc.GroupArgument" briefType="" required="NOTDEFINED">
-        
-          <short-description>Separates packages on the overview page into whatever
- groups you specify, one group per table.</short-description>
-        
-          <description>
-          Separates packages on the overview page into whatever
- groups you specify, one group per table.
-        </description>
-      
-        </element>
-
-      
-        <element name="link" type="org.apache.tools.ant.taskdefs.Javadoc.LinkArgument" briefType="" required="NOTDEFINED">
-        
-          <short-description>Create link to javadoc output at the given URL.</short-description>
-        
-          <description>
-          Create link to javadoc output at the given URL.
-        </description>
-      
-        </element>
-
-      
-        <element name="sourcepath" type="org.apache.tools.ant.types.Path" briefType="Path" required="NOTDEFINED">
-        
-          <short-description>Create a path to be configured with the locations of the source
- files.</short-description>
-        
-          <description>
-          Create a path to be configured with the locations of the source
- files.
-        </description>
-      
-        </element>
-
-      
-        <element name="tag" type="org.apache.tools.ant.taskdefs.Javadoc.TagArgument" briefType="" required="NOTDEFINED">
-        
-          <short-description>Creates and adds a -tag argument.</short-description>
-        
-          <description>
-          Creates and adds a -tag argument. This is used to specify
- custom tags. This argument is only available for JavaDoc 1.4,
- and will generate a verbose message (and then be ignored)
- when run on Java versions below 1.4.
-        </description>
-      
-        </element>
-
-    
-      </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="javah" category="other" classname="org.apache.tools.ant.taskdefs.optional.Javah">
-
-  
-    <short-description>Generates JNI header files using javah.</short-description>
-  
-    <description>
-    Generates JNI header files using javah.
-
- This task can take the following arguments:
- &lt;ul&gt;
- &lt;li&gt;classname - the fully-qualified name of a class&lt;/li&gt;
- &lt;li&gt;outputFile - Concatenates the resulting header or source files for all
-     the classes listed into this file&lt;/li&gt;
- &lt;li&gt;destdir - Sets the directory where javah saves the header files or the
-     stub files&lt;/li&gt;
- &lt;li&gt;classpath&lt;/li&gt;
- &lt;li&gt;bootclasspath&lt;/li&gt;
- &lt;li&gt;force - Specifies that output files should always be written
-(JDK1.2 only)&lt;/li&gt;
- &lt;li&gt;old - Specifies that old JDK1.0-style header files should be generated
-     (otherwise output file contain JNI-style native method
-      function prototypes) (JDK1.2 only)&lt;/li&gt;
- &lt;li&gt;stubs - generate C declarations from the Java object file (used with old)&lt;/li&gt;
- &lt;li&gt;verbose - causes javah to print a message to stdout concerning the status
-     of the generated files&lt;/li&gt;
- &lt;li&gt;extdirs - Override location of installed extensions&lt;/li&gt;
- &lt;/ul&gt;
- Of these arguments, either &lt;b&gt;outputFile&lt;/b&gt; or &lt;b&gt;destdir&lt;/b&gt; is required,
- but not both. More than one classname may be specified, using a comma-separated
- list or by using &lt;code&gt;&amp;lt;class name="xxx"&amp;gt;&lt;/code&gt; elements within the task.
- &lt;p&gt;
- When this task executes, it will generate C header and source files that
- are needed to implement native methods.
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="bootclasspathref" type="org.apache.tools.ant.types.Reference" briefType="Reference" required="NOTDEFINED">
-        
-          <short-description>Adds a reference to a classpath defined elsewhere.</short-description>
-        
-          <description>
-          Adds a reference to a classpath defined elsewhere.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="bootclasspath" type="org.apache.tools.ant.types.Path" briefType="Path" required="no">
-        
-          <short-description>Location of bootstrap class files.</short-description>
-        
-          <description>
-          location of bootstrap class files.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="class" type="java.lang.String" briefType="String" required="yes">
-        
-          <short-description>The fully-qualified name of the class (or classes, separated by commas).</short-description>
-        
-          <description>
-          the fully-qualified name of the class (or classes, separated by commas).
-        </description>
-      
-        </attribute>
-      
-        <attribute name="classpath" type="org.apache.tools.ant.types.Path" briefType="Path" required="no">
-        
-          <short-description>The classpath to use.</short-description>
-        
-          <description>
-          the classpath to use.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="classpathref" type="org.apache.tools.ant.types.Reference" briefType="Reference" required="NOTDEFINED">
-        
-          <short-description>Adds a reference to a classpath defined elsewhere.</short-description>
-        
-          <description>
-          Adds a reference to a classpath defined elsewhere.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="destdir" type="java.io.File" briefType="File" required="">
-        
-          <short-description>Destination directory into which the Java source
- files should be compiled.</short-description>
-        
-          <description>
-          Set the destination directory into which the Java source
- files should be compiled.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="force" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>If true, output files should always be written (JDK1.2 only).</short-description>
-        
-          <description>
-          If true, output files should always be written (JDK1.2 only).
-        </description>
-      
-        </attribute>
-      
-        <attribute name="old" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>If true, specifies that old JDK1.0-style header files should be
- generated.
- (otherwise output file contain JNI-style native method function prototypes) (JDK1.2 only).</short-description>
-        
-          <description>
-          If true, specifies that old JDK1.0-style header files should be
- generated.
- (otherwise output file contain JNI-style native method function prototypes) (JDK1.2 only)
-        </description>
-      
-        </attribute>
-      
-        <attribute name="outputfile" type="java.io.File" briefType="File" required="yes">
-        
-          <short-description>Concatenates the resulting header or source files for all
- the classes listed into this file.</short-description>
-        
-          <description>
-          Concatenates the resulting header or source files for all
- the classes listed into this file.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="stubs" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>If true, generate C declarations from the Java object file (used with old).</short-description>
-        
-          <description>
-          If true, generate C declarations from the Java object file (used with old).
-        </description>
-      
-        </attribute>
-      
-        <attribute name="verbose" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>If true, causes Javah to print a message concerning
- the status of the generated files.</short-description>
-        
-          <description>
-          If true, causes Javah to print a message concerning
- the status of the generated files.
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-      
-        <element name="bootclasspath" type="org.apache.tools.ant.types.Path" briefType="Path" required="NOTDEFINED">
-        
-          <short-description>Adds path to bootstrap class files.</short-description>
-        
-          <description>
-          Adds path to bootstrap class files.
-        </description>
-      
-        </element>
-
-      
-        <element name="class" type="org.apache.tools.ant.taskdefs.optional.Javah.ClassArgument" briefType="" required="NOTDEFINED">
-        
-          <short-description>Adds class to process.</short-description>
-        
-          <description>
-          Adds class to process.
-        </description>
-      
-        </element>
-
-      
-        <element name="classpath" type="org.apache.tools.ant.types.Path" briefType="Path" required="NOTDEFINED">
-        
-          <short-description>Path to use for classpath.</short-description>
-        
-          <description>
-          Path to use for classpath.
-        </description>
-      
-        </element>
-
-    
-      </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="jdepend" category="other" classname="org.apache.tools.ant.taskdefs.optional.jdepend.JDependTask">
-
-  
-    <short-description>Runs JDepend tests.</short-description>
-  
-    <description>
-    Runs JDepend tests.
-
- &lt;p&gt;JDepend is a tool to generate design quality metrics for each Java package.
- It has been initially created by Mike Clark. JDepend can be found at &lt;a
- href="http://www.clarkware.com/software/JDepend.html"&gt;http://www.clarkware.com/software/JDepend.html&lt;/a&gt;.
-
- The current implementation spawn a new Java VM.
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="classpath" type="org.apache.tools.ant.types.Path" briefType="Path" required="NOTDEFINED">
-        
-          <short-description>Classpath to be used for this compilation.</short-description>
-        
-          <description>
-          Set the classpath to be used for this compilation.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="classpathref" type="org.apache.tools.ant.types.Reference" briefType="Reference" required="no">
-        
-          <short-description>Adds a reference to a classpath defined elsewhere.</short-description>
-        
-          <description>
-          Adds a reference to a classpath defined elsewhere.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="dir" type="java.io.File" briefType="File" required="no">
-        
-          <short-description>The directory to invoke the VM in.</short-description>
-        
-          <description>
-          The directory to invoke the VM in. Ignored if no JVM is forked.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="fork" type="boolean" briefType="boolean" required="no, default is &quot;off&quot;">
-        
-          <short-description>If true, forks into a new JVM.</short-description>
-        
-          <description>
-          If true, forks into a new JVM. Default: false.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="format" type="org.apache.tools.ant.taskdefs.optional.jdepend.JDependTask.FormatAttribute" briefType="&quot;xml&quot;, &quot;text&quot;" required="no">
-        
-          <short-description>The format to write the output in, "xml" or "text".</short-description>
-        
-          <description>
-          The format to write the output in, "xml" or "text".
-        </description>
-      
-        </attribute>
-      
-        <attribute name="haltonerror" type="boolean" briefType="boolean" required="no, default is &quot;off&quot;">
-        
-          <short-description>Whether or not to halt on failure.</short-description>
-        
-          <description>
-          Whether or not to halt on failure. Default: false.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="jvm" type="java.lang.String" briefType="String" required="no, default &quot;java&quot;">
-        
-          <short-description>The command used to invoke a forked Java Virtual Machine.</short-description>
-        
-          <description>
-          The command used to invoke a forked Java Virtual Machine.
-
- Default is &lt;tt&gt;java&lt;/tt&gt;. Ignored if no JVM is forked.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="outputfile" type="java.io.File" briefType="File" required="no">
-        
-          <short-description>The output file name.</short-description>
-        
-          <description>
-          The output file name.
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-      
-        <element name="classpath" type="org.apache.tools.ant.types.Path" briefType="Path" required="NOTDEFINED">
-        
-          <short-description>Adds a path to the classpath.</short-description>
-        
-          <description>
-          Adds a path to the classpath.
-        </description>
-      
-        </element>
-
-      
-        <element name="sourcespath" type="org.apache.tools.ant.types.Path" briefType="Path" required="NOTDEFINED">
-        
-          <short-description>Adds a path to source code to analyze.</short-description>
-        
-          <description>
-          Adds a path to source code to analyze.
-        </description>
-      
-        </element>
-
-    
-      </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="jjtree" category="other" classname="org.apache.tools.ant.taskdefs.optional.javacc.JJTree">
-
-  
-    <short-description>Runs the JJTree compiler compiler.</short-description>
-  
-    <description>
-    Runs the JJTree compiler compiler.
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="buildnodefiles" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>BUILD_NODE_FILES grammar option.</short-description>
-        
-          <description>
-          Sets the BUILD_NODE_FILES grammar option.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="javacchome" type="java.io.File" briefType="File" required="yes">
-        
-          <short-description>The directory containing the JavaCC distribution.</short-description>
-        
-          <description>
-          The directory containing the JavaCC distribution.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="multi" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>MULTI grammar option.</short-description>
-        
-          <description>
-          Sets the MULTI grammar option.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="nodedefaultvoid" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>NODE_DEFAULT_VOID grammar option.</short-description>
-        
-          <description>
-          Sets the NODE_DEFAULT_VOID grammar option.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="nodefactory" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>NODE_FACTORY grammar option.</short-description>
-        
-          <description>
-          Sets the NODE_FACTORY grammar option.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="nodepackage" type="java.lang.String" briefType="String" required="no">
-        
-          <short-description>NODE_PACKAGE grammar option.</short-description>
-        
-          <description>
-          Sets the NODE_PACKAGE grammar option.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="nodeprefix" type="java.lang.String" briefType="String" required="no">
-        
-          <short-description>NODE_PREFIX grammar option.</short-description>
-        
-          <description>
-          Sets the NODE_PREFIX grammar option.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="nodescopehook" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>NODE_SCOPE_HOOK grammar option.</short-description>
-        
-          <description>
-          Sets the NODE_SCOPE_HOOK grammar option.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="nodeusesparser" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>NODE_USES_PARSER grammar option.</short-description>
-        
-          <description>
-          Sets the NODE_USES_PARSER grammar option.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="outputdirectory" type="java.io.File" briefType="File" required="no">
-        
-          <short-description>The directory to write the generated file to.</short-description>
-        
-          <description>
-          The directory to write the generated file to.
- If not set, the files are written to the directory
- containing the grammar file.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="static" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>STATIC grammar option.</short-description>
-        
-          <description>
-          Sets the STATIC grammar option.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="target" type="java.io.File" briefType="File" required="yes">
-        
-          <short-description>The jjtree grammar file to process.</short-description>
-        
-          <description>
-          The jjtree grammar file to process.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="visitor" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>VISITOR grammar option.</short-description>
-        
-          <description>
-          Sets the VISITOR grammar option.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="visitorexception" type="java.lang.String" briefType="String" required="no">
-        
-          <short-description>VISITOR_EXCEPTION grammar option.</short-description>
-        
-          <description>
-          Sets the VISITOR_EXCEPTION grammar option.
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-    </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="jpcoverage" category="metrics" classname="org.apache.tools.ant.taskdefs.optional.sitraka.Coverage">
-
-  
-    <short-description>Runs Sitraka JProbe Coverage.</short-description>
-  
-    <description>
-    Runs Sitraka JProbe Coverage.
-
- Options are pretty numerous, you'd better check the manual for a full
- descriptions of options. (not that simple since they differ from the online
- help, from the usage command line and from the examples...)
- &lt;p&gt;
- For additional information, visit &lt;a href="http://www.sitraka.com"&gt;www.sitraka.com&lt;/a&gt;
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="applet" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          <short-description>If true, run an applet.</short-description>
-        
-          <description>
-          If true, run an applet.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="classname" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Classname to run as standalone or runner for filesets.</short-description>
-        
-          <description>
-          classname to run as standalone or runner for filesets.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="exitprompt" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Toggles display of the console prompt: always, error, never.</short-description>
-        
-          <description>
-          Toggles display of the console prompt: always, error, never
-        </description>
-      
-        </attribute>
-      
-        <attribute name="finalsnapshot" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Type of snapshot to send at program termination: none, coverage, all.</short-description>
-        
-          <description>
-          Type of snapshot to send at program termination: none, coverage, all.
- Can be null, default to none
-        </description>
-      
-        </attribute>
-      
-        <attribute name="home" type="java.io.File" briefType="File" required="NOTDEFINED">
-        
-          <short-description>The directory where JProbe is installed.</short-description>
-        
-          <description>
-          The directory where JProbe is installed.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="javaexe" type="java.io.File" briefType="File" required="NOTDEFINED">
-        
-          <short-description>Path to the java executable.</short-description>
-        
-          <description>
-          Path to the java executable.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="recordfromstart" type="org.apache.tools.ant.taskdefs.optional.sitraka.Coverage.Recordfromstart" briefType="&quot;coverage&quot;, &quot;none&quot;, &quot;all&quot;" required="NOTDEFINED">
-        
-          <short-description>"all", "coverage",  or "none".</short-description>
-        
-          <description>
-          "all", "coverage",  or "none".
-        </description>
-      
-        </attribute>
-      
-        <attribute name="seedname" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Seed name for snapshot file.</short-description>
-        
-          <description>
-          seed name for snapshot file. Can be null, default to snap
-        </description>
-      
-        </attribute>
-      
-        <attribute name="snapshotdir" type="java.io.File" briefType="File" required="NOTDEFINED">
-        
-          <short-description>The path to the directory where snapshot files are stored.</short-description>
-        
-          <description>
-          The path to the directory where snapshot files are stored.
- Choose a directory that is reachable by both the remote
- and local computers, and enter the same path on the command-line
- and in the viewer.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="tracknatives" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          <short-description>If true, track native methods.</short-description>
-        
-          <description>
-          If true, track native methods.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="vm" type="org.apache.tools.ant.taskdefs.optional.sitraka.Coverage.Javavm" briefType="&quot;java2&quot;, &quot;jdk118&quot;, &quot;jdk117&quot;" required="NOTDEFINED">
-        
-          <short-description>Indicates which virtual machine to run: "jdk117", "jdk118" or "java2".</short-description>
-        
-          <description>
-          Indicates which virtual machine to run: "jdk117", "jdk118" or "java2".
- Can be null, default to "java2".
-        </description>
-      
-        </attribute>
-      
-        <attribute name="warnlevel" type="java.lang.Integer" briefType="int" required="NOTDEFINED">
-        
-          <short-description>Set warning level (0-3, where 0 is the least amount of warnings).</short-description>
-        
-          <description>
-          Set warning level (0-3, where 0 is the least amount of warnings).
-        </description>
-      
-        </attribute>
-      
-        <attribute name="workingdir" type="java.io.File" briefType="File" required="NOTDEFINED">
-        
-          <short-description>The physical path to the working directory for the VM.</short-description>
-        
-          <description>
-          The physical path to the working directory for the VM.
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-      
-        <element name="fileset" type="org.apache.tools.ant.types.FileSet" briefType="Fileset" required="NOTDEFINED">
-        
-          <short-description>The classnames to execute.</short-description>
-        
-          <description>
-          the classnames to execute.
-        </description>
-      
-        </element>
-
-      
-        <element name="arg" type="org.apache.tools.ant.types.Commandline.Argument" briefType="" required="NOTDEFINED">
-        
-          <short-description>Adds a command argument.</short-description>
-        
-          <description>
-          Adds a command argument.
-        </description>
-      
-        </element>
-
-      
-        <element name="classpath" type="org.apache.tools.ant.types.Path" briefType="Path" required="NOTDEFINED">
-        
-          <short-description>Classpath to run the files.</short-description>
-        
-          <description>
-          classpath to run the files.
-        </description>
-      
-        </element>
-
-      
-        <element name="filters" type="org.apache.tools.ant.taskdefs.optional.sitraka.Filters" briefType="" required="NOTDEFINED">
-        
-          <short-description>Defines class/method filters based on pattern matching.</short-description>
-        
-          <description>
-          Defines class/method filters based on pattern matching.
- The syntax is filters is similar to a fileset.
-        </description>
-      
-        </element>
-
-      
-        <element name="jvmarg" type="org.apache.tools.ant.types.Commandline.Argument" briefType="" required="NOTDEFINED">
-        
-          <short-description>Adds a JVM argument.</short-description>
-        
-          <description>
-          Adds a JVM argument.
-        </description>
-      
-        </element>
-
-      
-        <element name="socket" type="org.apache.tools.ant.taskdefs.optional.sitraka.Socket" briefType="" required="NOTDEFINED">
-        
-          <short-description>Define a host and port to connect to if you want to do
- remote viewing.</short-description>
-        
-          <description>
-          Define a host and port to connect to if you want to do
- remote viewing.
-        </description>
-      
-        </element>
-
-      
-        <element name="triggers" type="org.apache.tools.ant.taskdefs.optional.sitraka.Triggers" briefType="" required="NOTDEFINED">
-        
-          <short-description>Defines events to use for interacting with the
- collection of data performed during coverage.</short-description>
-        
-          <description>
-          Defines events to use for interacting with the
- collection of data performed during coverage.
-
- For example you may run a whole application but only decide
- to collect data once it reaches a certain method and once it
- exits another one.
-        </description>
-      
-        </element>
-
-    
-      </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="jpcovmerge" category="metrics" classname="org.apache.tools.ant.taskdefs.optional.sitraka.CovMerge">
-
-  
-    <short-description>Runs the snapshot merge utility for JProbe Coverage.</short-description>
-  
-    <description>
-    Runs the snapshot merge utility for JProbe Coverage.
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="home" type="java.io.File" briefType="File" required="NOTDEFINED">
-        
-          <short-description>The directory where JProbe is installed.</short-description>
-        
-          <description>
-          The directory where JProbe is installed.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="tofile" type="java.io.File" briefType="File" required="NOTDEFINED">
-        
-          <short-description>Output snapshot file.</short-description>
-        
-          <description>
-          Set the output snapshot file.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="verbose" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          <short-description>If true, perform the merge in verbose mode giving details
- about the snapshot processing.</short-description>
-        
-          <description>
-          If true, perform the merge in verbose mode giving details
- about the snapshot processing.
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-      
-        <element name="fileset" type="org.apache.tools.ant.types.FileSet" briefType="Fileset" required="NOTDEFINED">
-        
-          <short-description>Add a fileset containing the snapshots to include.</short-description>
-        
-          <description>
-          add a fileset containing the snapshots to include.
-        </description>
-      
-        </element>
-
-    
-      </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="jpcovreport" category="metrics" classname="org.apache.tools.ant.taskdefs.optional.sitraka.CovReport">
-
-  
-    <short-description>Runs the JProbe Coverage 3.0 snapshot merge utility.</short-description>
-  
-    <description>
-    Runs the JProbe Coverage 3.0 snapshot merge utility.
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="format" type="org.apache.tools.ant.taskdefs.optional.sitraka.CovReport.ReportFormat" briefType="&quot;html&quot;, &quot;text&quot;, &quot;xml&quot;" required="NOTDEFINED">
-        
-          <short-description>Format of the report: "html", "text", or "xml".</short-description>
-        
-          <description>
-          set the format of the report: "html", "text", or "xml"
-        </description>
-      
-        </attribute>
-      
-        <attribute name="home" type="java.io.File" briefType="File" required="NOTDEFINED">
-        
-          <short-description>The directory where JProbe is installed.</short-description>
-        
-          <description>
-          The directory where JProbe is installed.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="includesource" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          <short-description>If true, include text of the source code lines.</short-description>
-        
-          <description>
-          If true, include text of the source code lines.
- Only applies to format="xml" and type="verydetailed"
-        </description>
-      
-        </attribute>
-      
-        <attribute name="percent" type="java.lang.Integer" briefType="int" required="NOTDEFINED">
-        
-          <short-description>A numeric value for the threshold for printing methods.</short-description>
-        
-          <description>
-          A numeric value for the threshold for printing methods.
- Must be between 0 and 100.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="snapshot" type="java.io.File" briefType="File" required="NOTDEFINED">
-        
-          <short-description>The name of the snapshot file that is the source to the report.</short-description>
-        
-          <description>
-          The name of the snapshot file that is the source to the report.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="tofile" type="java.io.File" briefType="File" required="NOTDEFINED">
-        
-          <short-description>The name of the generated output file.</short-description>
-        
-          <description>
-          The name of the generated output file.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="type" type="org.apache.tools.ant.taskdefs.optional.sitraka.CovReport.ReportType" briefType="&quot;executive&quot;, &quot;summary&quot;, &quot;detailed&quot;, &quot;verydetailed&quot;" required="NOTDEFINED">
-        
-          <short-description>The type of report to be generated: "executive", "summary",
- "detailed" or "verydetailed".</short-description>
-        
-          <description>
-          The type of report to be generated: "executive", "summary",
- "detailed" or "verydetailed".
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-      
-        <element name="reference" type="org.apache.tools.ant.taskdefs.optional.sitraka.CovReport.Reference" briefType="" required="NOTDEFINED">
-        
-          <short-description>Adds a set of classes whose coverage information will be
- checked against.</short-description>
-        
-          <description>
-          Adds a set of classes whose coverage information will be
- checked against.
-        </description>
-      
-        </element>
-
-      
-        <element name="sourcepath" type="org.apache.tools.ant.types.Path" briefType="Path" required="NOTDEFINED">
-        
-          <short-description>Adds a path to source files.</short-description>
-        
-          <description>
-          Adds a path to source files.
-        </description>
-      
-        </element>
-
-    
-      </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="jspc" category="other" classname="org.apache.tools.ant.taskdefs.optional.jsp.JspC" matchingTask="true">
-
-  
-    <short-description>Runs a JSP compiler.</short-description>
-  
-    <description>
-    Runs a JSP compiler.
-
- &lt;p&gt; This task takes the given jsp files and compiles them into java
- files. It is then up to the user to compile the java files into classes.
-
- &lt;p&gt; The task requires the srcdir and destdir attributes to be
- set. This Task is a MatchingTask, so the files to be compiled can be
- specified using includes/excludes attributes or nested include/exclude
- elements. Optional attributes are verbose (set the verbosity level passed
- to jasper), package (name of the destination package for generated java
- classes and classpath (the classpath to use when running the jsp
- compiler).
- &lt;p&gt; This task supports the nested elements classpath (A Path) and
- classpathref (A Reference) which can be used in preference to the
- attribute classpath, if the jsp compiler is not already in the ant
- classpath.
-
- &lt;p&gt;&lt;h4&gt;Usage&lt;/h4&gt;
- &lt;pre&gt;
- &amp;lt;jspc srcdir="${basedir}/src/war"
-       destdir="${basedir}/gensrc"
-       package="com.i3sp.jsp"
-       verbose="9"&amp;gt;
-   &amp;lt;include name="**\/*.jsp" /&amp;gt;
- &amp;lt;/jspc&amp;gt;
- &lt;/pre&gt;
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="classpath" type="org.apache.tools.ant.types.Path" briefType="Path" required="no">
-        
-          <short-description>Classpath to be used for this compilation.</short-description>
-        
-          <description>
-          Set the classpath to be used for this compilation.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="classpathref" type="org.apache.tools.ant.types.Reference" briefType="Reference" required="no">
-        
-          <short-description>Adds a reference to a classpath defined elsewhere.</short-description>
-        
-          <description>
-          Adds a reference to a classpath defined elsewhere
-        </description>
-      
-        </attribute>
-      
-        <attribute name="compiler" type="java.lang.String" briefType="String" required="no">
-        
-          <short-description>Class name of a JSP compiler adapter.</short-description>
-        
-          <description>
-          Class name of a JSP compiler adapter.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="compilerclasspath" type="org.apache.tools.ant.types.Path" briefType="Path" required="no">
-        
-          <short-description>Classpath to be used to find this compiler adapter.</short-description>
-        
-          <description>
-          Set the classpath to be used to find this compiler adapter
-        </description>
-      
-        </attribute>
-      
-        <attribute name="destdir" type="java.io.File" briefType="File" required="yes">
-        
-          <short-description>Destination directory into which the JSP source
- files should be compiled.</short-description>
-        
-          <description>
-          Set the destination directory into which the JSP source
- files should be compiled.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="failonerror" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>Whether or not the build should halt if compilation fails.</short-description>
-        
-          <description>
-          Whether or not the build should halt if compilation fails.
- Defaults to &lt;code&gt;true&lt;/code&gt;.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="ieplugin" type="java.lang.String" briefType="String" required="no">
-        
-          <short-description>Java Plugin CLASSID for Internet Explorer.</short-description>
-        
-          <description>
-          Java Plugin CLASSID for Internet Explorer
-        </description>
-      
-        </attribute>
-      
-        <attribute name="mapped" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>If true, generate separate write() calls for each HTML line
- in the JSP.</short-description>
-        
-          <description>
-          If true, generate separate write() calls for each HTML line
- in the JSP.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="package" type="java.lang.String" briefType="String" required="no">
-        
-          <short-description>Name of the package the compiled jsp files should be in.</short-description>
-        
-          <description>
-          Set the name of the package the compiled jsp files should be in.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="srcdir" type="org.apache.tools.ant.types.Path" briefType="Path" required="yes">
-        
-          <short-description>Path for source JSP files.</short-description>
-        
-          <description>
-          Path for source JSP files.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="uribase" type="java.io.File" briefType="File" required="no">
-        
-          <short-description>The URI context of relative URI references in the JSP pages.</short-description>
-        
-          <description>
-          The URI context of relative URI references in the JSP pages.
- If it does not exist then it is derived from the location
- of the file relative to the declared or derived value of uriroot.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="uriroot" type="java.io.File" briefType="File" required="no">
-        
-          <short-description>The root directory that uri files should be resolved
-  against.</short-description>
-        
-          <description>
-          The root directory that uri files should be resolved
-  against. (Default is the directory jspc is invoked from)
-        </description>
-      
-        </attribute>
-      
-        <attribute name="verbose" type="int" briefType="int" required="no">
-        
-          <short-description>Verbose level of the compiler.</short-description>
-        
-          <description>
-          Set the verbose level of the compiler
-        </description>
-      
-        </attribute>
-      
-        <attribute name="webinc" type="java.io.File" briefType="File" required="NOTDEFINED">
-        
-          <short-description>Output filename for the fraction of web.xml that lists
-  servlets.</short-description>
-        
-          <description>
-          output filename for the fraction of web.xml that lists
-  servlets.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="webxml" type="java.io.File" briefType="File" required="NOTDEFINED">
-        
-          <short-description>Filename for web.xml.</short-description>
-        
-          <description>
-          Filename for web.xml.
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-      
-        <element name="webapp" type="org.apache.tools.ant.taskdefs.optional.jsp.JspC.WebAppParameter" briefType="" required="NOTDEFINED">
-        
-          <short-description>Adds a single webapp.</short-description>
-        
-          <description>
-          Adds a single webapp.
-        </description>
-      
-        </element>
-
-      
-        <element name="classpath" type="org.apache.tools.ant.types.Path" briefType="Path" required="NOTDEFINED">
-        
-          <short-description>Adds a path to the classpath.</short-description>
-        
-          <description>
-          Adds a path to the classpath.
-        </description>
-      
-        </element>
-
-      
-        <element name="compilerclasspath" type="org.apache.tools.ant.types.Path" briefType="Path" required="NOTDEFINED">
-        
-          <short-description>Support nested compiler classpath, used to locate compiler adapter.</short-description>
-        
-          <description>
-          Support nested compiler classpath, used to locate compiler adapter
-        </description>
-      
-        </element>
-
-    
-      </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="junit" category="other" classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTask">
-
-  
-    <short-description>Runs JUnit tests.</short-description>
-  
-    <description>
-    Runs JUnit tests.
-
- &lt;p&gt; JUnit is a framework to create unit test. It has been initially
- created by Erich Gamma and Kent Beck.  JUnit can be found at &lt;a
- href="http://www.junit.org"&gt;http://www.junit.org&lt;/a&gt;.
-
- &lt;p&gt; &lt;code&gt;JUnitTask&lt;/code&gt; can run a single specific
- &lt;code&gt;JUnitTest&lt;/code&gt; using the &lt;code&gt;test&lt;/code&gt; element.&lt;/p&gt;
- For example, the following target &lt;code&gt;&lt;pre&gt;
-   &amp;lt;target name="test-int-chars" depends="jar-test"&amp;gt;
-       &amp;lt;echo message="testing international characters"/&amp;gt;
-       &amp;lt;junit printsummary="no" haltonfailure="yes" fork="false"&amp;gt;
-           &amp;lt;classpath refid="classpath"/&amp;gt;
-           &amp;lt;formatter type="plain" usefile="false" /&amp;gt;
-           &amp;lt;test name="org.apache.ecs.InternationalCharTest" /&amp;gt;
-       &amp;lt;/junit&amp;gt;
-   &amp;lt;/target&amp;gt;
- &lt;/pre&gt;&lt;/code&gt;
- &lt;p&gt;runs a single junit test
- (&lt;code&gt;org.apache.ecs.InternationalCharTest&lt;/code&gt;) in the current
- VM using the path with id &lt;code&gt;classpath&lt;/code&gt; as classpath and
- presents the results formatted using the standard
- &lt;code&gt;plain&lt;/code&gt; formatter on the command line.&lt;/p&gt;
-
- &lt;p&gt; This task can also run batches of tests.  The
- &lt;code&gt;batchtest&lt;/code&gt; element creates a &lt;code&gt;BatchTest&lt;/code&gt;
- based on a fileset.  This allows, for example, all classes found in
- directory to be run as testcases.&lt;/p&gt;
-
- &lt;p&gt;For example,&lt;/p&gt;&lt;code&gt;&lt;pre&gt;
- &amp;lt;target name="run-tests" depends="dump-info,compile-tests" if="junit.present"&amp;gt;
-   &amp;lt;junit printsummary="no" haltonfailure="yes" fork="${junit.fork}"&amp;gt;
-     &amp;lt;jvmarg value="-classic"/&amp;gt;
-     &amp;lt;classpath refid="tests-classpath"/&amp;gt;
-     &amp;lt;sysproperty key="build.tests" value="${build.tests}"/&amp;gt;
-     &amp;lt;formatter type="brief" usefile="false" /&amp;gt;
-     &amp;lt;batchtest&amp;gt;
-       &amp;lt;fileset dir="${tests.dir}"&amp;gt;
-         &amp;lt;include name="**&amp;#047;*Test*" /&amp;gt;
-       &amp;lt;/fileset&amp;gt;
-     &amp;lt;/batchtest&amp;gt;
-   &amp;lt;/junit&amp;gt;
- &amp;lt;/target&amp;gt;
- &lt;/pre&gt;&lt;/code&gt;
- &lt;p&gt;this target finds any classes with a &lt;code&gt;test&lt;/code&gt; directory
- anywhere in their path (under the top &lt;code&gt;${tests.dir}&lt;/code&gt;, of
- course) and creates &lt;code&gt;JUnitTest&lt;/code&gt;'s for each one.&lt;/p&gt;
-
- &lt;p&gt; Of course, &lt;code&gt;&amp;lt;junit&amp;gt;&lt;/code&gt; and
- &lt;code&gt;&amp;lt;batch&amp;gt;&lt;/code&gt; elements can be combined for more
- complex tests. For an example, see the ant &lt;code&gt;build.xml&lt;/code&gt;
- target &lt;code&gt;run-tests&lt;/code&gt; (the second example is an edited
- version).&lt;/p&gt;
-
- &lt;p&gt; To spawn a new Java VM to prevent interferences between
- different testcases, you need to enable &lt;code&gt;fork&lt;/code&gt;.  A
- number of attributes and elements allow you to set up how this JVM
- runs.
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="dir" type="java.io.File" briefType="File" required="no">
-        
-          <short-description>The directory to invoke the VM in.</short-description>
-        
-          <description>
-          The directory to invoke the VM in. Ignored if no JVM is forked.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="errorproperty" type="java.lang.String" briefType="String" required="no">
-        
-          <short-description>Property to set to "true" if there is a error in a test.</short-description>
-        
-          <description>
-          Property to set to "true" if there is a error in a test.
-
- &lt;p&gt;This property is applied on all BatchTest (batchtest) and
- JUnitTest (test), however, it can possibly be overriden by
- their own properties.&lt;/p&gt;
-        </description>
-      
-        </attribute>
-      
-        <attribute name="failureproperty" type="java.lang.String" briefType="String" required="no.">
-        
-          <short-description>Property to set to "true" if there is a failure in a test.</short-description>
-        
-          <description>
-          Property to set to "true" if there is a failure in a test.
-
- &lt;p&gt;This property is applied on all BatchTest (batchtest) and
- JUnitTest (test), however, it can possibly be overriden by
- their own properties.&lt;/p&gt;
-        </description>
-      
-        </attribute>
-      
-        <attribute name="filtertrace" type="boolean" briefType="boolean" required="no; default is on.">
-        
-          <short-description>If true, smartly filter the stack frames of
- JUnit errors and failures before reporting them.</short-description>
-        
-          <description>
-          If true, smartly filter the stack frames of
- JUnit errors and failures before reporting them.
-
- &lt;p&gt;This property is applied on all BatchTest (batchtest) and
- JUnitTest (test) however it can possibly be overridden by their
- own properties.&lt;/p&gt;
-        </description>
-      
-        </attribute>
-      
-        <attribute name="fork" type="boolean" briefType="boolean" required="no; default is off.">
-        
-          <short-description>If true, JVM should be forked for each test.</short-description>
-        
-          <description>
-          If true, JVM should be forked for each test.
-
- &lt;p&gt;It avoids interference between testcases and possibly avoids
- hanging the build.  this property is applied on all BatchTest
- (batchtest) and JUnitTest (test) however it can possibly be
- overridden by their own properties.&lt;/p&gt;
-        </description>
-      
-        </attribute>
-      
-        <attribute name="haltonerror" type="boolean" briefType="boolean" required="no; default is off.">
-        
-          <short-description>If true, stop the build process when there is an error in a test.</short-description>
-        
-          <description>
-          If true, stop the build process when there is an error in a test.
- This property is applied on all BatchTest (batchtest) and JUnitTest
- (test) however it can possibly be overridden by their own
- properties.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="haltonfailure" type="boolean" briefType="boolean" required="no; default is off.">
-        
-          <short-description>If true, stop the build process if a test fails
- (errors are considered failures as well).</short-description>
-        
-          <description>
-          If true, stop the build process if a test fails
- (errors are considered failures as well).
- This property is applied on all BatchTest (batchtest) and
- JUnitTest (test) however it can possibly be overridden by their
- own properties.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="includeantruntime" type="boolean" briefType="boolean" required="no; default is true.">
-        
-          <short-description>If true, include ant.jar, optional.jar and junit.jar in the forked VM.</short-description>
-        
-          <description>
-          If true, include ant.jar, optional.jar and junit.jar in the forked VM.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="jvm" type="java.lang.String" briefType="String" required="no; default is java.">
-        
-          <short-description>The command used to invoke the Java Virtual Machine,
- default is 'java'.</short-description>
-        
-          <description>
-          The command used to invoke the Java Virtual Machine,
- default is 'java'. The command is resolved by
- java.lang.Runtime.exec(). Ignored if fork is disabled.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="maxmemory" type="java.lang.String" briefType="String" required="no">
-        
-          <short-description>Maximum memory to be used by all forked JVMs.</short-description>
-        
-          <description>
-          Set the maximum memory to be used by all forked JVMs.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="newenvironment" type="boolean" briefType="boolean" required="no; default is false.">
-        
-          <short-description>If true, use a new environment when forked.</short-description>
-        
-          <description>
-          If true, use a new environment when forked.
-
- &lt;p&gt;Will be ignored if we are not forking a new VM.&lt;/p&gt;
-        </description>
-      
-        </attribute>
-      
-        <attribute name="printsummary" type="org.apache.tools.ant.taskdefs.optional.junit.JUnitTask.SummaryAttribute" briefType="&quot;true&quot;, &quot;yes&quot;, &quot;false&quot;, &quot;no&quot;, &quot;on&quot;, &quot;off&quot;, &quot;withOutAndErr&quot;" required="no; default is off.">
-        
-          <short-description>If true, print one-line statistics for each test, or "withOutAndErr"
- to also show standard output and error.</short-description>
-        
-          <description>
-          If true, print one-line statistics for each test, or "withOutAndErr"
- to also show standard output and error.
-
- Can take the values on, off, and withOutAndErr.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="showoutput" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>If true, send any output generated by tests to Ant's logging system
- as well as to the formatters.</short-description>
-        
-          <description>
-          If true, send any output generated by tests to Ant's logging system
- as well as to the formatters.
- By default only the formatters receive the output.
-
- &lt;p&gt;Output will always be passed to the formatters and not by
- shown by default.  This option should for example be set for
- tests that are interactive and prompt the user to do
- something.&lt;/p&gt;
-        </description>
-      
-        </attribute>
-      
-        <attribute name="timeout" type="java.lang.Integer" briefType="int" required="no">
-        
-          <short-description>Timeout value (in milliseconds).</short-description>
-        
-          <description>
-          Set the timeout value (in milliseconds).
-
- &lt;p&gt;If the test is running for more than this value, the test
- will be canceled. (works only when in 'fork' mode).&lt;/p&gt;
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-      
-        <element name="env" type="org.apache.tools.ant.types.Environment.Variable" briefType="" required="NOTDEFINED">
-        
-          <short-description>Adds an environment variable; used when forking.</short-description>
-        
-          <description>
-          Adds an environment variable; used when forking.
-
- &lt;p&gt;Will be ignored if we are not forking a new VM.&lt;/p&gt;
-        </description>
-      
-        </element>
-
-      
-        <element name="formatter" type="org.apache.tools.ant.taskdefs.optional.junit.FormatterElement" briefType="" required="NOTDEFINED">
-        
-          <short-description>Add a new formatter to all tests of this task.</short-description>
-        
-          <description>
-          Add a new formatter to all tests of this task.
-        </description>
-      
-        </element>
-
-      
-        <element name="sysproperty" type="org.apache.tools.ant.types.Environment.Variable" briefType="" required="NOTDEFINED">
-        
-          <short-description>Adds a system property that tests can access.</short-description>
-        
-          <description>
-          Adds a system property that tests can access.
- This might be useful to tranfer Ant properties to the
- testcases when JVM forking is not enabled.
-        </description>
-      
-        </element>
-
-      
-        <element name="test" type="org.apache.tools.ant.taskdefs.optional.junit.JUnitTest" briefType="" required="NOTDEFINED">
-        
-          <short-description>Add a new single testcase.</short-description>
-        
-          <description>
-          Add a new single testcase.
-        </description>
-      
-        </element>
-
-      
-        <element name="batchtest" type="org.apache.tools.ant.taskdefs.optional.junit.BatchTest" briefType="" required="NOTDEFINED">
-        
-          <short-description>Adds a set of tests based on pattern matching.</short-description>
-        
-          <description>
-          Adds a set of tests based on pattern matching.
-        </description>
-      
-        </element>
-
-      
-        <element name="classpath" type="org.apache.tools.ant.types.Path" briefType="Path" required="NOTDEFINED">
-        
-          <short-description>Adds path to classpath used for tests.</short-description>
-        
-          <description>
-          Adds path to classpath used for tests.
-        </description>
-      
-        </element>
-
-      
-        <element name="jvmarg" type="org.apache.tools.ant.types.Commandline.Argument" briefType="" required="NOTDEFINED">
-        
-          <short-description>Adds a JVM argument; ignored if not forking.</short-description>
-        
-          <description>
-          Adds a JVM argument; ignored if not forking.
-        </description>
-      
-        </element>
-
-    
-      </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="junitreport" category="testing" classname="org.apache.tools.ant.taskdefs.optional.junit.XMLResultAggregator">
-
-  
-    <short-description>Aggregates all &amp;lt;junit&amp;gt; XML formatter testsuite data under a specific directory and transforms the results via XSLT.</short-description>
-  
-    <description>
-    Aggregates all &amp;lt;junit&amp;gt; XML formatter testsuite data under
- a specific directory and transforms the results via XSLT.
- It is not particulary clean but
- should be helpful while I am thinking about another technique.
-
- &lt;p&gt; The main problem is due to the fact that a JVM can be forked for a testcase
- thus making it impossible to aggregate all testcases since the listener is
- (obviously) in the forked JVM. A solution could be to write a
- TestListener that will receive events from the TestRunner via sockets. This
- is IMHO the simplest way to do it to avoid this file hacking thing.
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="todir" type="java.io.File" briefType="File" required="NOTDEFINED">
-        
-          <short-description>Destination directory where the results should be written.</short-description>
-        
-          <description>
-          Set the destination directory where the results should be written. If not
- set if will use {@link #DEFAULT_DIR}. When given a relative directory
- it will resolve it from the project directory.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="tofile" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Name of the aggregegated results file.</short-description>
-        
-          <description>
-          Set the name of the aggregegated results file. It must be relative
- from the &lt;tt&gt;todir&lt;/tt&gt; attribute. If not set it will use {@link #DEFAULT_FILENAME}
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-      
-        <element name="fileset" type="org.apache.tools.ant.types.FileSet" briefType="Fileset" required="NOTDEFINED">
-        
-          <short-description>Add a new fileset containing the XML results to aggregate.</short-description>
-        
-          <description>
-          Add a new fileset containing the XML results to aggregate
-        </description>
-      
-        </element>
-
-      
-        <element name="report" type="org.apache.tools.ant.taskdefs.optional.junit.AggregateTransformer" briefType="" required="NOTDEFINED">
-        
-          <short-description>Generate a report based on the document created by the merge.</short-description>
-        
-          <description>
-          Generate a report based on the document created by the merge.
-        </description>
-      
-        </element>
-
-    
-      </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="keysubst" category="other" classname="org.apache.tools.ant.taskdefs.KeySubst" deprecated="true">
-
-  
-    <short-description>Keyword substitution.</short-description>
-  
-    <description>
-    Keyword substitution. Input file is written to output file.
- Do not make input file same as output file.
- Keywords in input files look like this: @foo@. See the docs for the 
- setKeys method to understand how to do the substitutions.
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="dest" type="java.io.File" briefType="File" required="NOTDEFINED">
-        
-          <short-description>Destination file.</short-description>
-        
-          <description>
-          Set the destination file.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="keys" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Keys.</short-description>
-        
-          <description>
-          Sets the keys.
-Format string is like this:
-&lt;p&gt;
-name=value*name2=value
-&lt;p&gt;
-Names are case sensitive.
-&lt;p&gt;
-Use the setSep() method to change the * to something else
-if you need to use * as a name or value.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="sep" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Seperator between name=value arguments
-in setKeys().</short-description>
-        
-          <description>
-          Sets the seperator between name=value arguments
-in setKeys(). By default it is "*".
-        </description>
-      
-        </attribute>
-      
-        <attribute name="src" type="java.io.File" briefType="File" required="NOTDEFINED">
-        
-          <short-description>Source file.</short-description>
-        
-          <description>
-          Set the source file.
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-    </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="loadfile" category="utility" classname="org.apache.tools.ant.taskdefs.LoadFile">
-
-  
-    <short-description>Load a file into a property</short-description>
-  
-    <description>
-    Load a file into a property
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="encoding" type="java.lang.String" briefType="String" required="no">
-        
-          <short-description>Encoding to use for input, defaults to the platform's default
- encoding.</short-description>
-        
-          <description>
-          Encoding to use for input, defaults to the platform's default
- encoding. &lt;p&gt;
-
- For a list of possible values see &lt;a href="http://java.sun.com/products/jdk/1.2/docs/guide/internat/encoding.doc.html"&gt;
- http://java.sun.com/products/jdk/1.2/docs/guide/internat/encoding.doc.html
- &lt;/a&gt;.&lt;/p&gt;
-        </description>
-      
-        </attribute>
-      
-        <attribute name="failonerror" type="boolean" briefType="boolean" required="no, default &quot;true&quot;">
-        
-          <short-description>If true, fail on load error.</short-description>
-        
-          <description>
-          If true, fail on load error.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="property" type="java.lang.String" briefType="String" required="yes">
-        
-          <short-description>Property name to save to.</short-description>
-        
-          <description>
-          Property name to save to.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="srcfile" type="java.io.File" briefType="File" required="yes">
-        
-          <short-description>File to load.</short-description>
-        
-          <description>
-          Sets the file to load.
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-      
-        <element name="filterchain" type="org.apache.tools.ant.types.FilterChain" briefType="FilterChain" required="NOTDEFINED">
-        
-          <short-description>Add the FilterChain element.</short-description>
-        
-          <description>
-          Add the FilterChain element.
-        </description>
-      
-        </element>
-
-    
-      </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="loadproperties" category="utility" classname="org.apache.tools.ant.taskdefs.LoadProperties">
-
-  
-    <short-description>Load a file's contents as Ant properties.</short-description>
-  
-    <description>
-    Load a file's contents as Ant properties.
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="srcfile" type="java.io.File" briefType="File" required="yes">
-        
-          <short-description>File to load.</short-description>
-        
-          <description>
-          Sets the file to load.
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-      
-        <element name="filterchain" type="org.apache.tools.ant.types.FilterChain" briefType="FilterChain" required="NOTDEFINED">
-        
-          <short-description>Adds a FilterChain.</short-description>
-        
-          <description>
-          Adds a FilterChain.
-        </description>
-      
-        </element>
-
-    
-      </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="mail" category="network" classname="org.apache.tools.ant.taskdefs.email.EmailTask">
-
-  
-    <short-description>A task to send SMTP email.</short-description>
-  
-    <description>
-    A task to send SMTP email. This is a refactoring of the SendMail and
- MimeMail tasks such that both are within a single task.
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="bcclist" type="java.lang.String" briefType="String" required="">
-        
-          <short-description>Adds "bcc" address elements.</short-description>
-        
-          <description>
-          Adds "bcc" address elements
-        </description>
-      
-        </attribute>
-      
-        <attribute name="cclist" type="java.lang.String" briefType="String" required="">
-        
-          <short-description>Adds "cc" address elements.</short-description>
-        
-          <description>
-          Adds "cc" address elements
-        </description>
-      
-        </attribute>
-      
-        <attribute name="encoding" type="org.apache.tools.ant.taskdefs.email.EmailTask.Encoding" briefType="&quot;auto&quot;, &quot;mime&quot;, &quot;uu&quot;, &quot;plain&quot;" required="no">
-        
-          <short-description>Allows the build writer to choose the preferred encoding method.</short-description>
-        
-          <description>
-          Allows the build writer to choose the preferred encoding method
-        </description>
-      
-        </attribute>
-      
-        <attribute name="failonerror" type="boolean" briefType="boolean" required="no.">
-        
-          <short-description>Indicates whether BuildExceptions should be passed back to the core.</short-description>
-        
-          <description>
-          Indicates whether BuildExceptions should be passed back to the core
-        </description>
-      
-        </attribute>
-      
-        <attribute name="files" type="java.lang.String" briefType="String" required="no">
-        
-          <short-description>Adds a list of files to be attached.</short-description>
-        
-          <description>
-          Adds a list of files to be attached
-        </description>
-      
-        </attribute>
-      
-        <attribute name="from" type="java.lang.String" briefType="String" required="either a from attribute, or a &lt;from&gt;      element.">
-        
-          <short-description>Shorthand to set the from address element.</short-description>
-        
-          <description>
-          Shorthand to set the from address element
-        </description>
-      
-        </attribute>
-      
-        <attribute name="includefilenames" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>Sets Includefilenames attribute.</short-description>
-        
-          <description>
-          Sets Includefilenames attribute
-        </description>
-      
-        </attribute>
-      
-        <attribute name="mailhost" type="java.lang.String" briefType="String" required="no">
-        
-          <short-description>Host.</short-description>
-        
-          <description>
-          Sets the host
-        </description>
-      
-        </attribute>
-      
-        <attribute name="mailport" type="int" briefType="int" required="no">
-        
-          <short-description>Mail server port.</short-description>
-        
-          <description>
-          Sets the mail server port
-        </description>
-      
-        </attribute>
-      
-        <attribute name="message" type="java.lang.String" briefType="String" required="one of these or a      &lt;message&gt; element.">
-        
-          <short-description>Shorthand method to set the message.</short-description>
-        
-          <description>
-          Shorthand method to set the message
-        </description>
-      
-        </attribute>
-      
-        <attribute name="messagefile" type="java.io.File" briefType="File" required="">
-        
-          <short-description>Shorthand method to set the message from a file.</short-description>
-        
-          <description>
-          Shorthand method to set the message from a file
-        </description>
-      
-        </attribute>
-      
-        <attribute name="messagemimetype" type="java.lang.String" briefType="String" required="no">
-        
-          <short-description>Shorthand method to set type of the text message, text/plain by default
- but text/html or text/xml is quite feasible.</short-description>
-        
-          <description>
-          Shorthand method to set type of the text message, text/plain by default
- but text/html or text/xml is quite feasible.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="subject" type="java.lang.String" briefType="String" required="no">
-        
-          <short-description>Subject line of the email.</short-description>
-        
-          <description>
-          Sets the subject line of the email
-        </description>
-      
-        </attribute>
-      
-        <attribute name="tolist" type="java.lang.String" briefType="String" required="at least one of these, or the         equivalent elements.">
-        
-          <short-description>Adds "to" address elements.</short-description>
-        
-          <description>
-          Adds "to" address elements
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-      
-        <element name="bcc" type="org.apache.tools.ant.taskdefs.email.EmailAddress" briefType="" required="NOTDEFINED">
-        
-          <short-description>Adds "bcc" address elements.</short-description>
-        
-          <description>
-          Adds "bcc" address elements
-        </description>
-      
-        </element>
-
-      
-        <element name="cc" type="org.apache.tools.ant.taskdefs.email.EmailAddress" briefType="" required="NOTDEFINED">
-        
-          <short-description>Adds "cc" address element.</short-description>
-        
-          <description>
-          Adds "cc" address element
-        </description>
-      
-        </element>
-
-      
-        <element name="fileset" type="org.apache.tools.ant.types.FileSet" briefType="Fileset" required="NOTDEFINED">
-        
-          <short-description>Adds a set of files (nested fileset attribute).</short-description>
-        
-          <description>
-          Adds a set of files (nested fileset attribute).
-        </description>
-      
-        </element>
-
-      
-        <element name="from" type="org.apache.tools.ant.taskdefs.email.EmailAddress" briefType="" required="NOTDEFINED">
-        
-          <short-description>Adds a from address element.</short-description>
-        
-          <description>
-          Adds a from address element
-        </description>
-      
-        </element>
-
-      
-        <element name="message" type="org.apache.tools.ant.taskdefs.email.Message" briefType="" required="NOTDEFINED">
-        
-          <short-description>Add a message elemnt.</short-description>
-        
-          <description>
-          Add a message elemnt
-        </description>
-      
-        </element>
-
-      
-        <element name="to" type="org.apache.tools.ant.taskdefs.email.EmailAddress" briefType="" required="NOTDEFINED">
-        
-          <short-description>Adds a to address element.</short-description>
-        
-          <description>
-          Adds a to address element
-        </description>
-      
-        </element>
-
-    
-      </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="manifest" category="java" classname="org.apache.tools.ant.taskdefs.ManifestTask">
-
-  
-    <short-description>Creates a manifest file for inclusion in a JAR, Ant task wrapper around</short-description>
-  
-    <description>
-    Creates a manifest file for inclusion in a JAR, Ant task wrapper
- around {@link Manifest Manifest}.  This task can be used to write a
- Manifest file, optionally replacing or updating an existing file.
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="file" type="java.io.File" briefType="File" required="yes">
-        
-          <short-description>The name of the manifest file to create/update.</short-description>
-        
-          <description>
-          The name of the manifest file to create/update.
- Required if used as a task.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="mode" type="org.apache.tools.ant.taskdefs.ManifestTask.Mode" briefType="&quot;update&quot;, &quot;replace&quot;" required="no">
-        
-          <short-description>Update policy: either "update" or "replace"; default is "replace".</short-description>
-        
-          <description>
-          Update policy: either "update" or "replace"; default is "replace".
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-      
-        <element name="attribute" type="org.apache.tools.ant.taskdefs.Manifest.Attribute" briefType="" required="NOTDEFINED">
-        
-          <short-description>Add an attribute to the manifest - it is added to the main section.</short-description>
-        
-          <description>
-          Add an attribute to the manifest - it is added to the main section.
-        </description>
-      
-        </element>
-
-      
-        <element name="section" type="org.apache.tools.ant.taskdefs.Manifest.Section" briefType="" required="NOTDEFINED">
-        
-          <short-description>Add a section to the manifest.</short-description>
-        
-          <description>
-          Add a section to the manifest
-        </description>
-      
-        </element>
-
-    
-      </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="maudit" category="other" classname="org.apache.tools.ant.taskdefs.optional.metamata.MAudit">
-
-  
-    <short-description>Invokes the Metamata Audit/ Webgain Quality Analyzer on a set of Java files.</short-description>
-  
-    <description>
-    Invokes the Metamata Audit/ Webgain Quality Analyzer on a set of Java files.
- &lt;p&gt;
- &lt;i&gt;maudit&lt;/i&gt; performs static analysis of the Java source code and byte code files to find and report
- errors of style and potential problems related to performance, maintenance and robustness.
-  As a convenience, a stylesheet is given in &lt;tt&gt;etc&lt;/tt&gt; directory, so that an HTML report 
- can be generated from the XML file.
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="fix" type="boolean" briefType="boolean" required="no.default to false.">
-        
-          <short-description>Automatically fix certain errors 
- (those marked as fixable in the manual);
- optional, default=false.</short-description>
-        
-          <description>
-          Automatically fix certain errors 
- (those marked as fixable in the manual);
- optional, default=false
-        </description>
-      
-        </attribute>
-      
-        <attribute name="list" type="boolean" briefType="boolean" required="no. default to false.">
-        
-          <short-description>Creates listing file for each audited file; optional, default false.</short-description>
-        
-          <description>
-          Creates listing file for each audited file; optional, default false. 
- When set, a .maudit file will be generated in the
- same location as the source file.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="maxmemory" type="java.lang.String" briefType="String" required="no">
-        
-          <short-description>Maximum memory for the JVM; optional.</short-description>
-        
-          <description>
-          Set the maximum memory for the JVM; optional.
- -mx or -Xmx depending on VM version
-        </description>
-      
-        </attribute>
-      
-        <attribute name="metamatahome" type="java.io.File" briefType="File" required="yes">
-        
-          <short-description>The home directory containing the Metamata distribution; required.</short-description>
-        
-          <description>
-          The home directory containing the Metamata distribution; required
-        </description>
-      
-        </attribute>
-      
-        <attribute name="tofile" type="java.io.File" briefType="File" required="yes">
-        
-          <short-description>The XML file to which the Audit result should be written to; required.</short-description>
-        
-          <description>
-          The XML file to which the Audit result should be written to; required
-        </description>
-      
-        </attribute>
-      
-        <attribute name="unused" type="boolean" briefType="boolean" required="no. default to false.">
-        
-          <short-description>Finds declarations unused in search paths; optional, default false.</short-description>
-        
-          <description>
-          Finds declarations unused in search paths; optional, default false. 
- It will look for unused global declarations
- in the source code within a use domain specified by the 
- &lt;tt&gt;searchpath&lt;/tt&gt; element.
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-      
-        <element name="fileset" type="org.apache.tools.ant.types.FileSet" briefType="Fileset" required="NOTDEFINED">
-        
-          <short-description>The java files or directory to audit.</short-description>
-        
-          <description>
-          The java files or directory to audit.
- Whatever the filter is, only the files that end 
- with .java will be included for processing. 
- Note that the base directory used for the fileset 
- MUST be the root of the source files otherwise package names
- deduced from the file path will be incorrect.
-        </description>
-      
-        </element>
-
-      
-        <element name="classpath" type="org.apache.tools.ant.types.Path" briefType="Path" required="NOTDEFINED">
-        
-          <short-description>Class path (also source path unless one explicitly set).</short-description>
-        
-          <description>
-          Sets the class path (also source path unless one explicitly set).
- Overrides METAPATH/CLASSPATH environment variables.
-        </description>
-      
-        </element>
-
-      
-        <element name="jvmarg" type="org.apache.tools.ant.types.Commandline.Argument" briefType="" required="NOTDEFINED">
-        
-          <short-description>Additional optional parameters to pass to the JVM.</short-description>
-        
-          <description>
-          Additional optional parameters to pass to the JVM. 
- You can avoid using the  &lt;code&gt;&amp;lt;jvmarg&amp;gt;&lt;/code&gt; by adding these empty 
- entries to &lt;code&gt;metamata.properties&lt;/code&gt; located at &lt;code&gt;${metamata.home}/bin&lt;/code&gt;
-
- &lt;pre&gt;metamata.classpath=
- metamata.sourcepath=
- metamata.baseclasspath=
- &lt;/pre&gt;
-        </description>
-      
-        </element>
-
-      
-        <element name="rulespath" type="org.apache.tools.ant.types.Path" briefType="Path" required="NOTDEFINED">
-        
-          <short-description>Classpath for additional audit rules
- these must be placed before metamata.jar !!.</short-description>
-        
-          <description>
-          classpath for additional audit rules
- these must be placed before metamata.jar !!
-        </description>
-      
-        </element>
-
-      
-        <element name="searchpath" type="org.apache.tools.ant.types.Path" briefType="Path" required="NOTDEFINED">
-        
-          <short-description>Search path to use for unused global declarations; 
- required when &lt;tt&gt;unused&lt;/tt&gt; is set.</short-description>
-        
-          <description>
-          search path to use for unused global declarations; 
- required when &lt;tt&gt;unused&lt;/tt&gt; is set.
-        </description>
-      
-        </element>
-
-      
-        <element name="sourcepath" type="org.apache.tools.ant.types.Path" briefType="Path" required="NOTDEFINED">
-        
-          <short-description>Source path.</short-description>
-        
-          <description>
-          Sets the source path. 
- Overrides the SOURCEPATH environment variable.
-        </description>
-      
-        </element>
-
-    
-      </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="mimemail" category="other" classname="org.apache.tools.ant.taskdefs.optional.net.MimeMail" deprecated="true">
-
-  
-    <short-description>A task to send SMTP email; Use &lt;tt&gt;mail&lt;/tt&gt; instead</short-description>
-  
-    <description>
-    A task to send SMTP email; Use &lt;tt&gt;mail&lt;/tt&gt; instead
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="bcclist" type="java.lang.String" briefType="String" required="">
-        
-          <short-description>Adds "bcc" address elements.</short-description>
-        
-          <description>
-          Adds "bcc" address elements
-        </description>
-      
-        </attribute>
-      
-        <attribute name="cclist" type="java.lang.String" briefType="String" required="">
-        
-          <short-description>Adds "cc" address elements.</short-description>
-        
-          <description>
-          Adds "cc" address elements
-        </description>
-      
-        </attribute>
-      
-        <attribute name="encoding" type="org.apache.tools.ant.taskdefs.email.EmailTask.Encoding" briefType="&quot;auto&quot;, &quot;mime&quot;, &quot;uu&quot;, &quot;plain&quot;" required="NOTDEFINED">
-        
-          <short-description>Allows the build writer to choose the preferred encoding method.</short-description>
-        
-          <description>
-          Allows the build writer to choose the preferred encoding method
-        </description>
-      
-        </attribute>
-      
-        <attribute name="failonerror" type="boolean" briefType="boolean" required="no, default to &quot;true&quot;">
-        
-          <short-description>Indicates whether BuildExceptions should be passed back to the core.</short-description>
-        
-          <description>
-          Indicates whether BuildExceptions should be passed back to the core
-        </description>
-      
-        </attribute>
-      
-        <attribute name="files" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Adds a list of files to be attached.</short-description>
-        
-          <description>
-          Adds a list of files to be attached
-        </description>
-      
-        </attribute>
-      
-        <attribute name="from" type="java.lang.String" briefType="String" required="yes">
-        
-          <short-description>Shorthand to set the from address element.</short-description>
-        
-          <description>
-          Shorthand to set the from address element
-        </description>
-      
-        </attribute>
-      
-        <attribute name="includefilenames" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          <short-description>Sets Includefilenames attribute.</short-description>
-        
-          <description>
-          Sets Includefilenames attribute
-        </description>
-      
-        </attribute>
-      
-        <attribute name="mailhost" type="java.lang.String" briefType="String" required="no, default to &quot;localhost&quot;">
-        
-          <short-description>Host.</short-description>
-        
-          <description>
-          Sets the host
-        </description>
-      
-        </attribute>
-      
-        <attribute name="mailport" type="int" briefType="int" required="NOTDEFINED">
-        
-          <short-description>Mail server port.</short-description>
-        
-          <description>
-          Sets the mail server port
-        </description>
-      
-        </attribute>
-      
-        <attribute name="message" type="java.lang.String" briefType="String" required="no, but only one of of &apos;message&apos; or        &apos;messagefile&apos; may be specified. if not specified, a fileset must be        provided.">
-        
-          <short-description>Shorthand method to set the message.</short-description>
-        
-          <description>
-          Shorthand method to set the message
-        </description>
-      
-        </attribute>
-      
-        <attribute name="messagefile" type="java.io.File" briefType="File" required="">
-        
-          <short-description>Shorthand method to set the message from a file.</short-description>
-        
-          <description>
-          Shorthand method to set the message from a file
-        </description>
-      
-        </attribute>
-      
-        <attribute name="messagemimetype" type="java.lang.String" briefType="String" required="no, defaults to &quot;text/plain&quot;">
-        
-          <short-description>Shorthand method to set type of the text message, text/plain by default
- but text/html or text/xml is quite feasible.</short-description>
-        
-          <description>
-          Shorthand method to set type of the text message, text/plain by default
- but text/html or text/xml is quite feasible.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="subject" type="java.lang.String" briefType="String" required="no">
-        
-          <short-description>Subject line of the email.</short-description>
-        
-          <description>
-          Sets the subject line of the email
-        </description>
-      
-        </attribute>
-      
-        <attribute name="tolist" type="java.lang.String" briefType="String" required="yes, at least one of &apos;tolist&apos;, &apos;cclist&apos;,        or &apos;bcclist&apos; must be specified.">
-        
-          <short-description>Adds "to" address elements.</short-description>
-        
-          <description>
-          Adds "to" address elements
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-      
-        <element name="bcc" type="org.apache.tools.ant.taskdefs.email.EmailAddress" briefType="" required="NOTDEFINED">
-        
-          <short-description>Adds "bcc" address elements.</short-description>
-        
-          <description>
-          Adds "bcc" address elements
-        </description>
-      
-        </element>
-
-      
-        <element name="cc" type="org.apache.tools.ant.taskdefs.email.EmailAddress" briefType="" required="NOTDEFINED">
-        
-          <short-description>Adds "cc" address element.</short-description>
-        
-          <description>
-          Adds "cc" address element
-        </description>
-      
-        </element>
-
-      
-        <element name="fileset" type="org.apache.tools.ant.types.FileSet" briefType="Fileset" required="NOTDEFINED">
-        
-          <short-description>Adds a set of files (nested fileset attribute).</short-description>
-        
-          <description>
-          Adds a set of files (nested fileset attribute).
-        </description>
-      
-        </element>
-
-      
-        <element name="from" type="org.apache.tools.ant.taskdefs.email.EmailAddress" briefType="" required="NOTDEFINED">
-        
-          <short-description>Adds a from address element.</short-description>
-        
-          <description>
-          Adds a from address element
-        </description>
-      
-        </element>
-
-      
-        <element name="message" type="org.apache.tools.ant.taskdefs.email.Message" briefType="" required="NOTDEFINED">
-        
-          <short-description>Add a message elemnt.</short-description>
-        
-          <description>
-          Add a message elemnt
-        </description>
-      
-        </element>
-
-      
-        <element name="to" type="org.apache.tools.ant.taskdefs.email.EmailAddress" briefType="" required="NOTDEFINED">
-        
-          <short-description>Adds a to address element.</short-description>
-        
-          <description>
-          Adds a to address element
-        </description>
-      
-        </element>
-
-    
-      </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="mkdir" category="filesystem" classname="org.apache.tools.ant.taskdefs.Mkdir">
-
-  
-    <short-description>Creates a given directory.</short-description>
-  
-    <description>
-    Creates a given directory.
- Creates a directory and any non-existent parent directories, when
- necessary
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="dir" type="java.io.File" briefType="File" required="yes">
-        
-          <short-description>The directory to create; required.</short-description>
-        
-          <description>
-          the directory to create; required.
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-    </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="mmetrics" category="other" classname="org.apache.tools.ant.taskdefs.optional.metamata.MMetrics">
-
-  
-    <short-description>Computes the metrics of a set of Java files and write the results to an XML file.</short-description>
-  
-    <description>
-    Computes the metrics of a set of Java files and write the results to an XML
- file. As a convenience, a stylesheet is given in &lt;tt&gt;etc&lt;/tt&gt; directory,
- so that an HTML report can be generated from the XML file.
- &lt;p&gt;
- You will not be able to use this task with the evaluation version since
- as of Metamata 2.0, Metrics does not support command line :-(
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="granularity" type="org.apache.tools.ant.taskdefs.optional.metamata.MMetrics.GranularityAttribute" briefType="&quot;compilation-units&quot;, &quot;files&quot;, &quot;methods&quot;, &quot;types&quot;, &quot;packages&quot;" required="yes">
-        
-          <short-description>Granularity of the audit.</short-description>
-        
-          <description>
-          set the granularity of the audit. Should be one of 'files', 'methods'
- or 'types'.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="maxmemory" type="java.lang.String" briefType="String" required="no">
-        
-          <short-description>Maximum memory for the JVM; optional.</short-description>
-        
-          <description>
-          Set the maximum memory for the JVM; optional.
- -mx or -Xmx depending on VM version
-        </description>
-      
-        </attribute>
-      
-        <attribute name="metamatahome" type="java.io.File" briefType="File" required="yes">
-        
-          <short-description>The home directory containing the Metamata distribution; required.</short-description>
-        
-          <description>
-          The home directory containing the Metamata distribution; required
-        </description>
-      
-        </attribute>
-      
-        <attribute name="tofile" type="java.io.File" briefType="File" required="yes">
-        
-          <short-description>Output XML file.</short-description>
-        
-          <description>
-          Set the output XML file
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-      
-        <element name="fileset" type="org.apache.tools.ant.types.FileSet" briefType="Fileset" required="NOTDEFINED">
-        
-          <short-description>The java files or directory to audit.</short-description>
-        
-          <description>
-          The java files or directory to audit.
- Whatever the filter is, only the files that end 
- with .java will be included for processing. 
- Note that the base directory used for the fileset 
- MUST be the root of the source files otherwise package names
- deduced from the file path will be incorrect.
-        </description>
-      
-        </element>
-
-      
-        <element name="classpath" type="org.apache.tools.ant.types.Path" briefType="Path" required="NOTDEFINED">
-        
-          <short-description>Class path (also source path unless one explicitly set).</short-description>
-        
-          <description>
-          Sets the class path (also source path unless one explicitly set).
- Overrides METAPATH/CLASSPATH environment variables.
-        </description>
-      
-        </element>
-
-      
-        <element name="jvmarg" type="org.apache.tools.ant.types.Commandline.Argument" briefType="" required="NOTDEFINED">
-        
-          <short-description>Additional optional parameters to pass to the JVM.</short-description>
-        
-          <description>
-          Additional optional parameters to pass to the JVM. 
- You can avoid using the  &lt;code&gt;&amp;lt;jvmarg&amp;gt;&lt;/code&gt; by adding these empty 
- entries to &lt;code&gt;metamata.properties&lt;/code&gt; located at &lt;code&gt;${metamata.home}/bin&lt;/code&gt;
-
- &lt;pre&gt;metamata.classpath=
- metamata.sourcepath=
- metamata.baseclasspath=
- &lt;/pre&gt;
-        </description>
-      
-        </element>
-
-      
-        <element name="path" type="org.apache.tools.ant.types.Path" briefType="Path" required="NOTDEFINED">
-        
-          <short-description>New path (directory) to measure metrics from.</short-description>
-        
-          <description>
-          Set a new path (directory) to measure metrics from.
-        </description>
-      
-        </element>
-
-      
-        <element name="sourcepath" type="org.apache.tools.ant.types.Path" briefType="Path" required="NOTDEFINED">
-        
-          <short-description>Source path.</short-description>
-        
-          <description>
-          Sets the source path. 
- Overrides the SOURCEPATH environment variable.
-        </description>
-      
-        </element>
-
-    
-      </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="move" category="filesystem" classname="org.apache.tools.ant.taskdefs.Move">
-
-  
-    <short-description>Moves a file or directory to a new file or directory.</short-description>
-  
-    <description>
-    Moves a file or directory to a new file or directory.
- By default, the
- destination file is overwritten if it already exists.
- When &lt;i&gt;overwrite&lt;/i&gt; is
- turned off, then files are only moved if the source file is
- newer than the destination file, or when the destination file does
- not exist.
-
- &lt;p&gt;Source files and directories are only deleted when the file or
- directory has been copied to the destination successfully.  Filtering
- also works.&lt;/p&gt;
-
- &lt;p&gt;This implementation is based on Arnout Kuiper's initial design
- document, the following mailing list discussions, and the
- copyfile/copydir tasks.&lt;/p&gt;
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="encoding" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Character encoding.</short-description>
-        
-          <description>
-          Sets the character encoding
-        </description>
-      
-        </attribute>
-      
-        <attribute name="failonerror" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          <short-description>If false, note errors to the output but keep going.</short-description>
-        
-          <description>
-          If false, note errors to the output but keep going.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="file" type="java.io.File" briefType="File" required="one of file or       at least one nested fileset element">
-        
-          <short-description>Single source file to copy.</short-description>
-        
-          <description>
-          Sets a single source file to copy.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="filtering" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>If true, enables filtering.</short-description>
-        
-          <description>
-          If true, enables filtering.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="flatten" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>When copying directory trees, the files can be "flattened"
- into a single directory.</short-description>
-        
-          <description>
-          When copying directory trees, the files can be "flattened"
- into a single directory.  If there are multiple files with
- the same name in the source directory tree, only the first
- file will be copied into the "flattened" directory, unless
- the forceoverwrite attribute is true.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="includeemptydirs" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>Used to copy empty directories.</short-description>
-        
-          <description>
-          Used to copy empty directories.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="overwrite" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>Overwrite any existing destination file(s).</short-description>
-        
-          <description>
-          Overwrite any existing destination file(s).
-        </description>
-      
-        </attribute>
-      
-        <attribute name="preservelastmodified" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          <short-description>Give the copied files the same last modified time as the original files.</short-description>
-        
-          <description>
-          Give the copied files the same last modified time as the original files.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="todir" type="java.io.File" briefType="File" required="">
-        
-          <short-description>Destination directory.</short-description>
-        
-          <description>
-          Sets the destination directory.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="tofile" type="java.io.File" briefType="File" required="with the file attribute,      either tofile or todir can be used.  with nested filesets,      if the fileset size is greater than 1 or if the only entry in the fileset is a      directory or if the file attribute is already specified, only      todir is allowed">
-        
-          <short-description>Destination file.</short-description>
-        
-          <description>
-          Sets the destination file.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="verbose" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          <short-description>Used to force listing of all names of copied files.</short-description>
-        
-          <description>
-          Used to force listing of all names of copied files.
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-      
-        <element name="fileset" type="org.apache.tools.ant.types.FileSet" briefType="Fileset" required="NOTDEFINED">
-        
-          <short-description>Adds a set of files to copy.</short-description>
-        
-          <description>
-          Adds a set of files to copy.
-        </description>
-      
-        </element>
-
-      
-        <element name="filterchain" type="org.apache.tools.ant.types.FilterChain" briefType="FilterChain" required="NOTDEFINED">
-        
-          <short-description>Adds a FilterChain.</short-description>
-        
-          <description>
-          Adds a FilterChain.
-        </description>
-      
-        </element>
-
-      
-        <element name="filterset" type="org.apache.tools.ant.types.FilterSet" briefType="Filterset" required="NOTDEFINED">
-        
-          <short-description>Adds a filterset.</short-description>
-        
-          <description>
-          Adds a filterset.
-        </description>
-      
-        </element>
-
-      
-        <element name="mapper" type="org.apache.tools.ant.types.Mapper" briefType="Mapper" required="NOTDEFINED">
-        
-          <short-description>Defines the mapper to map source to destination files.</short-description>
-        
-          <description>
-          Defines the mapper to map source to destination files.
-        </description>
-      
-        </element>
-
-    
-      </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="mparse" category="other" classname="org.apache.tools.ant.taskdefs.optional.metamata.MParse">
-
-  
-    <short-description>Simple Metamata MParse task.</short-description>
-  
-    <description>
-    Simple Metamata MParse task.
- Based on the original written by
- &lt;a href="mailto:thomas.haas@softwired-inc.com"&gt;Thomas Haas&lt;/a&gt;.
- This version was written for Metamata 2.0 available at
- &lt;a href="http://www.metamata.com"&gt;http://www.metamata.com&lt;/a&gt;
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="cleanup" type="boolean" briefType="boolean" required="no. default to false">
-        
-          <short-description>Remove the intermediate Sun JavaCC file 
- ; optional, default false.</short-description>
-        
-          <description>
-          Remove the intermediate Sun JavaCC file 
- ; optional, default false.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="debugparser" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>Set parser debug mode; optional, default false.</short-description>
-        
-          <description>
-          set parser debug mode; optional, default false
-        </description>
-      
-        </attribute>
-      
-        <attribute name="debugscanner" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>Set scanner debug mode; optional, default false.</short-description>
-        
-          <description>
-          set scanner debug mode; optional, default false
-        </description>
-      
-        </attribute>
-      
-        <attribute name="maxmemory" type="java.lang.String" briefType="String" required="no">
-        
-          <short-description>Maximum memory for the JVM; optional.</short-description>
-        
-          <description>
-          Set the maximum memory for the JVM; optional.
- -mx or -Xmx depending on VM version
-        </description>
-      
-        </attribute>
-      
-        <attribute name="metamatahome" type="java.io.File" briefType="File" required="yes">
-        
-          <short-description>The home directory containing the Metamata distribution; required.</short-description>
-        
-          <description>
-          The home directory containing the Metamata distribution; required
-        </description>
-      
-        </attribute>
-      
-        <attribute name="target" type="java.io.File" briefType="File" required="yes">
-        
-          <short-description>The .jj file to process; required.</short-description>
-        
-          <description>
-          The .jj file to process; required.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="verbose" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>Set verbose mode; optional, default false.</short-description>
-        
-          <description>
-          set verbose mode; optional, default false
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-      
-        <element name="classpath" type="org.apache.tools.ant.types.Path" briefType="Path" required="NOTDEFINED">
-        
-          <short-description>Create a classpath entry.</short-description>
-        
-          <description>
-          create a classpath entry
-        </description>
-      
-        </element>
-
-      
-        <element name="jvmarg" type="org.apache.tools.ant.types.Commandline.Argument" briefType="" required="NOTDEFINED">
-        
-          <short-description>Additional optional parameters to pass to the JVM.</short-description>
-        
-          <description>
-          Additional optional parameters to pass to the JVM.
-        </description>
-      
-        </element>
-
-      
-        <element name="sourcepath" type="org.apache.tools.ant.types.Path" briefType="Path" required="NOTDEFINED">
-        
-          <short-description>Creates a sourcepath entry.</short-description>
-        
-          <description>
-          creates a sourcepath entry
-        </description>
-      
-        </element>
-
-    
-      </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="native2ascii" category="other" classname="org.apache.tools.ant.taskdefs.optional.Native2Ascii" matchingTask="true">
-
-  
-    <short-description>Converts files from native encodings to ASCII.</short-description>
-  
-    <description>
-    Converts files from native encodings to ASCII.
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="dest" type="java.io.File" briefType="File" required="yes">
-        
-          <short-description>Destination directory to place converted files into.</short-description>
-        
-          <description>
-          Set the destination directory to place converted files into.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="encoding" type="java.lang.String" briefType="String" required="no">
-        
-          <short-description>Encoding to translate to/from.</short-description>
-        
-          <description>
-          Set the encoding to translate to/from.
- If unset, the default encoding for the JVM is used.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="ext" type="java.lang.String" briefType="String" required="no">
-        
-          <short-description>Extension which converted files should have.</short-description>
-        
-          <description>
-          Set the extension which converted files should have.
- If unset, files will not be renamed.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="reverse" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>Flag the conversion to run in the reverse sense,
- that is Ascii to Native encoding.</short-description>
-        
-          <description>
-          Flag the conversion to run in the reverse sense,
- that is Ascii to Native encoding.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="src" type="java.io.File" briefType="File" required="no">
-        
-          <short-description>Source directory in which to find files to convert.</short-description>
-        
-          <description>
-          Set the source directory in which to find files to convert.
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-      
-        <element name="mapper" type="org.apache.tools.ant.types.Mapper" briefType="Mapper" required="NOTDEFINED">
-        
-          <short-description>Defines the FileNameMapper to use (nested mapper element).</short-description>
-        
-          <description>
-          Defines the FileNameMapper to use (nested mapper element).
-        </description>
-      
-        </element>
-
-    
-      </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="netrexxc" category="other" classname="org.apache.tools.ant.taskdefs.optional.NetRexxC" matchingTask="true">
-
-  
-    <short-description>Compiles NetRexx source files.</short-description>
-  
-    <description>
-    Compiles NetRexx source files.
- This task can take the following
- arguments:
- &lt;ul&gt;
- &lt;li&gt;binary&lt;/li&gt;
- &lt;li&gt;classpath&lt;/li&gt;
- &lt;li&gt;comments&lt;/li&gt;
- &lt;li&gt;compile&lt;/li&gt;
- &lt;li&gt;console&lt;/li&gt;
- &lt;li&gt;crossref&lt;/li&gt;
- &lt;li&gt;decimal&lt;/li&gt;
- &lt;li&gt;destdir&lt;/li&gt;
- &lt;li&gt;diag&lt;/li&gt;
- &lt;li&gt;explicit&lt;/li&gt;
- &lt;li&gt;format&lt;/li&gt;
- &lt;li&gt;keep&lt;/li&gt;
- &lt;li&gt;logo&lt;/li&gt;
- &lt;li&gt;replace&lt;/li&gt;
- &lt;li&gt;savelog&lt;/li&gt;
- &lt;li&gt;srcdir&lt;/li&gt;
- &lt;li&gt;sourcedir&lt;/li&gt;
- &lt;li&gt;strictargs&lt;/li&gt;
- &lt;li&gt;strictassign&lt;/li&gt;
- &lt;li&gt;strictcase&lt;/li&gt;
- &lt;li&gt;strictimport&lt;/li&gt;
- &lt;li&gt;symbols&lt;/li&gt;
- &lt;li&gt;time&lt;/li&gt;
- &lt;li&gt;trace&lt;/li&gt;
- &lt;li&gt;utf8&lt;/li&gt;
- &lt;li&gt;verbose&lt;/li&gt;
- &lt;li&gt;suppressMethodArgumentNotUsed&lt;/li&gt;
- &lt;li&gt;suppressPrivatePropertyNotUsed&lt;/li&gt;
- &lt;li&gt;suppressVariableNotUsed&lt;/li&gt;
- &lt;li&gt;suppressExceptionNotSignalled&lt;/li&gt;
- &lt;li&gt;suppressDeprecation&lt;/li&gt;
- &lt;/ul&gt;
- Of these arguments, the &lt;b&gt;srcdir&lt;/b&gt; argument is required.
-
- &lt;p&gt;When this task executes, it will recursively scan the srcdir
- looking for NetRexx source files to compile. This task makes its
- compile decision based on timestamp.
- &lt;p&gt;Before files are compiled they and any other file in the
- srcdir will be copied to the destdir allowing support files to be
- located properly in the classpath. The reason for copying the source files
- before the compile is that NetRexxC has only two destinations for classfiles:
- &lt;ol&gt;
- &lt;li&gt;The current directory, and,&lt;/li&gt;
- &lt;li&gt;The directory the source is in (see sourcedir option)
- &lt;/ol&gt;
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="binary" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>Set whether literals are treated as binary, rather than NetRexx types.</short-description>
-        
-          <description>
-          Set whether literals are treated as binary, rather than NetRexx types
-        </description>
-      
-        </attribute>
-      
-        <attribute name="classpath" type="java.lang.String" briefType="String" required="no">
-        
-          <short-description>Classpath used for NetRexx compilation.</short-description>
-        
-          <description>
-          Set the classpath used for NetRexx compilation
-        </description>
-      
-        </attribute>
-      
-        <attribute name="comments" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>Set whether comments are passed through to the generated java source.</short-description>
-        
-          <description>
-          Set whether comments are passed through to the generated java source.
- Valid true values are "on" or "true". Anything else sets the flag to
- false. The default value is false
-        </description>
-      
-        </attribute>
-      
-        <attribute name="compact" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>Set whether error messages come out in compact or verbose format.</short-description>
-        
-          <description>
-          Set whether error messages come out in compact or verbose format. Valid
- true values are "on" or "true". Anything else sets the flag to false.
- The default value is false
-        </description>
-      
-        </attribute>
-      
-        <attribute name="compile" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>Set whether the NetRexx compiler should compile the generated java code
- Valid true values are "on" or "true".</short-description>
-        
-          <description>
-          Set whether the NetRexx compiler should compile the generated java code
- Valid true values are "on" or "true". Anything else sets the flag to
- false. The default value is true. Setting this flag to false, will
- automatically set the keep flag to true.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="console" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>Set whether or not messages should be displayed on the 'console' Valid
- true values are "on" or "true".</short-description>
-        
-          <description>
-          Set whether or not messages should be displayed on the 'console' Valid
- true values are "on" or "true". Anything else sets the flag to false.
- The default value is true.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="crossref" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>Whether variable cross references are generated.</short-description>
-        
-          <description>
-          Whether variable cross references are generated
-        </description>
-      
-        </attribute>
-      
-        <attribute name="decimal" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>Set whether decimal arithmetic should be used for the netrexx code.</short-description>
-        
-          <description>
-          Set whether decimal arithmetic should be used for the netrexx code.
- Binary arithmetic is used when this flag is turned off. Valid true
- values are "on" or "true". Anything else sets the flag to false. The
- default value is true.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="destdir" type="java.io.File" briefType="File" required="yes">
-        
-          <short-description>Destination directory into which the NetRexx source files
- should be copied and then compiled.</short-description>
-        
-          <description>
-          Set the destination directory into which the NetRexx source files
- should be copied and then compiled.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="diag" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>Whether diagnostic information about the compile is generated.</short-description>
-        
-          <description>
-          Whether diagnostic information about the compile is generated
-        </description>
-      
-        </attribute>
-      
-        <attribute name="explicit" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>Sets whether variables must be declared explicitly before use.</short-description>
-        
-          <description>
-          Sets whether variables must be declared explicitly before use. Valid
- true values are "on" or "true". Anything else sets the flag to false.
- The default value is false.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="format" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>Whether the generated java code is formatted nicely or left to match
- NetRexx line numbers for call stack debugging.</short-description>
-        
-          <description>
-          Whether the generated java code is formatted nicely or left to match
- NetRexx line numbers for call stack debugging
-        </description>
-      
-        </attribute>
-      
-        <attribute name="java" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>Whether the generated java code is produced Valid true values are "on"
- or "true".</short-description>
-        
-          <description>
-          Whether the generated java code is produced Valid true values are "on"
- or "true". Anything else sets the flag to false. The default value is
- false.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="keep" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>Sets whether the generated java source file should be kept after
- compilation.</short-description>
-        
-          <description>
-          Sets whether the generated java source file should be kept after
- compilation. The generated files will have an extension of .java.keep,
- &lt;b&gt;not&lt;/b&gt; .java Valid true values are "on" or "true". Anything else
- sets the flag to false. The default value is false.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="logo" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>Whether the compiler text logo is displayed when compiling.</short-description>
-        
-          <description>
-          Whether the compiler text logo is displayed when compiling
-        </description>
-      
-        </attribute>
-      
-        <attribute name="replace" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>Whether the generated .java file should be replaced when compiling
- Valid true values are "on" or "true".</short-description>
-        
-          <description>
-          Whether the generated .java file should be replaced when compiling
- Valid true values are "on" or "true". Anything else sets the flag to
- false. The default value is false.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="savelog" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>Sets whether the compiler messages will be written to NetRexxC.log as
- well as to the console Valid true values are "on" or "true".</short-description>
-        
-          <description>
-          Sets whether the compiler messages will be written to NetRexxC.log as
- well as to the console Valid true values are "on" or "true". Anything
- else sets the flag to false. The default value is false.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="sourcedir" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>Tells the NetRexx compiler to store the class files in the same
- directory as the source files.</short-description>
-        
-          <description>
-          Tells the NetRexx compiler to store the class files in the same
- directory as the source files. The alternative is the working directory
- Valid true values are "on" or "true". Anything else sets the flag to
- false. The default value is true.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="srcdir" type="java.io.File" briefType="File" required="yes">
-        
-          <short-description>Source dir to find the source Java files.</short-description>
-        
-          <description>
-          Set the source dir to find the source Java files.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="strictargs" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>Tells the NetRexx compiler that method calls always need parentheses,
- even if no arguments are needed, e.g.</short-description>
-        
-          <description>
-          Tells the NetRexx compiler that method calls always need parentheses,
- even if no arguments are needed, e.g. &lt;code&gt;aStringVar.getBytes&lt;/code&gt;
- vs. &lt;code&gt;aStringVar.getBytes()&lt;/code&gt; Valid true values are "on" or
- "true". Anything else sets the flag to false. The default value is
- false.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="strictassign" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>Tells the NetRexx compile that assignments must match exactly on type.</short-description>
-        
-          <description>
-          Tells the NetRexx compile that assignments must match exactly on type
-        </description>
-      
-        </attribute>
-      
-        <attribute name="strictcase" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>Specifies whether the NetRexx compiler should be case sensitive or not.</short-description>
-        
-          <description>
-          Specifies whether the NetRexx compiler should be case sensitive or not
-        </description>
-      
-        </attribute>
-      
-        <attribute name="strictimport" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>Sets whether classes need to be imported explicitly using an &lt;code&gt;import&lt;/code&gt;
- statement.</short-description>
-        
-          <description>
-          Sets whether classes need to be imported explicitly using an &lt;code&gt;import&lt;/code&gt;
- statement. By default the NetRexx compiler will import certain packages
- automatically Valid true values are "on" or "true". Anything else sets
- the flag to false. The default value is false.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="strictprops" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>Sets whether local properties need to be qualified explicitly using
- &lt;code&gt;this&lt;/code&gt; Valid true values are "on" or "true".</short-description>
-        
-          <description>
-          Sets whether local properties need to be qualified explicitly using
- &lt;code&gt;this&lt;/code&gt; Valid true values are "on" or "true". Anything else
- sets the flag to false. The default value is false.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="strictsignal" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>Whether the compiler should force catching of exceptions by explicitly
- named types.</short-description>
-        
-          <description>
-          Whether the compiler should force catching of exceptions by explicitly
- named types
-        </description>
-      
-        </attribute>
-      
-        <attribute name="suppressdeprecation" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>Tells whether we should filter out any deprecation-messages
- of the compiler out.</short-description>
-        
-          <description>
-          Tells whether we should filter out any deprecation-messages
- of the compiler out.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="suppressexceptionnotsignalled" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>Whether the task should suppress the "FooException is in SIGNALS list
- but is not signalled within the method", which is sometimes rather
- useless.</short-description>
-        
-          <description>
-          Whether the task should suppress the "FooException is in SIGNALS list
- but is not signalled within the method", which is sometimes rather
- useless. The warning is logged as verbose message, though.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="suppressmethodargumentnotused" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>Whether the task should suppress the "Method argument is not used" in
- strictargs-Mode, which can not be suppressed by the compiler itself.</short-description>
-        
-          <description>
-          Whether the task should suppress the "Method argument is not used" in
- strictargs-Mode, which can not be suppressed by the compiler itself.
- The warning is logged as verbose message, though.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="suppressprivatepropertynotused" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>Whether the task should suppress the "Private property is defined but
- not used" in strictargs-Mode, which can be quite annoying while
- developing.</short-description>
-        
-          <description>
-          Whether the task should suppress the "Private property is defined but
- not used" in strictargs-Mode, which can be quite annoying while
- developing. The warning is logged as verbose message, though.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="suppressvariablenotused" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>Whether the task should suppress the "Variable is set but not used" in
- strictargs-Mode.</short-description>
-        
-          <description>
-          Whether the task should suppress the "Variable is set but not used" in
- strictargs-Mode. Be careful with this one! The warning is logged as
- verbose message, though.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="symbols" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>Sets whether debug symbols should be generated into the class file
- Valid true values are "on" or "true".</short-description>
-        
-          <description>
-          Sets whether debug symbols should be generated into the class file
- Valid true values are "on" or "true". Anything else sets the flag to
- false. The default value is false.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="time" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>Asks the NetRexx compiler to print compilation times to the console
- Valid true values are "on" or "true".</short-description>
-        
-          <description>
-          Asks the NetRexx compiler to print compilation times to the console
- Valid true values are "on" or "true". Anything else sets the flag to
- false. The default value is false.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="trace" type="org.apache.tools.ant.taskdefs.optional.NetRexxC.TraceAttr" briefType="&quot;trace&quot;, &quot;trace1&quot;, &quot;trace2&quot;, &quot;notrace&quot;" required="no">
-        
-          <short-description>No description.</short-description>
-        
-          <description>
-        </description>
-      
-        </attribute>
-      
-        <attribute name="utf8" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>Tells the NetRexx compiler that the source is in UTF8 Valid true values
- are "on" or "true".</short-description>
-        
-          <description>
-          Tells the NetRexx compiler that the source is in UTF8 Valid true values
- are "on" or "true". Anything else sets the flag to false. The default
- value is false.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="verbose" type="org.apache.tools.ant.taskdefs.optional.NetRexxC.VerboseAttr" briefType="&quot;verbose&quot;, &quot;verbose0&quot;, &quot;verbose1&quot;, &quot;verbose2&quot;, &quot;verbose3&quot;, &quot;verbose4&quot;, &quot;verbose5&quot;, &quot;noverbose&quot;" required="no">
-        
-          <short-description>Whether lots of warnings and error messages should be generated.</short-description>
-        
-          <description>
-          Whether lots of warnings and error messages should be generated
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-    </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="p4add" category="other" classname="org.apache.tools.ant.taskdefs.optional.perforce.P4Add">
-
-  
-    <short-description>Adds specified files to Perforce.</short-description>
-  
-    <description>
-    Adds specified files to Perforce.
-
- &lt;b&gt;Example Usage:&lt;/b&gt;
- &lt;table border="1"&gt;
- &lt;th&gt;Function&lt;/th&gt;&lt;th&gt;Command&lt;/th&gt;
- &lt;tr&gt;&lt;td&gt;Add files using P4USER, P4PORT and P4CLIENT settings specified&lt;/td&gt;&lt;td&gt;&amp;lt;P4add &lt;br&gt;P4view="//projects/foo/main/source/..." &lt;br&gt;P4User="fbloggs" &lt;br&gt;P4Port="km01:1666" &lt;br&gt;P4Client="fbloggsclient"&amp;gt;&lt;br&gt;&amp;lt;fileset basedir="dir" includes="**&amp;#47;*.java"&amp;gt;&lt;br&gt;&amp;lt;/p4add&amp;gt;&lt;/td&gt;&lt;/tr&gt;
- &lt;tr&gt;&lt;td&gt;Add files using P4USER, P4PORT and P4CLIENT settings defined in environment&lt;/td&gt;&lt;td&gt;&amp;lt;P4add P4view="//projects/foo/main/source/..." /&amp;gt;&lt;br&gt;&amp;lt;fileset basedir="dir" includes="**&amp;#47;*.java"&amp;gt;&lt;br&gt;&amp;lt;/p4add&amp;gt;&lt;/td&gt;&lt;/tr&gt;
- &lt;tr&gt;&lt;td&gt;Specify the length of command line arguments to pass to each invocation of p4&lt;/td&gt;&lt;td&gt;&amp;lt;p4add Commandlength="450"&amp;gt;&lt;/td&gt;&lt;/tr&gt;
- &lt;/table&gt;
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="changelist" type="int" briefType="int" required="NOTDEFINED">
-        
-          <short-description>If specified the open files are associated with the
- specified pending changelist number; otherwise the open files are
- associated with the default changelist.</short-description>
-        
-          <description>
-          If specified the open files are associated with the
- specified pending changelist number; otherwise the open files are
- associated with the default changelist.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="client" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>The p4 client spec to use;
- optional, defaults to the current user.</short-description>
-        
-          <description>
-          The p4 client spec to use;
- optional, defaults to the current user
-        </description>
-      
-        </attribute>
-      
-        <attribute name="cmdopts" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Set extra command options; only used on some
- of the Perforce tasks.</short-description>
-        
-          <description>
-          Set extra command options; only used on some
- of the Perforce tasks.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="commandlength" type="int" briefType="int" required="NOTDEFINED">
-        
-          <short-description>Positive integer specifying the maximum length
-   of the commandline when calling Perforce to add the files.</short-description>
-        
-          <description>
-          positive integer specifying the maximum length
-   of the commandline when calling Perforce to add the files. 
-   Defaults to 450, higher values mean faster execution,
-   but also possible failures.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="failonerror" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          <short-description>Whether to stop the build (true, default) 
- or keep going if an error is returned from the p4 command.</short-description>
-        
-          <description>
-          whether to stop the build (true, default) 
- or keep going if an error is returned from the p4 command
-        </description>
-      
-        </attribute>
-      
-        <attribute name="port" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>The p4d server and port to connect to;
- optional, default "perforce:1666".</short-description>
-        
-          <description>
-          The p4d server and port to connect to;
- optional, default "perforce:1666"
-        </description>
-      
-        </attribute>
-      
-        <attribute name="user" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>The p4 username;
- optional, defaults to the current user.</short-description>
-        
-          <description>
-          The p4 username;
- optional, defaults to the current user
-        </description>
-      
-        </attribute>
-      
-        <attribute name="view" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>The client, branch or label view to operate upon;
- optional default "//...".</short-description>
-        
-          <description>
-          The client, branch or label view to operate upon;
- optional default "//..."
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-      
-        <element name="fileset" type="org.apache.tools.ant.types.FileSet" briefType="Fileset" required="NOTDEFINED">
-        
-          <short-description>Files to add.</short-description>
-        
-          <description>
-          files to add
-        </description>
-      
-        </element>
-
-    
-      </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="p4change" category="other" classname="org.apache.tools.ant.taskdefs.optional.perforce.P4Change">
-
-  
-    <short-description>Requests a new changelist from the Perforce server.</short-description>
-  
-    <description>
-    Requests a new changelist from the Perforce server.
- P4Change creates a new changelist in perforce. P4Change sets the property
- ${p4.change} with the new changelist number. This should then be passed into
- p4edit and p4submit.
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="client" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>The p4 client spec to use;
- optional, defaults to the current user.</short-description>
-        
-          <description>
-          The p4 client spec to use;
- optional, defaults to the current user
-        </description>
-      
-        </attribute>
-      
-        <attribute name="cmdopts" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Set extra command options; only used on some
- of the Perforce tasks.</short-description>
-        
-          <description>
-          Set extra command options; only used on some
- of the Perforce tasks.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="description" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Description for ChangeList;optional.</short-description>
-        
-          <description>
-          Description for ChangeList;optional.
- If none is specified, it will default to "AutoSubmit By Ant"
-        </description>
-      
-        </attribute>
-      
-        <attribute name="failonerror" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          <short-description>Whether to stop the build (true, default) 
- or keep going if an error is returned from the p4 command.</short-description>
-        
-          <description>
-          whether to stop the build (true, default) 
- or keep going if an error is returned from the p4 command
-        </description>
-      
-        </attribute>
-      
-        <attribute name="port" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>The p4d server and port to connect to;
- optional, default "perforce:1666".</short-description>
-        
-          <description>
-          The p4d server and port to connect to;
- optional, default "perforce:1666"
-        </description>
-      
-        </attribute>
-      
-        <attribute name="user" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>The p4 username;
- optional, defaults to the current user.</short-description>
-        
-          <description>
-          The p4 username;
- optional, defaults to the current user
-        </description>
-      
-        </attribute>
-      
-        <attribute name="view" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>The client, branch or label view to operate upon;
- optional default "//...".</short-description>
-        
-          <description>
-          The client, branch or label view to operate upon;
- optional default "//..."
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-    </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="p4counter" category="other" classname="org.apache.tools.ant.taskdefs.optional.perforce.P4Counter">
-
-  
-    <short-description>Obtains or sets the value of a counter.</short-description>
-  
-    <description>
-    Obtains or sets the value of a counter.
-
- &lt;p&gt; When used in its base form
- (where only the counter name is provided), the counter value will be
- printed to the output stream. When the value is provided, the counter
- will be set to the value provided. When a property name is provided,
- the property will be filled with the value of the counter. You may
- not specify to both get and set the value of the counter in the same
- Task.
- &lt;/p&gt;
- &lt;P&gt;
- The user performing this task must have Perforce &amp;quot;review&amp;quot; permissions
- as defined by Perforce protections in order for this task to succeed.
-&lt;/P&gt;
-
- Example Usage:&lt;br&gt;
- &amp;lt;p4counter name="${p4.counter}" property=${p4.change}"/&amp;gt;
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="client" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>The p4 client spec to use;
- optional, defaults to the current user.</short-description>
-        
-          <description>
-          The p4 client spec to use;
- optional, defaults to the current user
-        </description>
-      
-        </attribute>
-      
-        <attribute name="cmdopts" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Set extra command options; only used on some
- of the Perforce tasks.</short-description>
-        
-          <description>
-          Set extra command options; only used on some
- of the Perforce tasks.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="failonerror" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          <short-description>Whether to stop the build (true, default) 
- or keep going if an error is returned from the p4 command.</short-description>
-        
-          <description>
-          whether to stop the build (true, default) 
- or keep going if an error is returned from the p4 command
-        </description>
-      
-        </attribute>
-      
-        <attribute name="name" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>The name of the counter; required.</short-description>
-        
-          <description>
-          The name of the counter; required
-        </description>
-      
-        </attribute>
-      
-        <attribute name="port" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>The p4d server and port to connect to;
- optional, default "perforce:1666".</short-description>
-        
-          <description>
-          The p4d server and port to connect to;
- optional, default "perforce:1666"
-        </description>
-      
-        </attribute>
-      
-        <attribute name="property" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>A property to be set with the value of the counter.</short-description>
-        
-          <description>
-          A property to be set with the value of the counter
-        </description>
-      
-        </attribute>
-      
-        <attribute name="user" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>The p4 username;
- optional, defaults to the current user.</short-description>
-        
-          <description>
-          The p4 username;
- optional, defaults to the current user
-        </description>
-      
-        </attribute>
-      
-        <attribute name="value" type="int" briefType="int" required="NOTDEFINED">
-        
-          <short-description>The new value for the counter; optional.</short-description>
-        
-          <description>
-          The new value for the counter; optional.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="view" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>The client, branch or label view to operate upon;
- optional default "//...".</short-description>
-        
-          <description>
-          The client, branch or label view to operate upon;
- optional default "//..."
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-    </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="p4delete" category="other" classname="org.apache.tools.ant.taskdefs.optional.perforce.P4Delete">
-
-  
-    <short-description>Checkout files for deletion.</short-description>
-  
-    <description>
-    Checkout files for deletion.
-
- Example Usage:&lt;br&gt;
- &amp;lt;p4delete change="${p4.change}" view="//depot/project/foo.txt" /&amp;gt;&lt;br&gt;
-
- Simple re-write of P4Edit changing 'edit' to 'delete'.&lt;br&gt;
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="change" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>An existing changelist number for the deletion; optional
- but strongly recommended.</short-description>
-        
-          <description>
-          An existing changelist number for the deletion; optional
- but strongly recommended.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="client" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>The p4 client spec to use;
- optional, defaults to the current user.</short-description>
-        
-          <description>
-          The p4 client spec to use;
- optional, defaults to the current user
-        </description>
-      
-        </attribute>
-      
-        <attribute name="cmdopts" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Set extra command options; only used on some
- of the Perforce tasks.</short-description>
-        
-          <description>
-          Set extra command options; only used on some
- of the Perforce tasks.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="failonerror" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          <short-description>Whether to stop the build (true, default) 
- or keep going if an error is returned from the p4 command.</short-description>
-        
-          <description>
-          whether to stop the build (true, default) 
- or keep going if an error is returned from the p4 command
-        </description>
-      
-        </attribute>
-      
-        <attribute name="port" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>The p4d server and port to connect to;
- optional, default "perforce:1666".</short-description>
-        
-          <description>
-          The p4d server and port to connect to;
- optional, default "perforce:1666"
-        </description>
-      
-        </attribute>
-      
-        <attribute name="user" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>The p4 username;
- optional, defaults to the current user.</short-description>
-        
-          <description>
-          The p4 username;
- optional, defaults to the current user
-        </description>
-      
-        </attribute>
-      
-        <attribute name="view" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>The client, branch or label view to operate upon;
- optional default "//...".</short-description>
-        
-          <description>
-          The client, branch or label view to operate upon;
- optional default "//..."
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-    </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="p4edit" category="other" classname="org.apache.tools.ant.taskdefs.optional.perforce.P4Edit">
-
-  
-    <short-description>Open file(s) for edit.</short-description>
-  
-    <description>
-    Open file(s) for edit. 
- P4Change should be used to obtain a new changelist for P4Edit as,
- although P4Edit can open files to the default change,  
- P4Submit cannot yet submit to it.
- Example Usage:&lt;br&gt;
- &amp;lt;p4edit change="${p4.change}" view="//depot/project/foo.txt" /&amp;gt;
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="change" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>An existing changelist number to assign files to; optional
- but strongly recommended.</short-description>
-        
-          <description>
-          An existing changelist number to assign files to; optional
- but strongly recommended.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="client" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>The p4 client spec to use;
- optional, defaults to the current user.</short-description>
-        
-          <description>
-          The p4 client spec to use;
- optional, defaults to the current user
-        </description>
-      
-        </attribute>
-      
-        <attribute name="cmdopts" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Set extra command options; only used on some
- of the Perforce tasks.</short-description>
-        
-          <description>
-          Set extra command options; only used on some
- of the Perforce tasks.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="failonerror" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          <short-description>Whether to stop the build (true, default) 
- or keep going if an error is returned from the p4 command.</short-description>
-        
-          <description>
-          whether to stop the build (true, default) 
- or keep going if an error is returned from the p4 command
-        </description>
-      
-        </attribute>
-      
-        <attribute name="port" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>The p4d server and port to connect to;
- optional, default "perforce:1666".</short-description>
-        
-          <description>
-          The p4d server and port to connect to;
- optional, default "perforce:1666"
-        </description>
-      
-        </attribute>
-      
-        <attribute name="user" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>The p4 username;
- optional, defaults to the current user.</short-description>
-        
-          <description>
-          The p4 username;
- optional, defaults to the current user
-        </description>
-      
-        </attribute>
-      
-        <attribute name="view" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>The client, branch or label view to operate upon;
- optional default "//...".</short-description>
-        
-          <description>
-          The client, branch or label view to operate upon;
- optional default "//..."
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-    </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="p4have" category="other" classname="org.apache.tools.ant.taskdefs.optional.perforce.P4Have">
-
-  
-    <short-description>Lists Perforce files currently on client.</short-description>
-  
-    <description>
-    Lists Perforce files currently on client.
-
- P4Have simply dumps the current file version info into
- the Ant log (or stdout).
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="client" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>The p4 client spec to use;
- optional, defaults to the current user.</short-description>
-        
-          <description>
-          The p4 client spec to use;
- optional, defaults to the current user
-        </description>
-      
-        </attribute>
-      
-        <attribute name="cmdopts" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Set extra command options; only used on some
- of the Perforce tasks.</short-description>
-        
-          <description>
-          Set extra command options; only used on some
- of the Perforce tasks.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="failonerror" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          <short-description>Whether to stop the build (true, default) 
- or keep going if an error is returned from the p4 command.</short-description>
-        
-          <description>
-          whether to stop the build (true, default) 
- or keep going if an error is returned from the p4 command
-        </description>
-      
-        </attribute>
-      
-        <attribute name="port" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>The p4d server and port to connect to;
- optional, default "perforce:1666".</short-description>
-        
-          <description>
-          The p4d server and port to connect to;
- optional, default "perforce:1666"
-        </description>
-      
-        </attribute>
-      
-        <attribute name="user" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>The p4 username;
- optional, defaults to the current user.</short-description>
-        
-          <description>
-          The p4 username;
- optional, defaults to the current user
-        </description>
-      
-        </attribute>
-      
-        <attribute name="view" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>The client, branch or label view to operate upon;
- optional default "//...".</short-description>
-        
-          <description>
-          The client, branch or label view to operate upon;
- optional default "//..."
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-    </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="p4label" category="other" classname="org.apache.tools.ant.taskdefs.optional.perforce.P4Label">
-
-  
-    <short-description>Creates a new Perforce label and set contents to reflect current client file revisions.</short-description>
-  
-    <description>
-    Creates a new Perforce label and set contents to reflect current
-  client file revisions.
-
-  Label name defaults to AntLabel if none set.
-
- Example Usage:
- &lt;pre&gt;
-   &amp;lt;P4Label name="MyLabel-${TSTAMP}-${DSTAMP}" desc="Auto Build Label" /&amp;gt;
- &lt;/pre&gt;
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="client" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>The p4 client spec to use;
- optional, defaults to the current user.</short-description>
-        
-          <description>
-          The p4 client spec to use;
- optional, defaults to the current user
-        </description>
-      
-        </attribute>
-      
-        <attribute name="cmdopts" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Set extra command options; only used on some
- of the Perforce tasks.</short-description>
-        
-          <description>
-          Set extra command options; only used on some
- of the Perforce tasks.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="desc" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Label Description; optional.</short-description>
-        
-          <description>
-          Label Description; optional
-        </description>
-      
-        </attribute>
-      
-        <attribute name="failonerror" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          <short-description>Whether to stop the build (true, default) 
- or keep going if an error is returned from the p4 command.</short-description>
-        
-          <description>
-          whether to stop the build (true, default) 
- or keep going if an error is returned from the p4 command
-        </description>
-      
-        </attribute>
-      
-        <attribute name="lock" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>When set to "locked", Perforce will lock the label once created; optional.</short-description>
-        
-          <description>
-          when set to "locked", Perforce will lock the label once created; optional.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="name" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>The name of the label; optional, default "AntLabel".</short-description>
-        
-          <description>
-          The name of the label; optional, default "AntLabel"
-        </description>
-      
-        </attribute>
-      
-        <attribute name="port" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>The p4d server and port to connect to;
- optional, default "perforce:1666".</short-description>
-        
-          <description>
-          The p4d server and port to connect to;
- optional, default "perforce:1666"
-        </description>
-      
-        </attribute>
-      
-        <attribute name="user" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>The p4 username;
- optional, defaults to the current user.</short-description>
-        
-          <description>
-          The p4 username;
- optional, defaults to the current user
-        </description>
-      
-        </attribute>
-      
-        <attribute name="view" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>The client, branch or label view to operate upon;
- optional default "//...".</short-description>
-        
-          <description>
-          The client, branch or label view to operate upon;
- optional default "//..."
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-    </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="p4reopen" category="other" classname="org.apache.tools.ant.taskdefs.optional.perforce.P4Reopen">
-
-  
-    <short-description>No Description.</short-description>
-  
-    <description>
-    
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="client" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>The p4 client spec to use;
- optional, defaults to the current user.</short-description>
-        
-          <description>
-          The p4 client spec to use;
- optional, defaults to the current user
-        </description>
-      
-        </attribute>
-      
-        <attribute name="cmdopts" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Set extra command options; only used on some
- of the Perforce tasks.</short-description>
-        
-          <description>
-          Set extra command options; only used on some
- of the Perforce tasks.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="failonerror" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          <short-description>Whether to stop the build (true, default) 
- or keep going if an error is returned from the p4 command.</short-description>
-        
-          <description>
-          whether to stop the build (true, default) 
- or keep going if an error is returned from the p4 command
-        </description>
-      
-        </attribute>
-      
-        <attribute name="port" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>The p4d server and port to connect to;
- optional, default "perforce:1666".</short-description>
-        
-          <description>
-          The p4d server and port to connect to;
- optional, default "perforce:1666"
-        </description>
-      
-        </attribute>
-      
-        <attribute name="tochange" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>The changelist to move files to; required.</short-description>
-        
-          <description>
-          The changelist to move files to; required.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="user" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>The p4 username;
- optional, defaults to the current user.</short-description>
-        
-          <description>
-          The p4 username;
- optional, defaults to the current user
-        </description>
-      
-        </attribute>
-      
-        <attribute name="view" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>The client, branch or label view to operate upon;
- optional default "//...".</short-description>
-        
-          <description>
-          The client, branch or label view to operate upon;
- optional default "//..."
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-    </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="p4revert" category="other" classname="org.apache.tools.ant.taskdefs.optional.perforce.P4Revert">
-
-  
-    <short-description>Revert Perforce open files or files in a changelist</short-description>
-  
-    <description>
-    Revert Perforce open files or files in a changelist
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="change" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>The changelist to revert; optional.</short-description>
-        
-          <description>
-          The changelist to revert; optional.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="client" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>The p4 client spec to use;
- optional, defaults to the current user.</short-description>
-        
-          <description>
-          The p4 client spec to use;
- optional, defaults to the current user
-        </description>
-      
-        </attribute>
-      
-        <attribute name="cmdopts" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Set extra command options; only used on some
- of the Perforce tasks.</short-description>
-        
-          <description>
-          Set extra command options; only used on some
- of the Perforce tasks.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="failonerror" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          <short-description>Whether to stop the build (true, default) 
- or keep going if an error is returned from the p4 command.</short-description>
-        
-          <description>
-          whether to stop the build (true, default) 
- or keep going if an error is returned from the p4 command
-        </description>
-      
-        </attribute>
-      
-        <attribute name="port" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>The p4d server and port to connect to;
- optional, default "perforce:1666".</short-description>
-        
-          <description>
-          The p4d server and port to connect to;
- optional, default "perforce:1666"
-        </description>
-      
-        </attribute>
-      
-        <attribute name="revertonlyunchanged" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          <short-description>Flag to revert only unchanged files (p4 revert -a); optional, default false.</short-description>
-        
-          <description>
-          flag to revert only unchanged files (p4 revert -a); optional, default false.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="user" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>The p4 username;
- optional, defaults to the current user.</short-description>
-        
-          <description>
-          The p4 username;
- optional, defaults to the current user
-        </description>
-      
-        </attribute>
-      
-        <attribute name="view" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>The client, branch or label view to operate upon;
- optional default "//...".</short-description>
-        
-          <description>
-          The client, branch or label view to operate upon;
- optional default "//..."
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-    </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="p4submit" category="other" classname="org.apache.tools.ant.taskdefs.optional.perforce.P4Submit">
-
-  
-    <short-description>Submits a numbered changelist to Perforce.</short-description>
-  
-    <description>
-    Submits a numbered changelist to Perforce.
-
- &lt;B&gt;Note:&lt;/B&gt; P4Submit cannot (yet) submit the default changelist.
- This shouldn't be a problem with the ANT task as the usual flow is
- P4Change to create a new numbered change followed by P4Edit then P4Submit.
-
- Example Usage:-&lt;br&gt;
- &amp;lt;p4submit change="${p4.change}" /&amp;gt;
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="change" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>The changelist number to submit; required.</short-description>
-        
-          <description>
-          The changelist number to submit; required.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="client" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>The p4 client spec to use;
- optional, defaults to the current user.</short-description>
-        
-          <description>
-          The p4 client spec to use;
- optional, defaults to the current user
-        </description>
-      
-        </attribute>
-      
-        <attribute name="cmdopts" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Set extra command options; only used on some
- of the Perforce tasks.</short-description>
-        
-          <description>
-          Set extra command options; only used on some
- of the Perforce tasks.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="failonerror" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          <short-description>Whether to stop the build (true, default) 
- or keep going if an error is returned from the p4 command.</short-description>
-        
-          <description>
-          whether to stop the build (true, default) 
- or keep going if an error is returned from the p4 command
-        </description>
-      
-        </attribute>
-      
-        <attribute name="port" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>The p4d server and port to connect to;
- optional, default "perforce:1666".</short-description>
-        
-          <description>
-          The p4d server and port to connect to;
- optional, default "perforce:1666"
-        </description>
-      
-        </attribute>
-      
-        <attribute name="user" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>The p4 username;
- optional, defaults to the current user.</short-description>
-        
-          <description>
-          The p4 username;
- optional, defaults to the current user
-        </description>
-      
-        </attribute>
-      
-        <attribute name="view" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>The client, branch or label view to operate upon;
- optional default "//...".</short-description>
-        
-          <description>
-          The client, branch or label view to operate upon;
- optional default "//..."
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-    </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="p4sync" category="other" classname="org.apache.tools.ant.taskdefs.optional.perforce.P4Sync">
-
-  
-    <short-description>Synchronize client space to a Perforce depot view.</short-description>
-  
-    <description>
-    Synchronize client space to a Perforce depot view.
-
-  The API allows additional functionality of the "p4 sync" command
- (such as "p4 sync -f //...#have" or other exotic invocations).&lt;/P&gt;
-
- &lt;b&gt;Example Usage:&lt;/b&gt;
- &lt;table border="1"&gt;
- &lt;th&gt;Function&lt;/th&gt;&lt;th&gt;Command&lt;/th&gt;
- &lt;tr&gt;&lt;td&gt;Sync to head using P4USER, P4PORT and P4CLIENT settings specified&lt;/td&gt;&lt;td&gt;&amp;lt;P4Sync &lt;br&gt;P4view="//projects/foo/main/source/..." &lt;br&gt;P4User="fbloggs" &lt;br&gt;P4Port="km01:1666" &lt;br&gt;P4Client="fbloggsclient" /&amp;gt;&lt;/td&gt;&lt;/tr&gt;
- &lt;tr&gt;&lt;td&gt;Sync to head using P4USER, P4PORT and P4CLIENT settings defined in environment&lt;/td&gt;&lt;td&gt;&amp;lt;P4Sync P4view="//projects/foo/main/source/..." /&amp;gt;&lt;/td&gt;&lt;/tr&gt;
- &lt;tr&gt;&lt;td&gt;Force a re-sync to head, refreshing all files&lt;/td&gt;&lt;td&gt;&amp;lt;P4Sync force="yes" P4view="//projects/foo/main/source/..." /&amp;gt;&lt;/td&gt;&lt;/tr&gt;
- &lt;tr&gt;&lt;td&gt;Sync to a label&lt;/td&gt;&lt;td&gt;&amp;lt;P4Sync label="myPerforceLabel" /&amp;gt;&lt;/td&gt;&lt;/tr&gt;
- &lt;/table&gt;
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="client" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>The p4 client spec to use;
- optional, defaults to the current user.</short-description>
-        
-          <description>
-          The p4 client spec to use;
- optional, defaults to the current user
-        </description>
-      
-        </attribute>
-      
-        <attribute name="cmdopts" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Set extra command options; only used on some
- of the Perforce tasks.</short-description>
-        
-          <description>
-          Set extra command options; only used on some
- of the Perforce tasks.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="failonerror" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          <short-description>Whether to stop the build (true, default) 
- or keep going if an error is returned from the p4 command.</short-description>
-        
-          <description>
-          whether to stop the build (true, default) 
- or keep going if an error is returned from the p4 command
-        </description>
-      
-        </attribute>
-      
-        <attribute name="force" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Force a refresh of files, if this attribute is set; false by default.</short-description>
-        
-          <description>
-          force a refresh of files, if this attribute is set; false by default.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="label" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Label to sync client to; optional.</short-description>
-        
-          <description>
-          Label to sync client to; optional.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="port" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>The p4d server and port to connect to;
- optional, default "perforce:1666".</short-description>
-        
-          <description>
-          The p4d server and port to connect to;
- optional, default "perforce:1666"
-        </description>
-      
-        </attribute>
-      
-        <attribute name="user" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>The p4 username;
- optional, defaults to the current user.</short-description>
-        
-          <description>
-          The p4 username;
- optional, defaults to the current user
-        </description>
-      
-        </attribute>
-      
-        <attribute name="view" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>The client, branch or label view to operate upon;
- optional default "//...".</short-description>
-        
-          <description>
-          The client, branch or label view to operate upon;
- optional default "//..."
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-    </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="parallel" category="control" classname="org.apache.tools.ant.taskdefs.Parallel">
-
-  
-    <short-description>Executes the contained tasks in separate threads, continuing once all are completed.</short-description>
-  
-    <description>
-    Executes the contained tasks in separate threads, continuing
- once all are completed.
- &lt;p&gt;
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-    </attributes>
-
-    
-      <elements>
-    </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="patch" category="utility" classname="org.apache.tools.ant.taskdefs.Patch">
-
-  
-    <short-description>Patches a file by applying a 'diff' file to it; requires "patch" to be on the execution path.</short-description>
-  
-    <description>
-    Patches a file by applying a 'diff' file to it; requires "patch" to be
- on the execution path.
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="backups" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>Flag to create backups; optional, default=false.</short-description>
-        
-          <description>
-          flag to create backups; optional, default=false
-        </description>
-      
-        </attribute>
-      
-        <attribute name="dir" type="java.io.File" briefType="File" required="no, default is the project&apos;s basedir.">
-        
-          <short-description>The directory to run the patch command in, defaults to the
- project's base directory.</short-description>
-        
-          <description>
-          The directory to run the patch command in, defaults to the
- project's base directory.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="ignorewhitespace" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>Flag to ignore whitespace differences; default=false.</short-description>
-        
-          <description>
-          flag to ignore whitespace differences; default=false
-        </description>
-      
-        </attribute>
-      
-        <attribute name="originalfile" type="java.io.File" briefType="File" required="no, tries to guess it from the diff         file">
-        
-          <short-description>The file to patch; optional if it can be inferred from
- the diff file.</short-description>
-        
-          <description>
-          The file to patch; optional if it can be inferred from
- the diff file
-        </description>
-      
-        </attribute>
-      
-        <attribute name="patchfile" type="java.io.File" briefType="File" required="yes">
-        
-          <short-description>The file containing the diff output; required.</short-description>
-        
-          <description>
-          The file containing the diff output; required.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="quiet" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>Work silently unless an error occurs; optional, default=false.</short-description>
-        
-          <description>
-          Work silently unless an error occurs; optional, default=false
-        </description>
-      
-        </attribute>
-      
-        <attribute name="reverse" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>Assume patch was created with old and new files swapped; optional,
- default=false.</short-description>
-        
-          <description>
-          Assume patch was created with old and new files swapped; optional,
- default=false
-        </description>
-      
-        </attribute>
-      
-        <attribute name="strip" type="int" briefType="int" required="no">
-        
-          <short-description>Strip the smallest prefix containing &lt;i&gt;num&lt;/i&gt; leading slashes
- from filenames.</short-description>
-        
-          <description>
-          Strip the smallest prefix containing &lt;i&gt;num&lt;/i&gt; leading slashes
- from filenames.
-
- &lt;p&gt;patch's &lt;i&gt;-p&lt;/i&gt; option.
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-    </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="pathconvert" category="utility" classname="org.apache.tools.ant.taskdefs.PathConvert">
-
-  
-    <short-description>Converts path and classpath information to a specific target OS format.</short-description>
-  
-    <description>
-    Converts path and classpath information to a specific target OS
- format. The resulting formatted path is placed into the specified property.
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="dirsep" type="java.lang.String" briefType="String" required="no, defaults to current jvm file.separator">
-        
-          <short-description>Default directory separator string;
- defaults to current JVM.</short-description>
-        
-          <description>
-          Set the default directory separator string;
- defaults to current JVM {@link java.io.File#separator File.separator}
-        </description>
-      
-        </attribute>
-      
-        <attribute name="pathsep" type="java.lang.String" briefType="String" required="no, defaults to current jvm file.pathseparator">
-        
-          <short-description>Default path separator string;
- defaults to current JVM.</short-description>
-        
-          <description>
-          Set the default path separator string;
- defaults to current JVM
- {@link java.io.File#pathSeparator File.pathSeparator}
-        </description>
-      
-        </attribute>
-      
-        <attribute name="property" type="java.lang.String" briefType="String" required="yes">
-        
-          <short-description>The property into which the converted path will be placed.</short-description>
-        
-          <description>
-          The property into which the converted path will be placed.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="refid" type="org.apache.tools.ant.types.Reference" briefType="Reference" required="no; if omitted, a nested          &lt;path&gt; element must be supplied.">
-        
-          <short-description>Adds a reference to a Path, FileSet, DirSet, or FileList defined
- elsewhere.</short-description>
-        
-          <description>
-          Adds a reference to a Path, FileSet, DirSet, or FileList defined
- elsewhere.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="setonempty" type="boolean" briefType="boolean" required="no; default is &quot;true&quot;.    ">
-        
-          <short-description>Set setonempty
-
- If false, don't set the new property if the result is the empty string.</short-description>
-        
-          <description>
-          Set setonempty
-
- If false, don't set the new property if the result is the empty string.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="targetos" type="org.apache.tools.ant.taskdefs.PathConvert.TargetOs" briefType="&quot;windows&quot;, &quot;unix&quot;, &quot;netware&quot;, &quot;os/2&quot;" required="yes, unless pathsep and/or         dirsep are specified.      ">
-        
-          <short-description>Set targetos to a platform to one of
- "windows", "unix", "netware", or "os/2"; required unless
- unless pathsep and/or dirsep are specified.</short-description>
-        
-          <description>
-          Set targetos to a platform to one of
- "windows", "unix", "netware", or "os/2"; required unless
- unless pathsep and/or dirsep are specified.
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-      
-        <element name="map" type="org.apache.tools.ant.taskdefs.PathConvert.MapEntry" briefType="" required="NOTDEFINED">
-        
-          <short-description>Create a nested MAP element.</short-description>
-        
-          <description>
-          Create a nested MAP element
-        </description>
-      
-        </element>
-
-      
-        <element name="path" type="org.apache.tools.ant.types.Path" briefType="Path" required="NOTDEFINED">
-        
-          <short-description>Create a nested PATH element.</short-description>
-        
-          <description>
-          Create a nested PATH element
-        </description>
-      
-        </element>
-
-    
-      </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="property" category="other" classname="org.apache.tools.ant.taskdefs.Property">
-
-  
-    <short-description>Sets a property by name, or set of properties (from file or resource) in the project.</short-description>
-  
-    <description>
-    Sets a property by name, or set of properties (from file or
- resource) in the project.  &lt;/p&gt;
- Properties are immutable: whoever sets a property first freezes it for the
- rest of the build; they are most definately not variable. 
- &lt;p&gt;There are five ways to set properties:&lt;/p&gt;
- &lt;ul&gt;
-   &lt;li&gt;By supplying both the &lt;i&gt;name&lt;/i&gt; and &lt;i&gt;value&lt;/i&gt; attribute.&lt;/li&gt;
-   &lt;li&gt;By supplying both the &lt;i&gt;name&lt;/i&gt; and &lt;i&gt;refid&lt;/i&gt; attribute.&lt;/li&gt;
-   &lt;li&gt;By setting the &lt;i&gt;file&lt;/i&gt; attribute with the filename of the property
-     file to load. This property file has the format as defined by the file used
-     in the class java.util.Properties.&lt;/li&gt;
-   &lt;li&gt;By setting the &lt;i&gt;resource&lt;/i&gt; attribute with the resource name of the
-     property file to load. This property file has the format as defined by the
-     file used in the class java.util.Properties.&lt;/li&gt;
-   &lt;li&gt;By setting the &lt;i&gt;environment&lt;/i&gt; attribute with a prefix to use.
-     Properties will be defined for every environment variable by
-     prefixing the supplied name and a period to the name of the variable.&lt;/li&gt;
- &lt;/ul&gt;
- &lt;p&gt;Although combinations of these ways are possible, only one should be used
- at a time. Problems might occur with the order in which properties are set, for
- instance.&lt;/p&gt;
- &lt;p&gt;The value part of the properties being set, might contain references to other
- properties. These references are resolved at the time these properties are set.
- This also holds for properties loaded from a property file.&lt;/p&gt;
- Properties are case sensitive.
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="classpath" type="org.apache.tools.ant.types.Path" briefType="Path" required="no">
-        
-          <short-description>The classpath to use when looking up a resource.</short-description>
-        
-          <description>
-          The classpath to use when looking up a resource.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="classpathref" type="org.apache.tools.ant.types.Reference" briefType="Reference" required="no">
-        
-          <short-description>The classpath to use when looking up a resource,
- given as reference to a &amp;lt;path&amp;gt; defined elsewhere.</short-description>
-        
-          <description>
-          the classpath to use when looking up a resource,
- given as reference to a &amp;lt;path&amp;gt; defined elsewhere
-        </description>
-      
-        </attribute>
-      
-        <attribute name="environment" type="java.lang.String" briefType="String" required="">
-        
-          <short-description>The prefix to use when retrieving environment variables.</short-description>
-        
-          <description>
-          the prefix to use when retrieving environment variables. 
- Thus if you specify environment=&amp;quot;myenv&amp;quot; 
- you will be able to access OS-specific 
- environment variables via property names &amp;quot;myenv.PATH&amp;quot; or 
- &amp;quot;myenv.TERM&amp;quot;. 
- &lt;p&gt;
- Note that if you supply a property name with a final 
- &amp;quot;.&amp;quot; it will not be doubled. ie environment=&amp;quot;myenv.&amp;quot; will still 
- allow access of environment variables through &amp;quot;myenv.PATH&amp;quot; and 
- &amp;quot;myenv.TERM&amp;quot;. This functionality is currently only implemented 
- on select platforms. Feel free to send patches to increase the number of platforms
- this functionality is supported on ;).&lt;br&gt;
- Note also that properties are case sensitive, even if the
- environment variables on your operating system are not, e.g. it
- will be ${env.Path} not ${env.PATH} on Windows 2000.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="file" type="java.io.File" briefType="File" required="">
-        
-          <short-description>The filename of a property file to load.</short-description>
-        
-          <description>
-          the filename of a property file to load.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="location" type="java.io.File" briefType="File" required="">
-        
-          <short-description>Property to the absolute filename of the
- given file.</short-description>
-        
-          <description>
-          Sets the property to the absolute filename of the
- given file. If the value of this attribute is an absolute path, it
- is left unchanged (with / and \ characters converted to the
- current platforms conventions). Otherwise it is taken as a path
- relative to the project's basedir and expanded.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="name" type="java.lang.String" briefType="String" required="no">
-        
-          <short-description>Name of the property to set.</short-description>
-        
-          <description>
-          sets the name of the property to set.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="prefix" type="java.lang.String" briefType="String" required="no">
-        
-          <short-description>Prefix to apply to properties loaded using &lt;code&gt;file&lt;/code&gt;
- or &lt;code&gt;resource&lt;/code&gt;.</short-description>
-        
-          <description>
-          Prefix to apply to properties loaded using &lt;code&gt;file&lt;/code&gt;
- or &lt;code&gt;resource&lt;/code&gt;. 
- A "." is appended to the prefix if not specified.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="refid" type="org.apache.tools.ant.types.Reference" briefType="Reference" required="">
-        
-          <short-description>Reference to an Ant datatype
- declared elsewhere.</short-description>
-        
-          <description>
-          Sets a reference to an Ant datatype
- declared elsewhere. 
- Only yields reasonable results for references
- PATH like structures or properties.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="resource" type="java.lang.String" briefType="String" required="one of these, when        not using the name attribute">
-        
-          <short-description>The resource name of a property file to load.</short-description>
-        
-          <description>
-          the resource name of a property file to load
-        </description>
-      
-        </attribute>
-      
-        <attribute name="value" type="java.lang.String" briefType="String" required="one of these, when using the         name attribute">
-        
-          <short-description>Value of the property.</short-description>
-        
-          <description>
-          Sets the value of the property.
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-      
-        <element name="classpath" type="org.apache.tools.ant.types.Path" briefType="Path" required="NOTDEFINED">
-        
-          <short-description>The classpath to use when looking up a resource.</short-description>
-        
-          <description>
-          The classpath to use when looking up a resource.
-        </description>
-      
-        </element>
-
-    
-      </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="propertyfile" category="other" classname="org.apache.tools.ant.taskdefs.optional.PropertyFile">
-
-  
-    <short-description>Modifies settings in a property file.</short-description>
-  
-    <description>
-    Modifies settings in a property file.
-
- &lt;p&gt;
-The following is an example of its usage:
-    &lt;ul&gt;&amp;lt;target name="setState"&amp;gt;&lt;br&gt;
-    &lt;ul&gt;&amp;lt;property&lt;br&gt;
-        &lt;ul&gt;name="header"&lt;br&gt;
-        value="##Generated file - do not modify!"/&amp;gt;&lt;br&gt;
-      &amp;lt;propertyfile file="apropfile.properties" comment="${header}"&amp;gt;&lt;br&gt;
-        &amp;lt;entry key="product.version.major" type="int"  value="5"/&amp;gt;&lt;br&gt;
-        &amp;lt;entry key="product.version.minor" type="int"  value="0"/&amp;gt;&lt;br&gt;
-        &amp;lt;entry key="product.build.major"   type="int"  value="0" /&amp;gt;&lt;br&gt;
-        &amp;lt;entry key="product.build.minor"   type="int"  operation="+" /&amp;gt;&lt;br&gt;
-        &amp;lt;entry key="product.build.date"    type="date" value="now" /&amp;gt;&lt;br&gt;
-        &amp;lt;entry key="intSet" type="int" operation="=" value="681"/&amp;gt;&lt;br&gt;
-        &amp;lt;entry key="intDec" type="int" operation="-"/&amp;gt;&lt;br&gt;
-        &amp;lt;entry key="StringEquals" type="string" value="testValue"/&amp;gt;&lt;br&gt;
-     &amp;lt;/propertyfile&amp;gt;&lt;br&gt;&lt;/ul&gt;
-   &amp;lt;/target&amp;gt;&lt;/ul&gt;&lt;p&gt;
-
-The &amp;lt;propertyfile&amp;gt; task must have:&lt;br&gt;
-    &lt;ul&gt;&lt;li&gt;file&lt;/li&gt;&lt;/ul&gt;
-Other parameters are:&lt;br&gt;
-    &lt;ul&gt;&lt;li&gt;comment, key, operation, type and value (the final four being eliminated shortly)&lt;/li&gt;&lt;/ul&gt;
-
-The &amp;lt;entry&amp;gt; task must have:&lt;br&gt;
-    &lt;ul&gt;&lt;li&gt;key&lt;/li&gt;&lt;/ul&gt;
-Other parameters are:&lt;br&gt;
-    &lt;ul&gt;&lt;li&gt;operation&lt;/li&gt;
-        &lt;li&gt;type&lt;/li&gt;
-        &lt;li&gt;value&lt;/li&gt;
-        &lt;li&gt;default&lt;/li&gt;
-        &lt;li&gt;unit&lt;/li&gt;
-    &lt;/ul&gt;
-
-If type is unspecified, it defaults to string
-
-Parameter values:&lt;br&gt;
-    &lt;ul&gt;&lt;li&gt;operation:&lt;/li&gt;
-        &lt;ul&gt;&lt;li&gt;"=" (set -- default)&lt;/li&gt;
-        &lt;li&gt;"-" (dec)&lt;/li&gt;
-        &lt;li&gt;"+" (inc)&lt;/li&gt;
-
-    &lt;li&gt;type:&lt;/li&gt;
-        &lt;ul&gt;&lt;li&gt;"int"&lt;/li&gt;
-        &lt;li&gt;"date"&lt;/li&gt;
-        &lt;li&gt;"string"&lt;/li&gt;&lt;/ul&gt;&lt;/ul&gt;
-
-    &lt;li&gt;value:&lt;/li&gt;
-      &lt;ul&gt;&lt;li&gt;holds the default value, if the property
-              was not found in property file&lt;/li&gt;
-          &lt;li&gt;"now" In case of type "date", the
-              value "now" will be replaced by the current
-              date/time and used even if a valid date was
-              found in the property file.&lt;/li&gt;&lt;/ul&gt;
-
-String property types can only use the "=" operation.
-Int property types can only use the "=", "-" or "+" operations.&lt;p&gt;
-
-The message property is used for the property file header, with "\\" being
-a newline delimiter character.
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="comment" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Optional header comment for the file.</short-description>
-        
-          <description>
-          optional header comment for the file
-        </description>
-      
-        </attribute>
-      
-        <attribute name="file" type="java.io.File" briefType="File" required="NOTDEFINED">
-        
-          <short-description>Location of the property file to be edited; required.</short-description>
-        
-          <description>
-          Location of the property file to be edited; required.
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-      
-        <element name="entry" type="org.apache.tools.ant.taskdefs.optional.PropertyFile.Entry" briefType="" required="NOTDEFINED">
-        
-          <short-description>No description.</short-description>
-        
-          <description>
-          
-        </description>
-      
-        </element>
-
-    
-      </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="pvcs" category="other" classname="org.apache.tools.ant.taskdefs.optional.pvcs.Pvcs">
-
-  
-    <short-description>Extracts the latest edition of the source code from a PVCS repository.</short-description>
-  
-    <description>
-    Extracts the latest edition of the source code from a PVCS repository.
- PVCS is a version control system
- developed by &lt;a href="http://www.merant.com/products/pvcs"&gt;Merant&lt;/a&gt;.
- &lt;br&gt;
- Before using this tag, the user running ant must have access to the commands 
- of PVCS (get and pcli) and must have access to the repository. Note that the way to specify
- the repository is platform dependent so use property to specify location of repository.
- &lt;br&gt;
- This version has been tested agains PVCS version 6.5 and 6.6 under Windows and Solaris.
-
- &lt;b&gt;19-04-2001&lt;/b&gt; &lt;p&gt;The task now has a more robust
- parser. It allows for platform independant file paths
- and supports file names with &lt;i&gt;()&lt;/i&gt;. Thanks to Erik Husby for
- bringing the bug to my attention.
-
- &lt;b&gt;27-04-2001&lt;/b&gt; &lt;p&gt;UNC paths are now handled properly.
- Fix provided by Don Jeffery. He also added an &lt;i&gt;UpdateOnly&lt;/i&gt; flag
- that, when true, conditions the PVCS get using the -U option to only
- update those files that have a modification time (in PVCS) that is newer
- than the existing workfile.
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="filenameformat" type="java.lang.String" briefType="String" required="no">
-        
-          <short-description>The format of the folder names; optional.</short-description>
-        
-          <description>
-          The format of the folder names; optional.
- This must be in a format suitable for 
- &lt;code&gt;java.text.MessageFormat&lt;/code&gt;.
-  Index 1 of the format will be used as the file name.
-  Defaults to &lt;code&gt;{0}-arc({1})&lt;/code&gt;
-        </description>
-      
-        </attribute>
-      
-        <attribute name="force" type="java.lang.String" briefType="String" required="no">
-        
-          <short-description>Specifies the value of the force argument; optional.</short-description>
-        
-          <description>
-          Specifies the value of the force argument; optional.
- If set to &lt;i&gt;yes&lt;/i&gt; all files that exists and are 
- writable are overwritten. Default &lt;i&gt;no&lt;/i&gt; causes the files 
- that are writable to be ignored. This stops the PVCS command 
- &lt;i&gt;get&lt;/i&gt; to stop asking questions!
-        </description>
-      
-        </attribute>
-      
-        <attribute name="ignorereturncode" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>If set to true the return value from executing the pvcs
- commands are ignored; optional, default false.</short-description>
-        
-          <description>
-          If set to true the return value from executing the pvcs
- commands are ignored; optional, default false.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="label" type="java.lang.String" briefType="String" required="no">
-        
-          <short-description>Only files marked with this label are extracted; optional.</short-description>
-        
-          <description>
-          Only files marked with this label are extracted; optional.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="linestart" type="java.lang.String" briefType="String" required="no">
-        
-          <short-description>What a valid return value from PVCS looks like
-  when it describes a file.</short-description>
-        
-          <description>
-          What a valid return value from PVCS looks like
-  when it describes a file.  Defaults to &lt;code&gt;&amp;quot;P:&lt;/code&gt;.
- If you are not using an UNC name for your repository and the
- drive letter &lt;code&gt;P&lt;/code&gt; is incorrect for your setup, you may
- need to change this value, UNC names will always be
- accepted.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="promotiongroup" type="java.lang.String" briefType="String" required="no">
-        
-          <short-description>Specifies the name of the promotiongroup argument.</short-description>
-        
-          <description>
-          Specifies the name of the promotiongroup argument
-        </description>
-      
-        </attribute>
-      
-        <attribute name="pvcsbin" type="java.lang.String" briefType="String" required="no">
-        
-          <short-description>Specifies the location of the PVCS bin directory; optional if on the PATH.</short-description>
-        
-          <description>
-          Specifies the location of the PVCS bin directory; optional if on the PATH.
- On some systems the PVCS executables &lt;i&gt;pcli&lt;/i&gt;
- and &lt;i&gt;get&lt;/i&gt; are not found in the PATH. In such cases this attribute
- should be set to the bin directory of the PVCS installation containing
- the executables mentioned before. If this attribute isn't specified the
- tag expects the executables to be found using the PATH environment variable.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="pvcsproject" type="java.lang.String" briefType="String" required="no">
-        
-          <short-description>The project within the PVCS repository to extract files from;
- optional, default &amp;quot;/&amp;quot;.</short-description>
-        
-          <description>
-          The project within the PVCS repository to extract files from;
- optional, default &amp;quot;/&amp;quot;
-        </description>
-      
-        </attribute>
-      
-        <attribute name="repository" type="java.lang.String" briefType="String" required="yes">
-        
-          <short-description>The network name of the PVCS repository; required.</short-description>
-        
-          <description>
-          The network name of the PVCS repository; required.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="updateonly" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>If set to &lt;i&gt;true&lt;/i&gt; files are fetched only if 
- newer than existing local files; optional, default false.</short-description>
-        
-          <description>
-          If set to &lt;i&gt;true&lt;/i&gt; files are fetched only if 
- newer than existing local files; optional, default false.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="workspace" type="java.lang.String" briefType="String" required="no">
-        
-          <short-description>Workspace to use; optional.</short-description>
-        
-          <description>
-          Workspace to use; optional.  
- By specifying a workspace, the files are extracted to that location.
- A PVCS workspace is a name for a location of the workfiles and 
- isn't as such the location itself. 
- You define the location for a workspace using the PVCS GUI clients.
- If this isn't specified the default workspace for the current user is used.
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-      
-        <element name="pvcsproject" type="org.apache.tools.ant.taskdefs.optional.pvcs.PvcsProject" briefType="" required="NOTDEFINED">
-        
-          <short-description>Specify a project within the PVCS repository to extract files from.</short-description>
-        
-          <description>
-          Specify a project within the PVCS repository to extract files from.
-        </description>
-      
-        </element>
-
-    
-      </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="record" category="utility" classname="org.apache.tools.ant.taskdefs.Recorder">
-
-  
-    <short-description>Adds a listener to the current build process that records the output to a file.</short-description>
-  
-    <description>
-    Adds a listener to the current build process that records the
- output to a file.
- &lt;p&gt;Several recorders can exist at the same time.  Each recorder is
- associated with a file.  The filename is used as a unique identifier for
- the recorders.  The first call to the recorder task with an unused filename
- will create a recorder (using the parameters provided) and add it to the
- listeners of the build.  All subsequent calls to the recorder task using
- this filename will modify that recorders state (recording or not) or other
- properties (like logging level).&lt;/p&gt;
- &lt;p&gt;Some technical issues: the file's print stream is flushed for &amp;quot;finished&amp;quot;
- events (buildFinished, targetFinished and taskFinished), and is closed on
- a buildFinished event.&lt;/p&gt;
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="action" type="org.apache.tools.ant.taskdefs.Recorder.ActionChoices" briefType="&quot;start&quot;, &quot;stop&quot;" required="NOTDEFINED">
-        
-          <short-description>Action for the associated recorder entry.</short-description>
-        
-          <description>
-          Sets the action for the associated recorder entry.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="append" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          <short-description>Whether or not the logger should append to a previous file.</short-description>
-        
-          <description>
-          Whether or not the logger should append to a previous file.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="emacsmode" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          <short-description>No description.</short-description>
-        
-          <description>
-        </description>
-      
-        </attribute>
-      
-        <attribute name="loglevel" type="org.apache.tools.ant.taskdefs.Recorder.VerbosityLevelChoices" briefType="&quot;error&quot;, &quot;warn&quot;, &quot;info&quot;, &quot;verbose&quot;, &quot;debug&quot;" required="NOTDEFINED">
-        
-          <short-description>Level to which this recorder entry should log to.</short-description>
-        
-          <description>
-          Sets the level to which this recorder entry should log to.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="name" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Name of the file to log to, and the name of the recorder
- entry.</short-description>
-        
-          <description>
-          Sets the name of the file to log to, and the name of the recorder
- entry.
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-    </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="rename" category="other" classname="org.apache.tools.ant.taskdefs.Rename" deprecated="true">
-
-  
-    <short-description>Renames a file.</short-description>
-  
-    <description>
-    Renames a file.
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="dest" type="java.io.File" briefType="File" required="yes">
-        
-          <short-description>New name of the file.</short-description>
-        
-          <description>
-          Sets the new name of the file.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="replace" type="java.lang.String" briefType="String" required="no">
-        
-          <short-description>Sets whether an existing file should be replaced.</short-description>
-        
-          <description>
-          Sets whether an existing file should be replaced.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="src" type="java.io.File" briefType="File" required="yes">
-        
-          <short-description>File to be renamed.</short-description>
-        
-          <description>
-          Sets the file to be renamed.
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-    </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="renameextensions" category="other" classname="org.apache.tools.ant.taskdefs.optional.RenameExtensions" deprecated="true" matchingTask="true">
-
-  
-    <short-description>No Description.</short-description>
-  
-    <description>
-    
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="fromextension" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>The string that files must end in to be renamed.</short-description>
-        
-          <description>
-          The string that files must end in to be renamed
-        </description>
-      
-        </attribute>
-      
-        <attribute name="replace" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>Store replace attribute - this determines whether the target file
- should be overwritten if present.</short-description>
-        
-          <description>
-          store replace attribute - this determines whether the target file
- should be overwritten if present
-        </description>
-      
-        </attribute>
-      
-        <attribute name="srcdir" type="java.io.File" briefType="File" required="yes">
-        
-          <short-description>Source dir to find the files to be renamed.</short-description>
-        
-          <description>
-          Set the source dir to find the files to be renamed.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="toextension" type="java.lang.String" briefType="String" required="yes">
-        
-          <short-description>The string that renamed files will end with on
- completion.</short-description>
-        
-          <description>
-          The string that renamed files will end with on
- completion
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-    </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="replace" category="filesystem" classname="org.apache.tools.ant.taskdefs.Replace" matchingTask="true">
-
-  
-    <short-description>Replaces all occurrences of one or more string tokens with given values in the indicated files.</short-description>
-  
-    <description>
-    Replaces all occurrences of one or more string tokens with given
- values in the indicated files. Each value can be either a string 
- or the value of a property available in a designated property file.
- If you want to replace a text that crosses line boundaries, you
- must use a nested &lt;code&gt;&amp;lt;replacetoken&amp;gt;&lt;/code&gt; element.
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="dir" type="java.io.File" briefType="File" required="">
-        
-          <short-description>The base directory to use when replacing a token in multiple files;
- required if &lt;code&gt;file&lt;/code&gt; is not defined.</short-description>
-        
-          <description>
-          The base directory to use when replacing a token in multiple files;
- required if &lt;code&gt;file&lt;/code&gt; is not defined.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="encoding" type="java.lang.String" briefType="String" required="no - defaults to default jvm encoding">
-        
-          <short-description>File encoding to use on the files read and written by the task;
- optional, defaults to default JVM encoding.</short-description>
-        
-          <description>
-          Set the file encoding to use on the files read and written by the task;
- optional, defaults to default JVM encoding
-        </description>
-      
-        </attribute>
-      
-        <attribute name="file" type="java.io.File" briefType="File" required="exactly one of the two.">
-        
-          <short-description>Source file; required unless &lt;code&gt;dir&lt;/code&gt; is set.</short-description>
-        
-          <description>
-          Set the source file; required unless &lt;code&gt;dir&lt;/code&gt; is set.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="propertyfile" type="java.io.File" briefType="File" required="yes only if property attribute of &lt;replacefilter&gt; is used.">
-        
-          <short-description>The name of a property file from which properties specified using
- nested &lt;code&gt;&amp;lt;replacefilter&amp;gt;&lt;/code&gt; elements are drawn;
- Required only if &lt;i&gt;property&lt;/i&gt; attribute of
- &lt;code&gt;&amp;lt;replacefilter&amp;gt;&lt;/code&gt; is used.</short-description>
-        
-          <description>
-          The name of a property file from which properties specified using
- nested &lt;code&gt;&amp;lt;replacefilter&amp;gt;&lt;/code&gt; elements are drawn;
- Required only if &lt;i&gt;property&lt;/i&gt; attribute of
- &lt;code&gt;&amp;lt;replacefilter&amp;gt;&lt;/code&gt; is used.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="replacefilterfile" type="java.io.File" briefType="File" required="no.">
-        
-          <short-description>Name of a property file containing filters; optional.</short-description>
-        
-          <description>
-          Sets the name of a property file containing filters; optional.
- Each property will be treated as a
- replacefilter where token is the name of the property and value
- is the value of the property.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="summary" type="boolean" briefType="boolean" required="no, by default no summary is produced">
-        
-          <short-description>Indicates whether a summary of the replace operation should be
- produced, detailing how many token occurrences and files were
- processed; optional, default=false.</short-description>
-        
-          <description>
-          Indicates whether a summary of the replace operation should be
- produced, detailing how many token occurrences and files were
- processed; optional, default=false
-        </description>
-      
-        </attribute>
-      
-        <attribute name="token" type="java.lang.String" briefType="String" required="yes, unless a nested      replacetoken element or the replacefilterfile      attribute is used.">
-        
-          <short-description>String token to replace;
- required unless a nested
- &lt;code&gt;replacetoken&lt;/code&gt; element or the &lt;code&gt;replacefilterfile&lt;/code&gt;
- attribute is used.</short-description>
-        
-          <description>
-          Set the string token to replace;
- required unless a nested
- &lt;code&gt;replacetoken&lt;/code&gt; element or the &lt;code&gt;replacefilterfile&lt;/code&gt;
- attribute is used.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="value" type="java.lang.String" briefType="String" required="no">
-        
-          <short-description>String value to use as token replacement;
- optional, default is the empty string "".</short-description>
-        
-          <description>
-          Set the string value to use as token replacement;
- optional, default is the empty string ""
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-      
-        <element name="replacetoken" type="org.apache.tools.ant.taskdefs.Replace.NestedString" briefType="" required="NOTDEFINED">
-        
-          <short-description>The token to filter as the text of a nested element.</short-description>
-        
-          <description>
-          the token to filter as the text of a nested element
-        </description>
-      
-        </element>
-
-      
-        <element name="replacevalue" type="org.apache.tools.ant.taskdefs.Replace.NestedString" briefType="" required="NOTDEFINED">
-        
-          <short-description>The string to replace the token as the text of a nested element.</short-description>
-        
-          <description>
-          the string to replace the token as the text of a nested element
-        </description>
-      
-        </element>
-
-      
-        <element name="replacefilter" type="org.apache.tools.ant.taskdefs.Replace.Replacefilter" briefType="" required="NOTDEFINED">
-        
-          <short-description>Add a nested &amp;lt;replacefilter&amp;gt; element.</short-description>
-        
-          <description>
-          Add a nested &amp;lt;replacefilter&amp;gt; element.
-        </description>
-      
-        </element>
-
-    
-      </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="replaceregexp" category="other" classname="org.apache.tools.ant.taskdefs.optional.ReplaceRegExp">
-
-  
-    <short-description>Performs regular expression string replacements in a text file.</short-description>
-  
-    <description>
-    Performs regular expression string replacements in a text
- file.  The input file(s) must be able to be properly processed by
- a Reader instance.  That is, they must be text only, no binary.
-
- The syntax of the regular expression depends on the implemtation that
- you choose to use. The system property &lt;code&gt;ant.regexp.regexpimpl&lt;/code&gt;
- will be the classname of the implementation that will be used (the default
- is &lt;code&gt;org.apache.tools.ant.util.regexp.JakartaOroRegexp&lt;/code&gt; and
- requires the Jakarta Oro Package).
-
- &lt;pre&gt;
- For jdk  &amp;lt;= 1.3, there are two available implementations:
-   org.apache.tools.ant.util.regexp.JakartaOroRegexp (the default)
-        Requires  the jakarta-oro package
-
-   org.apache.tools.ant.util.regexp.JakartaRegexpRegexp
-        Requires the jakarta-regexp package
-
- For jdk &amp;gt;= 1.4 an additional implementation is available:
-   org.apache.tools.ant.util.regexp.Jdk14RegexpRegexp
-        Requires the jdk 1.4 built in regular expression package.
-
- Usage:
-
-   Call Syntax:
-
-     &amp;lt;replaceregexp file="file"
-                    match="pattern" 
-                    replace="pattern" 
-                    flags="options"?
-                    byline="true|false"? &amp;gt;
-       regexp?
-       substitution?
-       fileset*
-     &amp;lt;/replaceregexp&amp;gt;
-
-    NOTE: You must have either the file attribute specified, or at least one fileset subelement
-    to operation on.  You may not have the file attribute specified if you nest fileset elements
-    inside this task.  Also, you cannot specify both match and a regular expression subelement at
-    the same time, nor can you specify the replace attribute and the substitution subelement at
-    the same time.
-
-   Attributes:
-
-     file    --&amp;gt; A single file to operation on (mutually exclusive with the fileset subelements)
-     match   --&amp;gt; The Regular expression to match 
-     replace --&amp;gt; The Expression replacement string 
-     flags   --&amp;gt; The options to give to the replacement 
-                 g = Substitute all occurrences. default is to replace only the first one
-                 i = Case insensitive match
-
-     byline  --&amp;gt; Should this file be processed a single line at a time (default is false)
-                 "true" indicates to perform replacement on a line by line basis
-                 "false" indicates to perform replacement on the whole file at once.
-
-  Example:
-
-     The following call could be used to replace an old property name in a ".properties"
-     file with a new name.  In the replace attribute, you can refer to any part of the
-     match expression in parenthesis using backslash followed by a number like '\1'.
-
-     &amp;lt;replaceregexp file="test.properties"
-                    match="MyProperty=(.*)"
-                    replace="NewProperty=\1"
-                    byline="true" /&amp;gt;
-
- &lt;/pre&gt;
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="byline" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Process the file(s) one line at a time, executing the replacement
- on one line at a time.</short-description>
-        
-          <description>
-          Process the file(s) one line at a time, executing the replacement
- on one line at a time.  This is useful if you
- want to only replace the first occurence of a regular expression on
- each line, which is not easy to do when processing the file as a whole.
- Defaults to &lt;i&gt;false&lt;/i&gt;.&lt;/td&gt;
-        </description>
-      
-        </attribute>
-      
-        <attribute name="file" type="java.io.File" briefType="File" required="NOTDEFINED">
-        
-          <short-description>File for which the regular expression should be replaced;
- required unless a nested fileset is supplied.</short-description>
-        
-          <description>
-          file for which the regular expression should be replaced;
- required unless a nested fileset is supplied.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="flags" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>The flags to use when matching the regular expression.</short-description>
-        
-          <description>
-          The flags to use when matching the regular expression.  For more
- information, consult the Perl5 syntax.
- &lt;ul&gt;
-  &lt;li&gt;g : Global replacement.  Replace all occurences found
-  &lt;li&gt;i : Case Insensitive.  Do not consider case in the match
-  &lt;li&gt;m : Multiline.  Treat the string as multiple lines of input, 
-         using "^" and "$" as the start or end of any line, respectively, rather than start or end of string.
-  &lt;li&gt; s : Singleline.  Treat the string as a single line of input, using
-        "." to match any character, including a newline, which normally, it would not match.
-&lt;/ul&gt;
-        </description>
-      
-        </attribute>
-      
-        <attribute name="match" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>The regular expression pattern to match in the file(s);
- required if no nested &amp;lt;regexp&amp;gt; is used.</short-description>
-        
-          <description>
-          the regular expression pattern to match in the file(s);
- required if no nested &amp;lt;regexp&amp;gt; is used
-        </description>
-      
-        </attribute>
-      
-        <attribute name="replace" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>The substitution pattern to place in the file(s) in place
- of the regular expression.</short-description>
-        
-          <description>
-          The substitution pattern to place in the file(s) in place
- of the regular expression.
- Required if no nested &amp;lt;substitution&amp;gt; is used
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-      
-        <element name="fileset" type="org.apache.tools.ant.types.FileSet" briefType="Fileset" required="NOTDEFINED">
-        
-          <short-description>List files to apply the replacement to.</short-description>
-        
-          <description>
-          list files to apply the replacement to
-        </description>
-      
-        </element>
-
-      
-        <element name="regexp" type="org.apache.tools.ant.types.RegularExpression" briefType="" required="NOTDEFINED">
-        
-          <short-description>A regular expression.</short-description>
-        
-          <description>
-          A regular expression.
- You can use this element to refer to a previously
- defined regular expression datatype instance
-        </description>
-      
-        </element>
-
-      
-        <element name="substitution" type="org.apache.tools.ant.types.Substitution" briefType="" required="NOTDEFINED">
-        
-          <short-description>A substitution pattern.</short-description>
-        
-          <description>
-          A substitution pattern.  You can use this element to refer to a previously
- defined substitution pattern datatype instance.
-        </description>
-      
-        </element>
-
-    
-      </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="rmic" category="java" classname="org.apache.tools.ant.taskdefs.Rmic" matchingTask="true">
-
-  
-    <short-description>Runs the rmic compiler against classes.&lt;/p&gt; &lt;p&gt;Rmic can be run on a single class (as specified with the classname attribute) or a number of classes at once (all classes below base that are neither _Stub nor _Skel classes).</short-description>
-  
-    <description>
-    Runs the rmic compiler against classes.&lt;/p&gt;
- &lt;p&gt;Rmic can be run on a single class (as specified with the classname
- attribute) or a number of classes at once (all classes below base that
- are neither _Stub nor _Skel classes).  If you want to rmic a single
- class and this class is a class nested into another class, you have to
- specify the classname in the form &lt;code&gt;Outer$$Inner&lt;/code&gt; instead of
- &lt;code&gt;Outer.Inner&lt;/code&gt;.&lt;/p&gt;
- &lt;p&gt;It is possible to refine the set of files that are being rmiced. This can be
- done with the &lt;i&gt;includes&lt;/i&gt;, &lt;i&gt;includesfile&lt;/i&gt;, &lt;i&gt;excludes&lt;/i&gt;, 
- &lt;i&gt;excludesfile&lt;/i&gt; and &lt;i&gt;defaultexcludes&lt;/i&gt;
- attributes. With the &lt;i&gt;includes&lt;/i&gt; or &lt;i&gt;includesfile&lt;/i&gt; attribute you specify the files you want to
- have included by using patterns. The &lt;i&gt;exclude&lt;/i&gt; or &lt;i&gt;excludesfile&lt;/i&gt; attribute is used to specify
- the files you want to have excluded. This is also done with patterns. And
- finally with the &lt;i&gt;defaultexcludes&lt;/i&gt; attribute, you can specify whether you
- want to use default exclusions or not. See the section on 
- directory based tasks&lt;/a&gt;, on how the
- inclusion/exclusion of files works, and how to write patterns.&lt;/p&gt;
- &lt;p&gt;This task forms an implicit FileSet and
- supports all attributes of &lt;code&gt;&amp;lt;fileset&amp;gt;&lt;/code&gt;
- (&lt;code&gt;dir&lt;/code&gt; becomes &lt;code&gt;base&lt;/code&gt;) as well as the nested
- &lt;code&gt;&amp;lt;include&amp;gt;&lt;/code&gt;, &lt;code&gt;&amp;lt;exclude&amp;gt;&lt;/code&gt; and
- &lt;code&gt;&amp;lt;patternset&amp;gt;&lt;/code&gt; elements.&lt;/p&gt;
- &lt;p&gt;It is possible to use different compilers. This can be selected
- with the &amp;quot;build.rmic&amp;quot; property or the &lt;code&gt;compiler&lt;/code&gt;
- attribute. &lt;a name="compilervalues"&gt;There are three choices&lt;/a&gt;:&lt;/p&gt;
- &lt;ul&gt;
-   &lt;li&gt;sun (the standard compiler of the JDK)&lt;/li&gt;
-   &lt;li&gt;kaffe (the standard compiler of 
-       {@link &lt;a href="http://www.kaffe.org"&gt;Kaffe&lt;/a&gt;})&lt;/li&gt;
-   &lt;li&gt;weblogic&lt;/li&gt;
- &lt;/ul&gt;
- &lt;p&gt; The &lt;a href="http://dione.zcu.cz/~toman40/miniRMI/"&gt;miniRMI&lt;/a&gt;
- project contains a compiler implementation for this task as well,
- please consult miniRMI's documentation to learn how to use it.&lt;/p&gt;
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="base" type="java.io.File" briefType="File" required="yes">
-        
-          <short-description>Location to store the compiled files; required.</short-description>
-        
-          <description>
-          Sets the location to store the compiled files; required
-        </description>
-      
-        </attribute>
-      
-        <attribute name="classname" type="java.lang.String" briefType="String" required="no">
-        
-          <short-description>The class to run &lt;code&gt;rmic&lt;/code&gt; against;
- optional.</short-description>
-        
-          <description>
-          Sets the the class to run &lt;code&gt;rmic&lt;/code&gt; against;
- optional
-        </description>
-      
-        </attribute>
-      
-        <attribute name="classpath" type="org.apache.tools.ant.types.Path" briefType="Path" required="no">
-        
-          <short-description>Classpath to be used for this compilation.</short-description>
-        
-          <description>
-          Set the classpath to be used for this compilation.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="classpathref" type="org.apache.tools.ant.types.Reference" briefType="Reference" required="no">
-        
-          <short-description>Adds to the classpath a reference to 
- a &amp;lt;path&amp;gt; defined elsewhere.</short-description>
-        
-          <description>
-          Adds to the classpath a reference to 
- a &amp;lt;path&amp;gt; defined elsewhere.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="compiler" type="java.lang.String" briefType="String" required="no">
-        
-          <short-description>Compiler implementation to use; optional,
- defaults to the value of the &lt;code&gt;build.rmic&lt;/code&gt; property,
- or failing that, default compiler for the current VM.</short-description>
-        
-          <description>
-          Sets the compiler implementation to use; optional,
- defaults to the value of the &lt;code&gt;build.rmic&lt;/code&gt; property,
- or failing that, default compiler for the current VM
-        </description>
-      
-        </attribute>
-      
-        <attribute name="debug" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>Generate debug info (passes -g to rmic);
- optional, defaults to false.</short-description>
-        
-          <description>
-          generate debug info (passes -g to rmic);
- optional, defaults to false
-        </description>
-      
-        </attribute>
-      
-        <attribute name="extdirs" type="org.apache.tools.ant.types.Path" briefType="Path" required="no">
-        
-          <short-description>Extension directories that will be used during the
- compilation; optional.</short-description>
-        
-          <description>
-          Sets the extension directories that will be used during the
- compilation; optional.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="filtering" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>Indicates whether token filtering should take place;
- optional, default=false.</short-description>
-        
-          <description>
-          indicates whether token filtering should take place;
- optional, default=false
-        </description>
-      
-        </attribute>
-      
-        <attribute name="idl" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>Indicates that IDL output should be 
- generated.</short-description>
-        
-          <description>
-          Indicates that IDL output should be 
- generated.  This defaults to false 
- if not set.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="idlopts" type="java.lang.String" briefType="String" required="no">
-        
-          <short-description>Pass additional arguments for idl compile.</short-description>
-        
-          <description>
-          pass additional arguments for idl compile
-        </description>
-      
-        </attribute>
-      
-        <attribute name="iiop" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>Indicates that IIOP compatible stubs should
- be generated; optional, defaults to false 
- if not set.</short-description>
-        
-          <description>
-          Indicates that IIOP compatible stubs should
- be generated; optional, defaults to false 
- if not set.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="iiopopts" type="java.lang.String" briefType="String" required="no">
-        
-          <short-description>Set additional arguments for iiop.</short-description>
-        
-          <description>
-          Set additional arguments for iiop
-        </description>
-      
-        </attribute>
-      
-        <attribute name="includeantruntime" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>Sets whether or not to include ant's own classpath in this task's 
- classpath.</short-description>
-        
-          <description>
-          Sets whether or not to include ant's own classpath in this task's 
- classpath.
- Optional; default is &lt;code&gt;true&lt;/code&gt;.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="includejavaruntime" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>Task's classpath.</short-description>
-        
-          <description>
-          task's classpath.
- Enables or disables including the default run-time
- libraries from the executing VM; optional,
- defaults to false
-        </description>
-      
-        </attribute>
-      
-        <attribute name="sourcebase" type="java.io.File" briefType="File" required="no">
-        
-          <short-description>Optional directory to save generated source files to.</short-description>
-        
-          <description>
-          optional directory to save generated source files to.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="stubversion" type="java.lang.String" briefType="String" required="no">
-        
-          <short-description>Specify the JDK version for the generated stub code.</short-description>
-        
-          <description>
-          Specify the JDK version for the generated stub code.
- Specify &amp;quot;1.1&amp;quot; to pass the &amp;quot;-v1.1&amp;quot; option to rmic.&lt;/td&gt;
-        </description>
-      
-        </attribute>
-      
-        <attribute name="verify" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>Flag to enable verification so that the classes 
- found by the directory match are
- checked to see if they implement java.rmi.Remote.</short-description>
-        
-          <description>
-          Flag to enable verification so that the classes 
- found by the directory match are
- checked to see if they implement java.rmi.Remote.
- Optional; his defaults to false if not set.
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-      
-        <element name="classpath" type="org.apache.tools.ant.types.Path" briefType="Path" required="NOTDEFINED">
-        
-          <short-description>Creates a nested classpath element.</short-description>
-        
-          <description>
-          Creates a nested classpath element.
-        </description>
-      
-        </element>
-
-      
-        <element name="compilerarg" type="org.apache.tools.ant.taskdefs.Rmic.ImplementationSpecificArgument" briefType="" required="NOTDEFINED">
-        
-          <short-description>Adds an implementation specific command line argument.</short-description>
-        
-          <description>
-          Adds an implementation specific command line argument.
-        </description>
-      
-        </element>
-
-      
-        <element name="extdirs" type="org.apache.tools.ant.types.Path" briefType="Path" required="NOTDEFINED">
-        
-          <short-description>Maybe creates a nested extdirs element.</short-description>
-        
-          <description>
-          Maybe creates a nested extdirs element.
-        </description>
-      
-        </element>
-
-    
-      </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="rpm" category="other" classname="org.apache.tools.ant.taskdefs.optional.Rpm">
-
-  
-    <short-description>Invokes the rpm tool to build a Linux installation file.</short-description>
-  
-    <description>
-    Invokes the rpm tool to build a Linux installation file.
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="cleanbuilddir" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>Flag (optional, default=false) to remove 
- the generated files in the BUILD directory.</short-description>
-        
-          <description>
-          Flag (optional, default=false) to remove 
- the generated files in the BUILD directory
-        </description>
-      
-        </attribute>
-      
-        <attribute name="command" type="java.lang.String" briefType="String" required="no">
-        
-          <short-description>What command to issue to the rpm tool; optional.</short-description>
-        
-          <description>
-          What command to issue to the rpm tool; optional.
- The default is "-bb"
-        </description>
-      
-        </attribute>
-      
-        <attribute name="error" type="java.io.File" briefType="File" required="NOTDEFINED">
-        
-          <short-description>Optional file to save stderr to.</short-description>
-        
-          <description>
-          Optional file to save stderr to
-        </description>
-      
-        </attribute>
-      
-        <attribute name="output" type="java.io.File" briefType="File" required="NOTDEFINED">
-        
-          <short-description>Optional file to save stdout to.</short-description>
-        
-          <description>
-          Optional file to save stdout to.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="removesource" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>Flag (optional, default=false) 
- to remove the sources after the build.</short-description>
-        
-          <description>
-          Flag (optional, default=false) 
- to remove the sources after the build.
- See the the &lt;tt&gt;--rmsource&lt;/tt&gt;  option of rpmbuild.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="removespec" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>Flag (optional, default=false) to remove the spec file from SPECS.</short-description>
-        
-          <description>
-          Flag (optional, default=false) to remove the spec file from SPECS
-        </description>
-      
-        </attribute>
-      
-        <attribute name="specfile" type="java.lang.String" briefType="String" required="yes">
-        
-          <short-description>The name of the spec File to use; required.</short-description>
-        
-          <description>
-          The name of the spec File to use; required.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="topdir" type="java.io.File" briefType="File" required="no">
-        
-          <short-description>The directory which will have the expected
- subdirectories, SPECS, SOURCES, BUILD, SRPMS ; optional.</short-description>
-        
-          <description>
-          The directory which will have the expected
- subdirectories, SPECS, SOURCES, BUILD, SRPMS ; optional. 
- If this isn't specified,
- the &lt;tt&gt;baseDir&lt;/tt&gt; value is used
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-    </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="script" category="other" classname="org.apache.tools.ant.taskdefs.optional.Script">
-
-  
-    <short-description>Executes a script.</short-description>
-  
-    <description>
-    Executes a script.
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="language" type="java.lang.String" briefType="String" required="yes">
-        
-          <short-description>Defines the language (required).</short-description>
-        
-          <description>
-          Defines the language (required).
-        </description>
-      
-        </attribute>
-      
-        <attribute name="src" type="java.lang.String" briefType="String" required="no">
-        
-          <short-description>Load the script from an external file ; optional.</short-description>
-        
-          <description>
-          Load the script from an external file ; optional.
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-    </elements>
-
-      
-      <body>
-        
-        <description>
-          The script text.
-        </description>
-      
-      </body>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="sequential" category="control" classname="org.apache.tools.ant.taskdefs.Sequential">
-
-  
-    <short-description>Sequential is a container task - it can contain other Ant tasks.</short-description>
-  
-    <description>
-    Sequential is a container task - it can contain other Ant tasks. The nested 
- tasks are simply executed in sequence. Sequential's primary use is to support 
- the sequential execution of a subset of tasks within the
-{@link Parallel Parallel Task} 
-
- &lt;p&gt;
- The sequential task has no attributes and does not support any nested 
- elements apart from Ant tasks. Any valid Ant task may be embedded within the 
- sequential task.&lt;/p&gt;
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-    </attributes>
-
-    
-      <elements>
-    </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="serverdeploy" category="other" classname="org.apache.tools.ant.taskdefs.optional.j2ee.ServerDeploy">
-
-  
-    <short-description>Controls hot deployment tools for J2EE servers.</short-description>
-  
-    <description>
-    Controls hot deployment tools for J2EE servers.
-
-  This class is used as a framework for the creation of vendor specific
-  hot deployment tools.
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="action" type="java.lang.String" briefType="String" required="yes">
-        
-          <short-description>The action to be performed, usually "deploy"; required.</short-description>
-        
-          <description>
-          The action to be performed, usually "deploy"; required.
-   Some tools support additional actions, such as "delete", "list", "undeploy", "update"...
-        </description>
-      
-        </attribute>
-      
-        <attribute name="source" type="java.io.File" briefType="File" required="tool dependant">
-        
-          <short-description>The filename of the component to be deployed; optional
-  depending upon the tool and the action.</short-description>
-        
-          <description>
-          The filename of the component to be deployed; optional
-  depending upon the tool and the action.
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-      
-        <element name="generic" type="org.apache.tools.ant.taskdefs.optional.j2ee.GenericHotDeploymentTool" briefType="" required="NOTDEFINED">
-        
-          <short-description>Creates a generic deployment tool.</short-description>
-        
-          <description>
-          Creates a generic deployment tool.
-  &lt;p&gt;Ant calls this method on creation to handle embedded "generic" elements
-  in the ServerDeploy task.
-        </description>
-      
-        </element>
-
-      
-        <element name="jonas" type="org.apache.tools.ant.taskdefs.optional.j2ee.JonasHotDeploymentTool" briefType="" required="NOTDEFINED">
-        
-          <short-description>Creates a JOnAS deployment tool, for deployment to JOnAS servers.</short-description>
-        
-          <description>
-          Creates a JOnAS deployment tool, for deployment to JOnAS servers.
-  &lt;p&gt;Ant calls this method on creation to handle embedded "jonas" elements
-  in the ServerDeploy task.
-        </description>
-      
-        </element>
-
-      
-        <element name="weblogic" type="org.apache.tools.ant.taskdefs.optional.j2ee.WebLogicHotDeploymentTool" briefType="" required="NOTDEFINED">
-        
-          <short-description>Creates a WebLogic deployment tool, for deployment to WebLogic servers.</short-description>
-        
-          <description>
-          Creates a WebLogic deployment tool, for deployment to WebLogic servers.
-  &lt;p&gt;Ant calls this method on creation to handle embedded "weblogic" elements
-  in the ServerDeploy task.
-        </description>
-      
-        </element>
-
-    
-      </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="setproxy" category="other" classname="org.apache.tools.ant.taskdefs.optional.net.SetProxy">
-
-  
-    <short-description>Sets Java's web proxy properties, so that tasks and code run in the same JVM can have through-the-firewall access to remote web sites, and remote ftp sites.</short-description>
-  
-    <description>
-    Sets Java's web proxy properties, so that tasks and code run in
- the same JVM can have through-the-firewall access to remote web sites,
- and remote ftp sites.
- You can nominate an http and ftp proxy, or a socks server, reset the server 
- settings, or do nothing at all.
- &lt;p&gt; 
- Examples
- &lt;pre&gt;&amp;lt;setproxy/&amp;gt;&lt;/pre&gt;
- do nothing
- &lt;pre&gt;&amp;lt;setproxy proxyhost="firewall"/&amp;gt;&lt;/pre&gt;
- set the proxy to firewall:80
- &lt;pre&gt;&amp;lt;setproxy proxyhost="firewall" proxyport="81"/&amp;gt;&lt;/pre&gt;
- set the proxy to firewall:81
- &lt;pre&gt;&amp;lt;setproxy proxyhost=""/&amp;gt;&lt;/pre&gt;
- stop using the http proxy; don't change the socks settings
- &lt;pre&gt;&amp;lt;setproxy socksproxyhost="socksy"/&amp;gt;&lt;/pre&gt;
- use socks via socksy:1080
- &lt;pre&gt;&amp;lt;setproxy socksproxyhost=""/&amp;gt;&lt;/pre&gt;
- stop using the socks server
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="nonproxyhosts" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>A list of hosts to bypass the proxy on.</short-description>
-        
-          <description>
-          A list of hosts to bypass the proxy on. These should be separated
- with the vertical bar character '|'. Only in Java 1.4 does ftp use
- this list.
- e.g. fozbot.corp.sun.com|*.eng.sun.com
-        </description>
-      
-        </attribute>
-      
-        <attribute name="proxyhost" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>The HTTP/ftp proxy host.</short-description>
-        
-          <description>
-          the HTTP/ftp proxy host. Set this to "" for the http proxy
- option to be disabled
-        </description>
-      
-        </attribute>
-      
-        <attribute name="proxyport" type="int" briefType="int" required="NOTDEFINED">
-        
-          <short-description>The HTTP/ftp proxy port number; default is 80.</short-description>
-        
-          <description>
-          the HTTP/ftp proxy port number; default is 80
-        </description>
-      
-        </attribute>
-      
-        <attribute name="socksproxyhost" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>The name of a Socks server.</short-description>
-        
-          <description>
-          The name of a Socks server. Set to "" to turn socks
- proxying off.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="socksproxyport" type="int" briefType="int" required="NOTDEFINED">
-        
-          <short-description>ProxyPort for socks connections.</short-description>
-        
-          <description>
-          Set the ProxyPort for socks connections. The default value is 1080
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-    </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="signjar" category="java" classname="org.apache.tools.ant.taskdefs.SignJar">
-
-  
-    <short-description>Signs jar or zip files with the javasign command line tool.</short-description>
-  
-    <description>
-    Signs jar or zip files with the javasign command line tool. The
- tool detailed dependency checking: files are only signed if they
- are not signed. The &lt;tt&gt;signjar&lt;/tt&gt; attribute can point to the file to
- generate; if this file exists then
- its modification date is used as a cue as to whether to resign any JAR file.
- &lt;br&gt;  
- &lt;strong&gt;Note:&lt;/strong&gt; Requires Java 1.2 or later. &lt;/p&gt;
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="alias" type="java.lang.String" briefType="String" required="yes.">
-        
-          <short-description>The alias to sign under; required.</short-description>
-        
-          <description>
-          the alias to sign under; required
-        </description>
-      
-        </attribute>
-      
-        <attribute name="internalsf" type="boolean" briefType="boolean" required="no; default false">
-        
-          <short-description>Flag to include the .SF file inside the signature;
- optional; default false.</short-description>
-        
-          <description>
-          Flag to include the .SF file inside the signature;
- optional; default false
-        </description>
-      
-        </attribute>
-      
-        <attribute name="jar" type="java.io.File" briefType="File" required="yes.">
-        
-          <short-description>The jar file to sign; required.</short-description>
-        
-          <description>
-          the jar file to sign; required
-        </description>
-      
-        </attribute>
-      
-        <attribute name="keypass" type="java.lang.String" briefType="String" required="no">
-        
-          <short-description>Password for private key (if different); optional.</short-description>
-        
-          <description>
-          password for private key (if different); optional
-        </description>
-      
-        </attribute>
-      
-        <attribute name="keystore" type="java.io.File" briefType="File" required="no">
-        
-          <short-description>Keystore location; required.</short-description>
-        
-          <description>
-          keystore location; required
-        </description>
-      
-        </attribute>
-      
-        <attribute name="lazy" type="boolean" briefType="boolean" required="no; default false">
-        
-          <short-description>Flag to control whether the presence of a signature
- file means a JAR is signed;
- optional, default false.</short-description>
-        
-          <description>
-          flag to control whether the presence of a signature
- file means a JAR is signed;
- optional, default false
-        </description>
-      
-        </attribute>
-      
-        <attribute name="sectionsonly" type="boolean" briefType="boolean" required="no; default false">
-        
-          <short-description>Flag to compute hash of entire manifest;
- optional, default false.</short-description>
-        
-          <description>
-          flag to compute hash of entire manifest;
- optional, default false
-        </description>
-      
-        </attribute>
-      
-        <attribute name="sigfile" type="java.io.File" briefType="File" required="no">
-        
-          <short-description>Name of .SF/.DSA file; optional.</short-description>
-        
-          <description>
-          name of .SF/.DSA file; optional
-        </description>
-      
-        </attribute>
-      
-        <attribute name="signedjar" type="java.io.File" briefType="File" required="no">
-        
-          <short-description>Name of signed JAR file; optional.</short-description>
-        
-          <description>
-          name of signed JAR file; optional
-        </description>
-      
-        </attribute>
-      
-        <attribute name="storepass" type="java.lang.String" briefType="String" required="yes.">
-        
-          <short-description>Password for keystore integrity; required.</short-description>
-        
-          <description>
-          password for keystore integrity; required
-        </description>
-      
-        </attribute>
-      
-        <attribute name="storetype" type="java.lang.String" briefType="String" required="no">
-        
-          <short-description>Keystore type; optional.</short-description>
-        
-          <description>
-          keystore type; optional
-        </description>
-      
-        </attribute>
-      
-        <attribute name="verbose" type="boolean" briefType="boolean" required="no; default false">
-        
-          <short-description>Enable verbose output when signing
- ; optional: default false.</short-description>
-        
-          <description>
-          Enable verbose output when signing
- ; optional: default false
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-      
-        <element name="fileset" type="org.apache.tools.ant.types.FileSet" briefType="Fileset" required="NOTDEFINED">
-        
-          <short-description>Adds a set of files to sign.</short-description>
-        
-          <description>
-          Adds a set of files to sign
-        </description>
-      
-        </element>
-
-    
-      </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="sleep" category="utility" classname="org.apache.tools.ant.taskdefs.Sleep">
-
-  
-    <short-description>Sleep, or pause, for a period of time.</short-description>
-  
-    <description>
-    Sleep, or pause, for a period of time.
-
- A task for sleeping a short period of time, useful when a
- build or deployment process requires an interval between tasks.
-&lt;p&gt;
- A negative value can be supplied to any of attributes provided the total sleep time 
- is positive, pending fundamental changes in physics and JVM
- execution tims&lt;/p&gt;
- Note that sleep times are always hints to be interpred by the OS how it feels 
- small times may either be ignored or rounded up to a minimum timeslice. Note 
- also that the system clocks often have a fairly low granularity too, which complicates 
- measuring how long a sleep actually took.&lt;/p&gt;
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="failonerror" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>Flag controlling whether to break the build on an error.</short-description>
-        
-          <description>
-          flag controlling whether to break the build on an error.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="hours" type="int" briefType="int" required="no">
-        
-          <short-description>Hours to add to the sleep time.</short-description>
-        
-          <description>
-          hours to add to the sleep time.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="milliseconds" type="int" briefType="int" required="no">
-        
-          <short-description>Milliseconds to add to the sleep time.</short-description>
-        
-          <description>
-          milliseconds to add to the sleep time
-        </description>
-      
-        </attribute>
-      
-        <attribute name="minutes" type="int" briefType="int" required="no">
-        
-          <short-description>Minutes to add to the sleep time.</short-description>
-        
-          <description>
-          minutes to add to the sleep time
-        </description>
-      
-        </attribute>
-      
-        <attribute name="seconds" type="int" briefType="int" required="no">
-        
-          <short-description>Seconds to add to the sleep time.</short-description>
-        
-          <description>
-          seconds to add to the sleep time
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-    </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="soscheckin" category="other" classname="org.apache.tools.ant.taskdefs.optional.sos.SOSCheckin">
-
-  
-    <short-description>Commits and unlocks files in Visual SourceSafe via a SourceOffSite server.</short-description>
-  
-    <description>
-    Commits and unlocks files in Visual SourceSafe via a SourceOffSite server.
-
- &lt;p&gt;
- The following attributes are interpretted:
- &lt;table border="1"&gt;
-   &lt;tr&gt;
-     &lt;th&gt;Attribute&lt;/th&gt;
-     &lt;th&gt;Values&lt;/th&gt;
-     &lt;th&gt;Required&lt;/th&gt;
-   &lt;/tr&gt;
-   &lt;tr&gt;
-     &lt;td&gt;soscmddir&lt;/td&gt;
-     &lt;td&gt;Directory which contains soscmd(.exe) &lt;br&gt;
-     soscmd(.exe) must be in the path if this is not specified&lt;/td&gt;
-     &lt;td&gt;No&lt;/td&gt;
-   &lt;/tr&gt;
-   &lt;tr&gt;
-      &lt;td&gt;vssserverpath&lt;/td&gt;
-      &lt;td&gt;path to the srcsafe.ini  - eg. \\server\vss\srcsafe.ini&lt;/td&gt;
-      &lt;td&gt;Yes&lt;/td&gt;
-   &lt;/tr&gt;
-   &lt;tr&gt;
-      &lt;td&gt;sosserverpath&lt;/td&gt;
-      &lt;td&gt;address and port of the SOS server  - eg. 192.168.0.1:8888&lt;/td&gt;
-      &lt;td&gt;Yes&lt;/td&gt;
-   &lt;/tr&gt;
-   &lt;tr&gt;
-      &lt;td&gt;projectpath&lt;/td&gt;
-      &lt;td&gt;SourceSafe project path without the "$"&lt;/td&gt;
-      &lt;td&gt;Yes&lt;/td&gt;
-   &lt;/tr&gt;
-   &lt;tr&gt;
-      &lt;td&gt;file&lt;/td&gt;
-      &lt;td&gt;Filename to act upon&lt;br&gt; If no file is specified then act upon the project&lt;/td&gt;
-      &lt;td&gt;No&lt;/td&gt;
-   &lt;/tr&gt;
-   &lt;tr&gt;
-      &lt;td&gt;username&lt;/td&gt;
-      &lt;td&gt;SourceSafe username&lt;/td&gt;
-      &lt;td&gt;Yes&lt;/td&gt;
-   &lt;/tr&gt;
-   &lt;tr&gt;
-      &lt;td&gt;password&lt;/td&gt;
-      &lt;td&gt;SourceSafe password&lt;/td&gt;
-      &lt;td&gt;No&lt;/td&gt;
-   &lt;/tr&gt;
-   &lt;tr&gt;
-      &lt;td&gt;localpath&lt;/td&gt;
-      &lt;td&gt;Override the working directory and get to the specified path&lt;/td&gt;
-      &lt;td&gt;No&lt;/td&gt;
-   &lt;/tr&gt;
-   &lt;tr&gt;
-      &lt;td&gt;soshome&lt;/td&gt;
-      &lt;td&gt;The path to the SourceOffSite home directory&lt;/td&gt;
-      &lt;td&gt;No&lt;/td&gt;
-   &lt;/tr&gt;
-   &lt;tr&gt;
-      &lt;td&gt;nocompression&lt;/td&gt;
-      &lt;td&gt;true or false - disable compression&lt;/td&gt;
-      &lt;td&gt;No&lt;/td&gt;
-   &lt;/tr&gt;
-   &lt;tr&gt;
-      &lt;td&gt;recursive&lt;/td&gt;
-      &lt;td&gt;true or false - Only works with the CheckOutProject command&lt;/td&gt;
-      &lt;td&gt;No&lt;/td&gt;
-   &lt;/tr&gt;
-   &lt;tr&gt;
-      &lt;td&gt;nocache&lt;/td&gt;
-      &lt;td&gt;true or false - Only needed if SOSHOME is set as an enviroment variable&lt;/td&gt;
-      &lt;td&gt;No&lt;/td&gt;
-   &lt;/tr&gt;
-   &lt;tr&gt;
-      &lt;td&gt;verbose&lt;/td&gt;
-      &lt;td&gt;true or false - Status messages are displayed&lt;/td&gt;
-      &lt;td&gt;No&lt;/td&gt;
-   &lt;/tr&gt;
-   &lt;td&gt;comment&lt;/td&gt;
-      &lt;td&gt;A comment to be applied to all files being checked in&lt;/td&gt;
-      &lt;td&gt;No&lt;/td&gt;
-   &lt;/tr&gt;
- &lt;/table&gt;
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="comment" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Comment to apply to all files being labelled;
- optional, only valid in SOSLabel.</short-description>
-        
-          <description>
-          Set the comment to apply to all files being labelled;
- optional, only valid in SOSLabel
-        </description>
-      
-        </attribute>
-      
-        <attribute name="file" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Filename to act upon; optional.</short-description>
-        
-          <description>
-          Set the Filename to act upon; optional.
- If no file is specified then the tasks 
- act upon the project
-        </description>
-      
-        </attribute>
-      
-        <attribute name="label" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Labeled version to operate on in SourceSafe.</short-description>
-        
-          <description>
-          Set the labeled version to operate on in SourceSafe
-        </description>
-      
-        </attribute>
-      
-        <attribute name="localpath" type="org.apache.tools.ant.types.Path" briefType="Path" required="NOTDEFINED">
-        
-          <short-description>Override the working directory and get to the specified path; optional.</short-description>
-        
-          <description>
-          Override the working directory and get to the specified path; optional.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="nocache" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          <short-description>Flag to disable the cache when set;
- optional needed if SOSHOME is set as an environment variable.</short-description>
-        
-          <description>
-          flag to disable the cache when set;
- optional needed if SOSHOME is set as an environment variable.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="nocompress" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          <short-description>Flag that disables compression when set; optional, default.</short-description>
-        
-          <description>
-          Flag that disables compression when set; optional, default
-        </description>
-      
-        </attribute>
-      
-        <attribute name="password" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>SourceSafe password; optional.</short-description>
-        
-          <description>
-          Set the SourceSafe password; optional.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="projectpath" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>SourceSafe project path without the "$" prefix; required.</short-description>
-        
-          <description>
-          Set the SourceSafe project path without the "$" prefix; required
-        </description>
-      
-        </attribute>
-      
-        <attribute name="recursive" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          <short-description>Flag to recursively apply the action (not valid
- on all SOS tasks ); optional, default false.</short-description>
-        
-          <description>
-          Flag to recursively apply the action (not valid
- on all SOS tasks ); optional, default false
-        </description>
-      
-        </attribute>
-      
-        <attribute name="soscmd" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Directory where soscmd(.exe) is located;
- optional, soscmd must be on the path if omitted.</short-description>
-        
-          <description>
-          Set the directory where soscmd(.exe) is located;
- optional, soscmd must be on the path if omitted.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="soshome" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>The path to the SourceOffSite home directory.</short-description>
-        
-          <description>
-          The path to the SourceOffSite home directory
-        </description>
-      
-        </attribute>
-      
-        <attribute name="sosserverpath" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Address and port of SourceOffSite Server,
- eg. 192.168.0.1:8888 ; required.</short-description>
-        
-          <description>
-          Set the address and port of SourceOffSite Server,
- eg. 192.168.0.1:8888 ; required.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="username" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>SourceSafe username; required.</short-description>
-        
-          <description>
-          Set the SourceSafe username; required.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="verbose" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          <short-description>Enable verbose output; optional, default false.</short-description>
-        
-          <description>
-          Enable verbose output; optional, default false
-        </description>
-      
-        </attribute>
-      
-        <attribute name="version" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>A version number to get - 
- only works with the SOSGet on a file; optional.</short-description>
-        
-          <description>
-          Set the a version number to get - 
- only works with the SOSGet on a file; optional.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="vssserverpath" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Path to the location of the ss.ini file; 
- required.</short-description>
-        
-          <description>
-          Set the path to the location of the ss.ini file; 
- required.
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-    </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="soscheckout" category="other" classname="org.apache.tools.ant.taskdefs.optional.sos.SOSCheckout">
-
-  
-    <short-description>Retrieves and locks files in Visual SourceSafe via a SourceOffSite server.</short-description>
-  
-    <description>
-    Retrieves and locks files in Visual SourceSafe via a SourceOffSite server.
-
- &lt;p&gt;
- The following attributes are interpretted:
- &lt;table border="1"&gt;
-   &lt;tr&gt;
-     &lt;th&gt;Attribute&lt;/th&gt;
-     &lt;th&gt;Values&lt;/th&gt;
-     &lt;th&gt;Required&lt;/th&gt;
-   &lt;/tr&gt;
-   &lt;tr&gt;
-     &lt;td&gt;soscmddir&lt;/td&gt;
-     &lt;td&gt;Directory which contains soscmd(.exe) &lt;br&gt;
-     soscmd(.exe) must be in the path if this is not specified&lt;/td&gt;
-     &lt;td&gt;No&lt;/td&gt;
-   &lt;/tr&gt;
-   &lt;tr&gt;
-      &lt;td&gt;vssserverpath&lt;/td&gt;
-      &lt;td&gt;path to the srcsafe.ini  - eg. \\server\vss\srcsafe.ini&lt;/td&gt;
-      &lt;td&gt;Yes&lt;/td&gt;
-   &lt;/tr&gt;
-   &lt;tr&gt;
-      &lt;td&gt;sosserverpath&lt;/td&gt;
-      &lt;td&gt;address and port of the SOS server  - eg. 192.168.0.1:8888&lt;/td&gt;
-      &lt;td&gt;Yes&lt;/td&gt;
-   &lt;/tr&gt;
-   &lt;tr&gt;
-      &lt;td&gt;projectpath&lt;/td&gt;
-      &lt;td&gt;SourceSafe project path without the "$"&lt;/td&gt;
-      &lt;td&gt;Yes&lt;/td&gt;
-   &lt;/tr&gt;
-   &lt;tr&gt;
-      &lt;td&gt;file&lt;/td&gt;
-      &lt;td&gt;Filename to act upon&lt;br&gt; If no file is specified then act upon the project&lt;/td&gt;
-      &lt;td&gt;No&lt;/td&gt;
-   &lt;/tr&gt;
-   &lt;tr&gt;
-      &lt;td&gt;username&lt;/td&gt;
-      &lt;td&gt;SourceSafe username&lt;/td&gt;
-      &lt;td&gt;Yes&lt;/td&gt;
-   &lt;/tr&gt;
-   &lt;tr&gt;
-      &lt;td&gt;password&lt;/td&gt;
-      &lt;td&gt;SourceSafe password&lt;/td&gt;
-      &lt;td&gt;No&lt;/td&gt;
-   &lt;/tr&gt;
-   &lt;tr&gt;
-      &lt;td&gt;localpath&lt;/td&gt;
-      &lt;td&gt;Override the working directory and get to the specified path&lt;/td&gt;
-      &lt;td&gt;No&lt;/td&gt;
-   &lt;/tr&gt;
-   &lt;tr&gt;
-      &lt;td&gt;soshome&lt;/td&gt;
-      &lt;td&gt;The path to the SourceOffSite home directory&lt;/td&gt;
-      &lt;td&gt;No&lt;/td&gt;
-   &lt;/tr&gt;
-   &lt;tr&gt;
-      &lt;td&gt;nocompression&lt;/td&gt;
-      &lt;td&gt;true or false - disable compression&lt;/td&gt;
-      &lt;td&gt;No&lt;/td&gt;
-   &lt;/tr&gt;
-   &lt;tr&gt;
-      &lt;td&gt;recursive&lt;/td&gt;
-      &lt;td&gt;true or false - Only works with the CheckOutProject command&lt;/td&gt;
-      &lt;td&gt;No&lt;/td&gt;
-   &lt;/tr&gt;
-   &lt;tr&gt;
-      &lt;td&gt;nocache&lt;/td&gt;
-      &lt;td&gt;true or false - Only needed if SOSHOME is set as an enviroment variable&lt;/td&gt;
-      &lt;td&gt;No&lt;/td&gt;
-   &lt;/tr&gt;
-   &lt;tr&gt;
-      &lt;td&gt;verbose&lt;/td&gt;
-      &lt;td&gt;true or false - Status messages are displayed&lt;/td&gt;
-      &lt;td&gt;No&lt;/td&gt;
-   &lt;/tr&gt;
- &lt;/table&gt;
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="comment" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Comment to apply to all files being labelled;
- optional, only valid in SOSLabel.</short-description>
-        
-          <description>
-          Set the comment to apply to all files being labelled;
- optional, only valid in SOSLabel
-        </description>
-      
-        </attribute>
-      
-        <attribute name="file" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Filename to act upon; optional.</short-description>
-        
-          <description>
-          Set the Filename to act upon; optional.
- If no file is specified then the tasks 
- act upon the project
-        </description>
-      
-        </attribute>
-      
-        <attribute name="label" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Labeled version to operate on in SourceSafe.</short-description>
-        
-          <description>
-          Set the labeled version to operate on in SourceSafe
-        </description>
-      
-        </attribute>
-      
-        <attribute name="localpath" type="org.apache.tools.ant.types.Path" briefType="Path" required="NOTDEFINED">
-        
-          <short-description>Override the working directory and get to the specified path; optional.</short-description>
-        
-          <description>
-          Override the working directory and get to the specified path; optional.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="nocache" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          <short-description>Flag to disable the cache when set;
- optional needed if SOSHOME is set as an environment variable.</short-description>
-        
-          <description>
-          flag to disable the cache when set;
- optional needed if SOSHOME is set as an environment variable.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="nocompress" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          <short-description>Flag that disables compression when set; optional, default.</short-description>
-        
-          <description>
-          Flag that disables compression when set; optional, default
-        </description>
-      
-        </attribute>
-      
-        <attribute name="password" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>SourceSafe password; optional.</short-description>
-        
-          <description>
-          Set the SourceSafe password; optional.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="projectpath" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>SourceSafe project path without the "$" prefix; required.</short-description>
-        
-          <description>
-          Set the SourceSafe project path without the "$" prefix; required
-        </description>
-      
-        </attribute>
-      
-        <attribute name="recursive" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          <short-description>Flag to recursively apply the action (not valid
- on all SOS tasks ); optional, default false.</short-description>
-        
-          <description>
-          Flag to recursively apply the action (not valid
- on all SOS tasks ); optional, default false
-        </description>
-      
-        </attribute>
-      
-        <attribute name="soscmd" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Directory where soscmd(.exe) is located;
- optional, soscmd must be on the path if omitted.</short-description>
-        
-          <description>
-          Set the directory where soscmd(.exe) is located;
- optional, soscmd must be on the path if omitted.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="soshome" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>The path to the SourceOffSite home directory.</short-description>
-        
-          <description>
-          The path to the SourceOffSite home directory
-        </description>
-      
-        </attribute>
-      
-        <attribute name="sosserverpath" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Address and port of SourceOffSite Server,
- eg. 192.168.0.1:8888 ; required.</short-description>
-        
-          <description>
-          Set the address and port of SourceOffSite Server,
- eg. 192.168.0.1:8888 ; required.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="username" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>SourceSafe username; required.</short-description>
-        
-          <description>
-          Set the SourceSafe username; required.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="verbose" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          <short-description>Enable verbose output; optional, default false.</short-description>
-        
-          <description>
-          Enable verbose output; optional, default false
-        </description>
-      
-        </attribute>
-      
-        <attribute name="version" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>A version number to get - 
- only works with the SOSGet on a file; optional.</short-description>
-        
-          <description>
-          Set the a version number to get - 
- only works with the SOSGet on a file; optional.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="vssserverpath" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Path to the location of the ss.ini file; 
- required.</short-description>
-        
-          <description>
-          Set the path to the location of the ss.ini file; 
- required.
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-    </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="sosget" category="other" classname="org.apache.tools.ant.taskdefs.optional.sos.SOSGet">
-
-  
-    <short-description>Retrieves a read-only copy of the specified project or file from Visual SourceSafe via a SourceOffSite server.</short-description>
-  
-    <description>
-    Retrieves a read-only copy of the specified project or file
- from Visual SourceSafe via a SourceOffSite server.
- &lt;p&gt;
- The following attributes are interpretted:
- &lt;table border="1"&gt;
-    &lt;tbody&gt;
-      &lt;tr&gt;
-         &lt;th&gt;Attribute&lt;/th&gt;
-         &lt;th&gt;Values&lt;/th&gt;
-         &lt;th&gt;Required&lt;/th&gt;
-       &lt;/tr&gt;
-       &lt;tr&gt;
-         &lt;td&gt;soscmddir&lt;/td&gt;
-         &lt;td&gt;Directory which contains soscmd(.exe) &lt;br&gt;
-         soscmd(.exe) must be in the path if this is not specified&lt;/td&gt;
-         &lt;td&gt;No&lt;/td&gt;
-       &lt;/tr&gt;
-       &lt;tr&gt;
-          &lt;td&gt;vssserverpath&lt;/td&gt;
-          &lt;td&gt;path to the srcsafe.ini  - eg. \\server\vss\srcsafe.ini&lt;/td&gt;
-          &lt;td&gt;Yes&lt;/td&gt;
-       &lt;/tr&gt;
-       &lt;tr&gt;
-          &lt;td&gt;sosserverpath&lt;/td&gt;
-          &lt;td&gt;address and port of the SOS server  - eg. 192.168.0.1:8888&lt;/td&gt;
-          &lt;td&gt;Yes&lt;/td&gt;
-       &lt;/tr&gt;
-       &lt;tr&gt;
-          &lt;td&gt;projectpath&lt;/td&gt;
-          &lt;td&gt;SourceSafe project path without the "$"&lt;/td&gt;
-          &lt;td&gt;Yes&lt;/td&gt;
-       &lt;/tr&gt;
-       &lt;tr&gt;
-          &lt;td&gt;file&lt;/td&gt;
-          &lt;td&gt;Filename to act upon&lt;br&gt;
-              If no file is specified then act upon the project&lt;/td&gt;
-          &lt;td&gt;No&lt;/td&gt;
-       &lt;/tr&gt;
-       &lt;tr&gt;
-          &lt;td&gt;username&lt;/td&gt;
-          &lt;td&gt;SourceSafe username&lt;/td&gt;
-          &lt;td&gt;Yes&lt;/td&gt;
-       &lt;/tr&gt;
-       &lt;tr&gt;
-          &lt;td&gt;password&lt;/td&gt;
-          &lt;td&gt;SourceSafe password&lt;/td&gt;
-          &lt;td&gt;No&lt;/td&gt;
-       &lt;/tr&gt;
-       &lt;tr&gt;
-          &lt;td&gt;localpath&lt;/td&gt;
-          &lt;td&gt;Override the working directory and get to the specified path&lt;/td&gt;
-          &lt;td&gt;No&lt;/td&gt;
-       &lt;/tr&gt;
-       &lt;tr&gt;
-          &lt;td&gt;soshome&lt;/td&gt;
-          &lt;td&gt;The path to the SourceOffSite home directory&lt;/td&gt;
-          &lt;td&gt;No&lt;/td&gt;
-       &lt;/tr&gt;
-       &lt;tr&gt;
-          &lt;td&gt;nocompression&lt;/td&gt;
-          &lt;td&gt;true or false - disable compression&lt;/td&gt;
-          &lt;td&gt;No&lt;/td&gt;
-       &lt;/tr&gt;
-       &lt;tr&gt;
-          &lt;td&gt;recursive&lt;/td&gt;
-          &lt;td&gt;true or false - Only works with the GetProject command&lt;/td&gt;
-          &lt;td&gt;No&lt;/td&gt;
-       &lt;/tr&gt;
-       &lt;tr&gt;
-          &lt;td&gt;version&lt;/td&gt;
-          &lt;td&gt;a version number to get - Only works with the GetFile command&lt;/td&gt;
-          &lt;td&gt;No&lt;/td&gt;
-       &lt;/tr&gt;
-       &lt;tr&gt;
-          &lt;td&gt;label&lt;/td&gt;
-          &lt;td&gt;a label version to get - Only works with the GetProject command&lt;/td&gt;
-          &lt;td&gt;No&lt;/td&gt;
-       &lt;/tr&gt;
-       &lt;tr&gt;
-          &lt;td&gt;nocache&lt;/td&gt;
-          &lt;td&gt;true or false - Only needed if SOSHOME is set as an enviroment variable&lt;/td&gt;
-          &lt;td&gt;No&lt;/td&gt;
-       &lt;/tr&gt;
-       &lt;tr&gt;
-          &lt;td&gt;verbose&lt;/td&gt;
-         &lt;td&gt;true or false - Status messages are displayed&lt;/td&gt;
-        &lt;td&gt;No&lt;/td&gt;
-      &lt;/tr&gt;
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="comment" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Comment to apply to all files being labelled;
- optional, only valid in SOSLabel.</short-description>
-        
-          <description>
-          Set the comment to apply to all files being labelled;
- optional, only valid in SOSLabel
-        </description>
-      
-        </attribute>
-      
-        <attribute name="file" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Filename to act upon; optional.</short-description>
-        
-          <description>
-          Set the Filename to act upon; optional.
- If no file is specified then the tasks 
- act upon the project
-        </description>
-      
-        </attribute>
-      
-        <attribute name="label" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Labeled version to operate on in SourceSafe.</short-description>
-        
-          <description>
-          Set the labeled version to operate on in SourceSafe
-        </description>
-      
-        </attribute>
-      
-        <attribute name="localpath" type="org.apache.tools.ant.types.Path" briefType="Path" required="NOTDEFINED">
-        
-          <short-description>Override the working directory and get to the specified path; optional.</short-description>
-        
-          <description>
-          Override the working directory and get to the specified path; optional.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="nocache" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          <short-description>Flag to disable the cache when set;
- optional needed if SOSHOME is set as an environment variable.</short-description>
-        
-          <description>
-          flag to disable the cache when set;
- optional needed if SOSHOME is set as an environment variable.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="nocompress" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          <short-description>Flag that disables compression when set; optional, default.</short-description>
-        
-          <description>
-          Flag that disables compression when set; optional, default
-        </description>
-      
-        </attribute>
-      
-        <attribute name="password" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>SourceSafe password; optional.</short-description>
-        
-          <description>
-          Set the SourceSafe password; optional.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="projectpath" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>SourceSafe project path without the "$" prefix; required.</short-description>
-        
-          <description>
-          Set the SourceSafe project path without the "$" prefix; required
-        </description>
-      
-        </attribute>
-      
-        <attribute name="recursive" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          <short-description>Flag to recursively apply the action (not valid
- on all SOS tasks ); optional, default false.</short-description>
-        
-          <description>
-          Flag to recursively apply the action (not valid
- on all SOS tasks ); optional, default false
-        </description>
-      
-        </attribute>
-      
-        <attribute name="soscmd" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Directory where soscmd(.exe) is located;
- optional, soscmd must be on the path if omitted.</short-description>
-        
-          <description>
-          Set the directory where soscmd(.exe) is located;
- optional, soscmd must be on the path if omitted.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="soshome" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>The path to the SourceOffSite home directory.</short-description>
-        
-          <description>
-          The path to the SourceOffSite home directory
-        </description>
-      
-        </attribute>
-      
-        <attribute name="sosserverpath" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Address and port of SourceOffSite Server,
- eg. 192.168.0.1:8888 ; required.</short-description>
-        
-          <description>
-          Set the address and port of SourceOffSite Server,
- eg. 192.168.0.1:8888 ; required.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="username" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>SourceSafe username; required.</short-description>
-        
-          <description>
-          Set the SourceSafe username; required.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="verbose" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          <short-description>Enable verbose output; optional, default false.</short-description>
-        
-          <description>
-          Enable verbose output; optional, default false
-        </description>
-      
-        </attribute>
-      
-        <attribute name="version" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>A version number to get - 
- only works with the SOSGet on a file; optional.</short-description>
-        
-          <description>
-          Set the a version number to get - 
- only works with the SOSGet on a file; optional.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="vssserverpath" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Path to the location of the ss.ini file; 
- required.</short-description>
-        
-          <description>
-          Set the path to the location of the ss.ini file; 
- required.
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-    </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="soslabel" category="other" classname="org.apache.tools.ant.taskdefs.optional.sos.SOSLabel">
-
-  
-    <short-description>Labels Visual SourceSafe files via a SourceOffSite server.</short-description>
-  
-    <description>
-    Labels Visual SourceSafe files via a SourceOffSite server.
- &lt;p&gt;
- The following attributes are interpreted:
- &lt;table border="1"&gt;
-   &lt;tr&gt;
-     &lt;th&gt;Attribute&lt;/th&gt;
-     &lt;th&gt;Values&lt;/th&gt;
-     &lt;th&gt;Required&lt;/th&gt;
-   &lt;/tr&gt;
-   &lt;tr&gt;
-     &lt;td&gt;soscmddir&lt;/td&gt;
-     &lt;td&gt;Directory which contains soscmd(.exe) &lt;br&gt;
-     soscmd(.exe) must be in the path if this is not specified&lt;/td&gt;
-     &lt;td&gt;No&lt;/td&gt;
-   &lt;/tr&gt;
-   &lt;tr&gt;
-      &lt;td&gt;vssserverpath&lt;/td&gt;
-      &lt;td&gt;path to the srcsafe.ini  - eg. \\server\vss\srcsafe.ini&lt;/td&gt;
-      &lt;td&gt;Yes&lt;/td&gt;
-   &lt;/tr&gt;
-   &lt;tr&gt;
-      &lt;td&gt;sosserverpath&lt;/td&gt;
-      &lt;td&gt;address and port of the SOS server  - eg. 192.168.0.1:8888&lt;/td&gt;
-      &lt;td&gt;Yes&lt;/td&gt;
-   &lt;/tr&gt;
-   &lt;tr&gt;
-      &lt;td&gt;projectpath&lt;/td&gt;
-      &lt;td&gt;SourceSafe project path without the "$"&lt;/td&gt;
-      &lt;td&gt;Yes&lt;/td&gt;
-   &lt;/tr&gt;
-   &lt;tr&gt;
-      &lt;td&gt;username&lt;/td&gt;
-      &lt;td&gt;SourceSafe username&lt;/td&gt;
-      &lt;td&gt;Yes&lt;/td&gt;
-   &lt;/tr&gt;
-   &lt;tr&gt;
-      &lt;td&gt;password&lt;/td&gt;
-      &lt;td&gt;SourceSafe password&lt;/td&gt;
-      &lt;td&gt;No&lt;/td&gt;
-   &lt;/tr&gt;
-   &lt;tr&gt;
-      &lt;td&gt;label&lt;/td&gt;
-      &lt;td&gt;The label to apply to a project&lt;/td&gt;
-      &lt;td&gt;Yes&lt;/td&gt;
-   &lt;/tr&gt;
-   &lt;tr&gt;
-      &lt;td&gt;comment&lt;/td&gt;
-      &lt;td&gt;A comment to be applied to all files being labeled&lt;/td&gt;
-      &lt;td&gt;No&lt;/td&gt;
-   &lt;/tr&gt;
-   &lt;tr&gt;
-      &lt;td&gt;verbose&lt;/td&gt;
-      &lt;td&gt;true or false - Status messages are displayed&lt;/td&gt;
-      &lt;td&gt;No&lt;/td&gt;
-   &lt;/tr&gt;
- &lt;/table&gt;
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="comment" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Comment to apply to all files being labelled;
- optional, only valid in SOSLabel.</short-description>
-        
-          <description>
-          Set the comment to apply to all files being labelled;
- optional, only valid in SOSLabel
-        </description>
-      
-        </attribute>
-      
-        <attribute name="file" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Filename to act upon; optional.</short-description>
-        
-          <description>
-          Set the Filename to act upon; optional.
- If no file is specified then the tasks 
- act upon the project
-        </description>
-      
-        </attribute>
-      
-        <attribute name="label" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Labeled version to operate on in SourceSafe.</short-description>
-        
-          <description>
-          Set the labeled version to operate on in SourceSafe
-        </description>
-      
-        </attribute>
-      
-        <attribute name="localpath" type="org.apache.tools.ant.types.Path" briefType="Path" required="NOTDEFINED">
-        
-          <short-description>Override the working directory and get to the specified path; optional.</short-description>
-        
-          <description>
-          Override the working directory and get to the specified path; optional.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="nocache" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          <short-description>Flag to disable the cache when set;
- optional needed if SOSHOME is set as an environment variable.</short-description>
-        
-          <description>
-          flag to disable the cache when set;
- optional needed if SOSHOME is set as an environment variable.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="nocompress" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          <short-description>Flag that disables compression when set; optional, default.</short-description>
-        
-          <description>
-          Flag that disables compression when set; optional, default
-        </description>
-      
-        </attribute>
-      
-        <attribute name="password" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>SourceSafe password; optional.</short-description>
-        
-          <description>
-          Set the SourceSafe password; optional.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="projectpath" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>SourceSafe project path without the "$" prefix; required.</short-description>
-        
-          <description>
-          Set the SourceSafe project path without the "$" prefix; required
-        </description>
-      
-        </attribute>
-      
-        <attribute name="recursive" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          <short-description>Flag to recursively apply the action (not valid
- on all SOS tasks ); optional, default false.</short-description>
-        
-          <description>
-          Flag to recursively apply the action (not valid
- on all SOS tasks ); optional, default false
-        </description>
-      
-        </attribute>
-      
-        <attribute name="soscmd" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Directory where soscmd(.exe) is located;
- optional, soscmd must be on the path if omitted.</short-description>
-        
-          <description>
-          Set the directory where soscmd(.exe) is located;
- optional, soscmd must be on the path if omitted.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="soshome" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>The path to the SourceOffSite home directory.</short-description>
-        
-          <description>
-          The path to the SourceOffSite home directory
-        </description>
-      
-        </attribute>
-      
-        <attribute name="sosserverpath" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Address and port of SourceOffSite Server,
- eg. 192.168.0.1:8888 ; required.</short-description>
-        
-          <description>
-          Set the address and port of SourceOffSite Server,
- eg. 192.168.0.1:8888 ; required.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="username" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>SourceSafe username; required.</short-description>
-        
-          <description>
-          Set the SourceSafe username; required.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="verbose" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          <short-description>Enable verbose output; optional, default false.</short-description>
-        
-          <description>
-          Enable verbose output; optional, default false
-        </description>
-      
-        </attribute>
-      
-        <attribute name="version" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>A version number to get - 
- only works with the SOSGet on a file; optional.</short-description>
-        
-          <description>
-          Set the a version number to get - 
- only works with the SOSGet on a file; optional.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="vssserverpath" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Path to the location of the ss.ini file; 
- required.</short-description>
-        
-          <description>
-          Set the path to the location of the ss.ini file; 
- required.
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-    </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="sound" category="other" classname="org.apache.tools.ant.taskdefs.optional.sound.SoundTask">
-
-  
-    <short-description>Plays a sound file at the end of the build, according to whether the build failed or succeeded.</short-description>
-  
-    <description>
-    Plays a sound file at the end of the build, according to whether the build failed or succeeded.
-
- There are three attributes to be set:
-
- &lt;code&gt;source&lt;/code&gt;: the location of the audio file to be played
- &lt;code&gt;duration&lt;/code&gt;: play the sound file continuously until "duration" milliseconds has expired
- &lt;code&gt;loops&lt;/code&gt;: the number of times the sound file should be played until stopped
-
- I have only tested this with .WAV and .AIFF sound file formats. Both seem
- to work fine.
-
- plans for the future:
- - use the midi api to define sounds (or drum beat etc) in xml and have
-   Ant play them back
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-    </attributes>
-
-    
-      <elements>
-      
-        <element name="fail" type="org.apache.tools.ant.taskdefs.optional.sound.SoundTask.BuildAlert" briefType="" required="NOTDEFINED">
-        
-          <short-description>Add a sound when the build fails.</short-description>
-        
-          <description>
-          add a sound when the build fails
-        </description>
-      
-        </element>
-
-      
-        <element name="success" type="org.apache.tools.ant.taskdefs.optional.sound.SoundTask.BuildAlert" briefType="" required="NOTDEFINED">
-        
-          <short-description>Add a sound when the build succeeds.</short-description>
-        
-          <description>
-          add a sound when the build succeeds
-        </description>
-      
-        </element>
-
-    
-      </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="splash" category="other" classname="org.apache.tools.ant.taskdefs.optional.splash.SplashTask">
-
-  
-    <short-description>Creates a splash screen.</short-description>
-  
-    <description>
-    Creates a splash screen. The splash screen is displayed
- for the duration of the build and includes a handy progress bar as
- well. Use in conjunction with the sound task to provide interest
- whilst waiting for your builds to complete...
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="imageurl" type="java.lang.String" briefType="String" required="no">
-        
-          <short-description>A URL pointing to an image to display; optional, default antlogo.gif
- from the classpath.</short-description>
-        
-          <description>
-          A URL pointing to an image to display; optional, default antlogo.gif
- from the classpath.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="password" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Proxy password; required if &lt;tt&gt;user&lt;/tt&gt; is set.</short-description>
-        
-          <description>
-          Proxy password; required if &lt;tt&gt;user&lt;/tt&gt; is set.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="port" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Proxy port; optional, default 80.</short-description>
-        
-          <description>
-          Proxy port; optional, default 80.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="proxy" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Name of proxy; optional.</short-description>
-        
-          <description>
-          name of proxy; optional.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="showduration" type="int" briefType="int" required="no">
-        
-          <short-description>How long to show the splash screen in milliseconds,
- optional; default 5000 ms.</short-description>
-        
-          <description>
-          how long to show the splash screen in milliseconds,
- optional; default 5000 ms.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="user" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Proxy user; optional, default =none.</short-description>
-        
-          <description>
-          Proxy user; optional, default =none.
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-    </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="sql" category="database" classname="org.apache.tools.ant.taskdefs.SQLExec">
-
-  
-    <short-description>Executes a series of SQL statements on a database using JDBC.</short-description>
-  
-    <description>
-    Executes a series of SQL statements on a database using JDBC.
-
- &lt;p&gt;Statements can
- either be read in from a text file using the &lt;i&gt;src&lt;/i&gt; attribute or from 
- between the enclosing SQL tags.&lt;/p&gt;
- &lt;p&gt;Multiple statements can be provided, separated by semicolons (or the 
- defined &lt;i&gt;delimiter&lt;/i&gt;). Individual lines within the statements can be 
- commented using either --, // or REM at the start of the line.&lt;/p&gt;
- &lt;p&gt;The &lt;i&gt;autocommit&lt;/i&gt; attribute specifies whether auto-commit should be 
- turned on or off whilst executing the statements. If auto-commit is turned 
- on each statement will be executed and committed. If it is turned off the 
- statements will all be executed as one transaction.&lt;/p&gt;
- &lt;p&gt;The &lt;i&gt;onerror&lt;/i&gt; attribute specifies how to proceed when an error occurs 
- during the execution of one of the statements. 
- The possible values are: &lt;b&gt;continue&lt;/b&gt; execution, only show the error;
- &lt;b&gt;stop&lt;/b&gt; execution and commit transaction;
- and &lt;b&gt;abort&lt;/b&gt; execution and transaction and fail task.&lt;/p&gt;
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="append" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>Whether output should be appended to or overwrite
- an existing file.</short-description>
-        
-          <description>
-          whether output should be appended to or overwrite
- an existing file.  Defaults to false.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="autocommit" type="boolean" briefType="boolean" required="no, default &quot;false&quot;">
-        
-          <short-description>Auto commit flag for database connection;
- optional, default false.</short-description>
-        
-          <description>
-          Auto commit flag for database connection;
- optional, default false.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="caching" type="boolean" briefType="boolean" required="no (default=true)">
-        
-          <short-description>Caching loaders / driver.</short-description>
-        
-          <description>
-          Caching loaders / driver. This is to avoid
- getting an OutOfMemoryError when calling this task
- multiple times in a row; default: true
-        </description>
-      
-        </attribute>
-      
-        <attribute name="classpath" type="org.apache.tools.ant.types.Path" briefType="Path" required="no (use system classpath)">
-        
-          <short-description>Classpath for loading the driver.</short-description>
-        
-          <description>
-          Sets the classpath for loading the driver.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="classpathref" type="org.apache.tools.ant.types.Reference" briefType="Reference" required="no (use system classpath)">
-        
-          <short-description>Classpath for loading the driver 
- using the classpath reference.</short-description>
-        
-          <description>
-          Set the classpath for loading the driver 
- using the classpath reference.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="delimiter" type="java.lang.String" briefType="String" required="no, default &quot;;&quot;">
-        
-          <short-description>Delimiter that separates SQL statements; 
- optional, default &amp;quot;;&amp;quot;
-
- &lt;p&gt;For example, set this to "go" and delimitertype to "ROW" for
- Sybase ASE or MS SQL Server.&lt;/p&gt;.</short-description>
-        
-          <description>
-          Set the delimiter that separates SQL statements; 
- optional, default &amp;quot;;&amp;quot;
-
- &lt;p&gt;For example, set this to "go" and delimitertype to "ROW" for
- Sybase ASE or MS SQL Server.&lt;/p&gt;
-        </description>
-      
-        </attribute>
-      
-        <attribute name="delimitertype" type="org.apache.tools.ant.taskdefs.SQLExec.DelimiterType" briefType="&quot;normal&quot;, &quot;row&quot;" required="NOTDEFINED">
-        
-          <short-description>Delimiter type: "normal" or "row" (default "normal").</short-description>
-        
-          <description>
-          Set the delimiter type: "normal" or "row" (default "normal").
-
- &lt;p&gt;The delimiter type takes two values - normal and row. Normal
- means that any occurence of the delimiter terminate the SQL
- command whereas with row, only a line containing just the
- delimiter is recognized as the end of the command.&lt;/p&gt;
-        </description>
-      
-        </attribute>
-      
-        <attribute name="driver" type="java.lang.String" briefType="String" required="yes">
-        
-          <short-description>Class name of the JDBC driver; required.</short-description>
-        
-          <description>
-          Class name of the JDBC driver; required.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="encoding" type="java.lang.String" briefType="String" required="no - defaults to default jvm encoding">
-        
-          <short-description>File encoding to use on the SQL files read in.</short-description>
-        
-          <description>
-          Set the file encoding to use on the SQL files read in
-        </description>
-      
-        </attribute>
-      
-        <attribute name="onerror" type="org.apache.tools.ant.taskdefs.SQLExec.OnError" briefType="&quot;continue&quot;, &quot;stop&quot;, &quot;abort&quot;" required="no, default &quot;abort&quot;">
-        
-          <short-description>Action to perform when statement fails: continue, stop, or abort
- optional; default &amp;quot;abort&amp;quot;.</short-description>
-        
-          <description>
-          Action to perform when statement fails: continue, stop, or abort
- optional; default &amp;quot;abort&amp;quot;
-        </description>
-      
-        </attribute>
-      
-        <attribute name="output" type="java.io.File" briefType="File" required="no (print to system.out by default)">
-        
-          <short-description>Output file; 
- optional, defaults to the Ant log.</short-description>
-        
-          <description>
-          Set the output file; 
- optional, defaults to the Ant log.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="password" type="java.lang.String" briefType="String" required="yes">
-        
-          <short-description>Password; required.</short-description>
-        
-          <description>
-          Sets the password; required.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="print" type="boolean" briefType="boolean" required="no, default &quot;false&quot;">
-        
-          <short-description>Print result sets from the statements;
- optional, default false.</short-description>
-        
-          <description>
-          Print result sets from the statements;
- optional, default false
-        </description>
-      
-        </attribute>
-      
-        <attribute name="rdbms" type="java.lang.String" briefType="String" required="no (no restriction)">
-        
-          <short-description>Execute task only if the lower case product name 
- of the DB matches this.</short-description>
-        
-          <description>
-          Execute task only if the lower case product name 
- of the DB matches this
-        </description>
-      
-        </attribute>
-      
-        <attribute name="showheaders" type="boolean" briefType="boolean" required="no, default &quot;true&quot;">
-        
-          <short-description>Print headers for result sets from the 
- statements; optional, default true.</short-description>
-        
-          <description>
-          Print headers for result sets from the 
- statements; optional, default true.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="src" type="java.io.File" briefType="File" required="yes, unless statements enclosed within tags">
-        
-          <short-description>Name of the SQL file to be run.</short-description>
-        
-          <description>
-          Set the name of the SQL file to be run.
- Required unless statements are enclosed in the buildfile
-        </description>
-      
-        </attribute>
-      
-        <attribute name="url" type="java.lang.String" briefType="String" required="yes">
-        
-          <short-description>Database connection URL; required.</short-description>
-        
-          <description>
-          Sets the database connection URL; required.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="userid" type="java.lang.String" briefType="String" required="yes">
-        
-          <short-description>User name for the connection; required.</short-description>
-        
-          <description>
-          Set the user name for the connection; required.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="version" type="java.lang.String" briefType="String" required="no (no restriction)">
-        
-          <short-description>Version string, execute task only if 
- rdbms version match; optional.</short-description>
-        
-          <description>
-          Sets the version string, execute task only if 
- rdbms version match; optional.
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-      
-        <element name="fileset" type="org.apache.tools.ant.types.FileSet" briefType="Fileset" required="NOTDEFINED">
-        
-          <short-description>Adds a set of files (nested fileset attribute).</short-description>
-        
-          <description>
-          Adds a set of files (nested fileset attribute).
-        </description>
-      
-        </element>
-
-      
-        <element name="classpath" type="org.apache.tools.ant.types.Path" briefType="Path" required="NOTDEFINED">
-        
-          <short-description>Add a path to the classpath for loading the driver.</short-description>
-        
-          <description>
-          Add a path to the classpath for loading the driver.
-        </description>
-      
-        </element>
-
-      
-        <element name="transaction" type="org.apache.tools.ant.taskdefs.SQLExec.Transaction" briefType="" required="NOTDEFINED">
-        
-          <short-description>Add a SQL transaction to execute.</short-description>
-        
-          <description>
-          Add a SQL transaction to execute
-        </description>
-      
-        </element>
-
-    
-      </elements>
-
-      
-      <body>
-        
-        <description>
-          Set an inline SQL command to execute. 
- NB: Properties are not expanded in this text.
-        </description>
-      
-      </body>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="stylebook" category="other" classname="org.apache.tools.ant.taskdefs.optional.StyleBook">
-
-  
-    <short-description>Executes the Apache Stylebook documentation generator.</short-description>
-  
-    <description>
-    Executes the Apache Stylebook documentation generator.
- Unlike the commandline version of this tool, all three arguments
- are required to run stylebook.
- &lt;p&gt;
- Being extended from &amp;lt;Java&amp;gt;, all the parent's attributes
- and options are available. Do not set any apart from the &lt;tt&gt;classpath&lt;/tt&gt;
- as they are not guaranteed to be there in future.
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="append" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          <short-description>If true, append output to existing file.</short-description>
-        
-          <description>
-          If true, append output to existing file.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="book" type="java.io.File" briefType="File" required="yes">
-        
-          <short-description>The book xml file that the documentation generation starts from; 
- required.</short-description>
-        
-          <description>
-          The book xml file that the documentation generation starts from; 
- required.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="classname" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Java class to execute.</short-description>
-        
-          <description>
-          Sets the Java class to execute.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="classpath" type="org.apache.tools.ant.types.Path" briefType="Path" required="NOTDEFINED">
-        
-          <short-description>Classpath to be used when running the Java class.</short-description>
-        
-          <description>
-          Set the classpath to be used when running the Java class
-        </description>
-      
-        </attribute>
-      
-        <attribute name="classpathref" type="org.apache.tools.ant.types.Reference" briefType="Reference" required="NOTDEFINED">
-        
-          <short-description>Classpath to use, by reference.</short-description>
-        
-          <description>
-          Classpath to use, by reference.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="dir" type="java.io.File" briefType="File" required="NOTDEFINED">
-        
-          <short-description>The working directory of the process.</short-description>
-        
-          <description>
-          The working directory of the process
-        </description>
-      
-        </attribute>
-      
-        <attribute name="failonerror" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          <short-description>If true, then fail if the command exits with a
- returncode other than 0.</short-description>
-        
-          <description>
-          If true, then fail if the command exits with a
- returncode other than 0
-        </description>
-      
-        </attribute>
-      
-        <attribute name="fork" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          <short-description>If true, execute in a new VM.</short-description>
-        
-          <description>
-          If true, execute in a new VM.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="jvmversion" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>JVM version.</short-description>
-        
-          <description>
-          Sets the JVM version.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="jar" type="java.io.File" briefType="File" required="NOTDEFINED">
-        
-          <short-description>The location of the JAR file to execute.</short-description>
-        
-          <description>
-          The location of the JAR file to execute.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="jvm" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Command used to start the VM (only if not forking).</short-description>
-        
-          <description>
-          Set the command used to start the VM (only if not forking).
-        </description>
-      
-        </attribute>
-      
-        <attribute name="jvmargs" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Command line arguments for the JVM.</short-description>
-        
-          <description>
-          Set the command line arguments for the JVM.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="loaderconfig" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>A loader configuration to send to stylebook; optional.</short-description>
-        
-          <description>
-          A loader configuration to send to stylebook; optional.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="maxmemory" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Corresponds to -mx or -Xmx depending on VM version.</short-description>
-        
-          <description>
-          Corresponds to -mx or -Xmx depending on VM version.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="newenvironment" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          <short-description>If true, use a completely new environment.</short-description>
-        
-          <description>
-          If true, use a completely new environment.
-
- &lt;p&gt;Will be ignored if we are not forking a new VM.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="output" type="java.io.File" briefType="File" required="NOTDEFINED">
-        
-          <short-description>File the output of the process is redirected to.</short-description>
-        
-          <description>
-          File the output of the process is redirected to.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="skindirectory" type="java.io.File" briefType="File" required="yes">
-        
-          <short-description>The directory that contains the stylebook skin;
- required.</short-description>
-        
-          <description>
-          the directory that contains the stylebook skin;
- required.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="targetdirectory" type="java.io.File" briefType="File" required="yes">
-        
-          <short-description>The destination directory where the documentation is generated;
- required.</short-description>
-        
-          <description>
-          the destination directory where the documentation is generated;
- required.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="timeout" type="java.lang.Long" briefType="long" required="NOTDEFINED">
-        
-          <short-description>Timeout in milliseconds after which the process will be killed.</short-description>
-        
-          <description>
-          Timeout in milliseconds after which the process will be killed.
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-      
-        <element name="env" type="org.apache.tools.ant.types.Environment.Variable" briefType="" required="NOTDEFINED">
-        
-          <short-description>Adds an environment variable.</short-description>
-        
-          <description>
-          Adds an environment variable.
-
- &lt;p&gt;Will be ignored if we are not forking a new VM.
-        </description>
-      
-        </element>
-
-      
-        <element name="sysproperty" type="org.apache.tools.ant.types.Environment.Variable" briefType="" required="NOTDEFINED">
-        
-          <short-description>Adds a system property.</short-description>
-        
-          <description>
-          Adds a system property.
-        </description>
-      
-        </element>
-
-      
-        <element name="arg" type="org.apache.tools.ant.types.Commandline.Argument" briefType="" required="NOTDEFINED">
-        
-          <short-description>Adds a command-line argument.</short-description>
-        
-          <description>
-          Adds a command-line argument.
-        </description>
-      
-        </element>
-
-      
-        <element name="classpath" type="org.apache.tools.ant.types.Path" briefType="Path" required="NOTDEFINED">
-        
-          <short-description>Adds a path to the classpath.</short-description>
-        
-          <description>
-          Adds a path to the classpath.
-        </description>
-      
-        </element>
-
-      
-        <element name="jvmarg" type="org.apache.tools.ant.types.Commandline.Argument" briefType="" required="NOTDEFINED">
-        
-          <short-description>Adds a JVM argument.</short-description>
-        
-          <description>
-          Adds a JVM argument.
-        </description>
-      
-        </element>
-
-    
-      </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="tar" category="packaging" classname="org.apache.tools.ant.taskdefs.Tar" matchingTask="true">
-
-  
-
-    <external>
-
-      <description>
-
-        <p>Creates a tar archive.</p>
-
-
-        <p>The 
-          <i>basedir</i> attribute is the reference directory from where to tar.
-        </p>
-
-
-        <p>This task is a 
-          <a href="../dirtasks.html#directorybasedtasks">directory based task</a>
-and, as such, forms an implicit 
-          <a href="../CoreTypes/fileset.html">Fileset</a>. This
-defines which files, relative to the 
-          <i>basedir</i>, will be included in the
-archive. The tar task supports all the attributes of Fileset to refine the
-set of files to be included in the implicit fileset.
-        </p>
-
-
-        <p>In addition to the implicit fileset, the tar task supports nested filesets. These
-filesets are extended to allow control over the access mode, username and groupname
-to be applied to the tar entries. This is useful, for example, when preparing archives for
-Unix systems where some files need to have execute permission.</p>
-
-
-        <p>Early versions of tar did not support path lengths greater than 100
-characters. Modern versions of tar do so, but in incompatible ways.
-The behaviour of the tar task when it encounters such paths is
-controlled by the 
-          <i>longfile</i> attribute.
-If the longfile attribute is set to 
-          <code>fail</code>, any long paths will
-cause the tar task to fail.  If the longfile attribute is set to
-
-          <code>truncate</code>, any long paths will be truncated to the 100 character
-maximum length prior to adding to the archive. If the value of the longfile
-attribute is set to 
-          <code>omit</code> then files containing long paths will be
-omitted from the archive.  Either option ensures that the archive can be
-untarred by any compliant version of tar. If the loss of path or file
-information is not acceptable, and it rarely is, longfile may be set to the
-value 
-          <code>gnu</code>. The tar task will then produce a GNU tar file which
-can have arbitrary length paths. Note however, that the resulting archive will
-only be able to be untarred with GNU tar.  The default for the longfile
-attribute is 
-          <code>warn</code> which behaves just like the gnu option except
-that it produces a warning for each file path encountered that does not match
-the limit.
-        </p>
-
-
-        <p>Note that this task does not perform compression. You might want to use the
-
-          <a href="gzip.html">GZip</a> task to prepare a .tar.gz package.
-        </p>
-
-      </description>
-
-
-      <section anchor="examples" name="Examples">
-
-        <pre>  &lt;tar tarfile="${dist}/manual.tar" basedir="htdocs/manual"/&gt;
-  &lt;gzip zipfile="${dist}/manual.tar.gz" src="${dist}/manual.tar"/&gt;</pre>
-
-        <p>tars all files in the 
-          <code>htdocs/manual</code> directory into a file called 
-          <code>manual.tar</code>
-in the 
-          <code>${dist}</code>  directory, then applies the gzip task to compress
-it.
-        </p>
-
-        <pre>  &lt;tar destfile="${dist}/manual.tar"
-       basedir="htdocs/manual"
-       excludes="mydocs/**, **/todo.html"
-  /&gt;</pre>
-
-        <p>tars all files in the 
-          <code>htdocs/manual</code> directory into a file called 
-          <code>manual.tar</code>
-in the 
-          <code>${dist}</code> directory. Files in the directory 
-          <code>mydocs</code>,
-or files with the name 
-          <code>todo.html</code> are excluded.
-        </p>
-
-
-        <pre>
-&lt;tar destfile="${basedir}/docs.tar"&gt;
-  &lt;tarfileset dir="${dir.src}/docs"
-              fullpath="/usr/doc/ant/README"
-              preserveLeadingSlashes="true"&gt;
-    &lt;include name="readme.txt"/&gt;
-  &lt;/tarfileset&gt;
-  &lt;tarfileset dir="${dir.src}/docs"
-              prefix="/usr/doc/ant"
-              preserveLeadingSlashes="true"&gt;
-    &lt;include name="*.html"/&gt;
-  &lt;/tarfileset&gt;
-&lt;/tar&gt;</pre>
-
-
-        <p>
-  Writes the file 
-          <code>docs/readme.txt</code> as
-  
-          <code>/usr/doc/ant/README</code> into the archive. All
-  
-          <code>*.html</code> files in the 
-          <code>docs</code> directory are
-  prefixed by 
-          <code>/usr/doc/ant</code>, so for example
-  
-          <code>docs/index.html</code> is written as
-  
-          <code>/usr/doc/ant/index.html</code> to the archive.
-
-        </p>
-
-
-        <pre>&lt;tar longfile="gnu"
-     destfile="${dist.base}/${dist.name}-src.tar" &gt;
-  &lt;tarfileset dir="${dist.name}/.." mode="755" username="ant" group="ant"&gt;
-    &lt;include name="${dist.name}/bootstrap.sh"/&gt;
-    &lt;include name="${dist.name}/build.sh"/&gt;
-  &lt;/tarfileset&gt;
-  &lt;tarfileset dir="${dist.name}/.." username="ant" group="ant"&gt;
-    &lt;include name="${dist.name}/**"/&gt;
-    &lt;exclude name="${dist.name}/bootstrap.sh"/&gt;
-    &lt;exclude name="${dist.name}/build.sh"/&gt;
-  &lt;/tarfileset&gt;
-&lt;/tar&gt; </pre>
-
-
-        <p>This example shows building a tar which uses the GNU extensions for long paths and
-where some files need to be marked as executable (mode 755)
-and the rest are use the default mode (read-write by owner). The first
-fileset selects just the executable files. The second fileset must exclude
-the executable files and include all others. </p>
-
-
-        <p>
-          <strong>Note: </strong> The tar task does not ensure that a file is only selected
-by one fileset. If the same file is selected by more than one fileset, it will be included in the
-tar file twice, with the same path.
-        </p>
-
-
-        <p>
-          <strong>Note:</strong> The patterns in the include and exclude
-elements are considered to be relative to the corresponding dir
-attribute as with all other filesets.  In the example above,
-
-          <code>${dist.name}</code> is not an absolute path, but a simple name
-of a directory, so 
-          <code>${dist.name}</code> is a valid path relative
-to 
-          <code>${dist.name}/..</code>.
-        </p>
-
-
-      </section>
-
-    </external>
-
-  
-    <short-description>Creates a tar archive.</short-description>
-  
-    <description>
-    Creates a tar archive.
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="basedir" type="java.io.File" briefType="File" required="no">
-        
-          <short-description>This is the base directory to look in for things to tar.</short-description>
-        
-          <description>
-          This is the base directory to look in for things to tar.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="compression" type="org.apache.tools.ant.taskdefs.Tar.TarCompressionMethod" briefType="&quot;none&quot;, &quot;gzip&quot;, &quot;bzip2&quot;" required="no">
-        
-          <short-description>Set compression method.</short-description>
-        
-          <description>
-          Set compression method.
- Allowable values are
- &lt;ul&gt;
- &lt;li&gt;  none - no compression
- &lt;li&gt;  gzip - Gzip compression
- &lt;li&gt;  bzip2 - Bzip2 compression
- &lt;/ul&gt;
-        </description>
-      
-        </attribute>
-      
-        <attribute name="destfile" type="java.io.File" briefType="File" required="yes">
-        
-          <short-description>Set is the name/location of where to create the tar file.</short-description>
-        
-          <description>
-          Set is the name/location of where to create the tar file.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="longfile" type="org.apache.tools.ant.taskdefs.Tar.TarLongFileMode" briefType="&quot;warn&quot;, &quot;fail&quot;, &quot;truncate&quot;, &quot;gnu&quot;, &quot;omit&quot;" required="no">
-        
-          <short-description>Set how to handle long files, those with a path&amp;gt;100 chars.</short-description>
-        
-          <description>
-          Set how to handle long files, those with a path&amp;gt;100 chars.
- Optional, default=warn.
- &lt;p&gt;
- Allowable values are
- &lt;ul&gt;
- &lt;li&gt;  truncate - paths are truncated to the maximum length
- &lt;li&gt;  fail - paths greater than the maximim cause a build exception
- &lt;li&gt;  warn - paths greater than the maximum cause a warning and GNU is used
- &lt;li&gt;  gnu - GNU extensions are used for any paths greater than the maximum.
- &lt;li&gt;  omit - paths greater than the maximum are omitted from the archive
- &lt;/ul&gt;
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-      
-        <element name="tarfileset" type="org.apache.tools.ant.taskdefs.Tar.TarFileSet" briefType="" required="NOTDEFINED">
-        
-          <short-description>Add a new fileset with the option to specify permissions.</short-description>
-        
-          <description>
-          Add a new fileset with the option to specify permissions
-        </description>
-      
-        </element>
-
-    
-      </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="taskdef" category="internal" classname="org.apache.tools.ant.taskdefs.Taskdef">
-
-  
-    <short-description>Adds a task definition to the current project, such that this new task can be used in the current project.</short-description>
-  
-    <description>
-    Adds a task definition to the current project, such that this new task can be
- used in the current project. Two attributes are needed, the name that identifies
- this task uniquely, and the full name of the class (including the packages) that
- implements this task.&lt;/p&gt;
- &lt;p&gt;You can also define a group of tasks at once using the file or
- resource attributes.  These attributes point to files in the format of
- Java property files.  Each line defines a single task in the
- format:&lt;/p&gt;
- &lt;pre&gt;
- taskname=fully.qualified.java.classname
- &lt;/pre&gt;
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="classname" type="java.lang.String" briefType="String" required="yes, unless file or resource have      been specified.">
-        
-          <short-description>The full class name of the object being defined.</short-description>
-        
-          <description>
-          the full class name of the object being defined.
- Required, unless file or resource have
- been specified.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="classpath" type="org.apache.tools.ant.types.Path" briefType="Path" required="no">
-        
-          <short-description>Classpath to be used when searching for component being defined.</short-description>
-        
-          <description>
-          Set the classpath to be used when searching for component being defined
-        </description>
-      
-        </attribute>
-      
-        <attribute name="classpathref" type="org.apache.tools.ant.types.Reference" briefType="Reference" required="no">
-        
-          <short-description>Reference to a classpath to use when loading the files.</short-description>
-        
-          <description>
-          reference to a classpath to use when loading the files.
- To actually share the same loader, set loaderref as well
-        </description>
-      
-        </attribute>
-      
-        <attribute name="file" type="java.io.File" briefType="File" required="no">
-        
-          <short-description>Name of the property file  to load
- ant name/classname pairs from.</short-description>
-        
-          <description>
-          Name of the property file  to load
- ant name/classname pairs from.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="loaderref" type="org.apache.tools.ant.types.Reference" briefType="Reference" required="no">
-        
-          <short-description>Use the reference to locate the loader.</short-description>
-        
-          <description>
-          Use the reference to locate the loader. If the loader is not
- found, taskdef will use the specified classpath and register it
- with the specified name.
- This allow multiple taskdef/typedef to use the same class loader,
- so they can be used together. It eliminate the need to
- put them in the CLASSPATH.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="name" type="java.lang.String" briefType="String" required="yes, unless file or resource have      been specified.">
-        
-          <short-description>Name of the property resource to load
- ant name/classname pairs from.</short-description>
-        
-          <description>
-          Name of the property resource to load
- ant name/classname pairs from.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="resource" type="java.lang.String" briefType="String" required="no">
-        
-          <short-description>Name of the property resource to load
- ant name/classname pairs from.</short-description>
-        
-          <description>
-          Name of the property resource to load
- ant name/classname pairs from.
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-      
-        <element name="classpath" type="org.apache.tools.ant.types.Path" briefType="Path" required="NOTDEFINED">
-        
-          <short-description>Create the classpath to be used when searching for component being defined.</short-description>
-        
-          <description>
-          Create the classpath to be used when searching for component being defined
-        </description>
-      
-        </element>
-
-    
-      </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="telnet" category="other" classname="org.apache.tools.ant.taskdefs.optional.net.TelnetTask">
-
-  
-    <short-description>Automates the telnet protocol.</short-description>
-  
-    <description>
-    Automates the telnet protocol.
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="initialcr" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>Send a carriage return after connecting; optional, defaults to false.</short-description>
-        
-          <description>
-          send a carriage return after connecting; optional, defaults to false.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="password" type="java.lang.String" briefType="String" required="only if userid is specified">
-        
-          <short-description>The login password to use
- required if &lt;tt&gt;userid&lt;/tt&gt; is set.</short-description>
-        
-          <description>
-          Set the the login password to use
- required if &lt;tt&gt;userid&lt;/tt&gt; is set.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="port" type="int" briefType="int" required="no">
-        
-          <short-description>Tcp port to connect to; default is 23.</short-description>
-        
-          <description>
-          Set the tcp port to connect to; default is 23.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="server" type="java.lang.String" briefType="String" required="yes">
-        
-          <short-description>Hostname or address of the remote server.</short-description>
-        
-          <description>
-          Set the hostname or address of the remote server.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="timeout" type="java.lang.Integer" briefType="int" required="no">
-        
-          <short-description>Default timeout in seconds to wait for a response, 
- zero means forever (the default).</short-description>
-        
-          <description>
-          set a default timeout in seconds to wait for a response, 
- zero means forever (the default)
-        </description>
-      
-        </attribute>
-      
-        <attribute name="userid" type="java.lang.String" briefType="String" required="only if password is specified">
-        
-          <short-description>The login id to use on the server; 
- required if &lt;tt&gt;password&lt;/tt&gt; is set.</short-description>
-        
-          <description>
-          Set the the login id to use on the server; 
- required if &lt;tt&gt;password&lt;/tt&gt; is set.
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-      
-        <element name="read" type="org.apache.tools.ant.taskdefs.optional.net.TelnetTask.TelnetSubTask" briefType="" required="NOTDEFINED">
-        
-          <short-description>A string to wait for from the server.</short-description>
-        
-          <description>
-          A string to wait for from the server. 
-  A subTask &amp;lt;read&amp;gt; tag was found.  Create the object, 
-  Save it in our list, and return it.
-        </description>
-      
-        </element>
-
-      
-        <element name="write" type="org.apache.tools.ant.taskdefs.optional.net.TelnetTask.TelnetSubTask" briefType="" required="NOTDEFINED">
-        
-          <short-description>Add text to send to the server
-  A subTask &amp;lt;write&amp;gt; tag was found.</short-description>
-        
-          <description>
-          Add text to send to the server
-  A subTask &amp;lt;write&amp;gt; tag was found.  Create the object, 
-  Save it in our list, and return it.
-        </description>
-      
-        </element>
-
-    
-      </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="tempfile" category="other" classname="org.apache.tools.ant.taskdefs.TempFile">
-
-  
-    <short-description>This task sets a property to  the name of a temporary file.</short-description>
-  
-    <description>
-    This task sets a property to  the name of a temporary file. 
-  Unlike the Java1.2 method to create a temporary file, this task
-  does work on Java1.1. Also, it does not actually create the
-  temporary file, but it does guarantee that the file did not
-  exist when the task was executed. 
- &lt;p&gt;  
- Examples
- &lt;pre&gt;&amp;lt;tempfile property="temp.file" /&amp;gt;&lt;/pre&gt;
- create a temporary file
- &lt;pre&gt;&amp;lt;tempfile property="temp.file" suffix=".xml" /&amp;gt;&lt;/pre&gt;
- create a temporary file with the .xml suffix.
- &lt;pre&gt;&amp;lt;tempfile property="temp.file" destDir="build"/&amp;gt;&lt;/pre&gt;
- create a temp file in the build subdir
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="destdir" type="java.io.File" briefType="File" required="NOTDEFINED">
-        
-          <short-description>Destination directory.</short-description>
-        
-          <description>
-          destination directory. If null, 
-the parent directory is used instead
-        </description>
-      
-        </attribute>
-      
-        <attribute name="prefix" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Optional prefix string.</short-description>
-        
-          <description>
-          optional prefix string
-        </description>
-      
-        </attribute>
-      
-        <attribute name="property" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>The property you wish to assign the temporary file to.</short-description>
-        
-          <description>
-          The property you wish to assign the temporary file to
-        </description>
-      
-        </attribute>
-      
-        <attribute name="suffix" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Suffix string for the temp file (optional).</short-description>
-        
-          <description>
-          Suffix string for the temp file (optional)
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-    </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="touch" category="filesystem" classname="org.apache.tools.ant.taskdefs.Touch">
-
-  
-    <short-description>Touch a file and/or fileset(s); corresponds to the Unix touch command.</short-description>
-  
-    <description>
-    Touch a file and/or fileset(s); corresponds to the Unix touch command.
-
- &lt;p&gt;If the file to touch doesn't exist, an empty one is
- created. &lt;/p&gt;
-
- &lt;p&gt;Note: Setting the modification time of files is not supported in
- JDK 1.1.&lt;/p&gt;
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="datetime" type="java.lang.String" briefType="String" required="no">
-        
-          <short-description>The new modification time of the file
- in the format MM/DD/YYYY HH:MM AM &lt;i&gt;or&lt;/i&gt; PM;
- Optional, default=now.</short-description>
-        
-          <description>
-          the new modification time of the file
- in the format MM/DD/YYYY HH:MM AM &lt;i&gt;or&lt;/i&gt; PM;
- Optional, default=now
-        </description>
-      
-        </attribute>
-      
-        <attribute name="file" type="java.io.File" briefType="File" required="unless a nested fileset element         has been specified.">
-        
-          <short-description>Single source file to touch.</short-description>
-        
-          <description>
-          Sets a single source file to touch.  If the file does not exist
- an empty file will be created.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="millis" type="long" briefType="long" required="no">
-        
-          <short-description>The new modification time of the file
- in milliseconds since midnight Jan 1 1970.</short-description>
-        
-          <description>
-          the new modification time of the file
- in milliseconds since midnight Jan 1 1970.
- Optional, default=now
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-      
-        <element name="fileset" type="org.apache.tools.ant.types.FileSet" briefType="Fileset" required="NOTDEFINED">
-        
-          <short-description>Add a set of files to touch.</short-description>
-        
-          <description>
-          Add a set of files to touch
-        </description>
-      
-        </element>
-
-    
-      </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="translate" category="other" classname="org.apache.tools.ant.taskdefs.optional.i18n.Translate" matchingTask="true">
-
-  
-    <short-description>Translates text embedded in files using Resource Bundle files.</short-description>
-  
-    <description>
-    Translates text embedded in files using Resource Bundle files.
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="bundle" type="java.lang.String" briefType="String" required="yes">
-        
-          <short-description>Sets Family name of resource bundle; required.</short-description>
-        
-          <description>
-          Sets Family name of resource bundle; required.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="bundlecountry" type="java.lang.String" briefType="String" required="no">
-        
-          <short-description>Sets locale specific country of resource bundle; optional.</short-description>
-        
-          <description>
-          Sets locale specific country of resource bundle; optional.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="bundleencoding" type="java.lang.String" briefType="String" required="no">
-        
-          <short-description>Sets Resource Bundle file encoding scheme; optional.</short-description>
-        
-          <description>
-          Sets Resource Bundle file encoding scheme; optional.  Defaults to source file
- encoding
-        </description>
-      
-        </attribute>
-      
-        <attribute name="bundlelanguage" type="java.lang.String" briefType="String" required="no">
-        
-          <short-description>Sets locale specific language of resource bundle; optional.</short-description>
-        
-          <description>
-          Sets locale specific language of resource bundle; optional.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="bundlevariant" type="java.lang.String" briefType="String" required="no">
-        
-          <short-description>Sets locale specific variant of resource bundle; optional.</short-description>
-        
-          <description>
-          Sets locale specific variant of resource bundle; optional.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="destencoding" type="java.lang.String" briefType="String" required="no">
-        
-          <short-description>Sets destination file encoding scheme; optional.</short-description>
-        
-          <description>
-          Sets destination file encoding scheme; optional.  Defaults to source file
- encoding
-        </description>
-      
-        </attribute>
-      
-        <attribute name="endtoken" type="java.lang.String" briefType="String" required="yes">
-        
-          <short-description>Sets ending token to identify keys; required.</short-description>
-        
-          <description>
-          Sets ending token to identify keys; required.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="forceoverwrite" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>Whether or not to overwrite existing file irrespective of
- whether it is newer than the source file as well as the
- resource bundle file.</short-description>
-        
-          <description>
-          Whether or not to overwrite existing file irrespective of
- whether it is newer than the source file as well as the
- resource bundle file.
- Defaults to false.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="srcencoding" type="java.lang.String" briefType="String" required="no">
-        
-          <short-description>Sets source file encoding scheme; optional,
- defaults to encoding of local system.</short-description>
-        
-          <description>
-          Sets source file encoding scheme; optional,
- defaults to encoding of local system.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="starttoken" type="java.lang.String" briefType="String" required="yes">
-        
-          <short-description>Sets starting token to identify keys; required.</short-description>
-        
-          <description>
-          Sets starting token to identify keys; required.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="todir" type="java.io.File" briefType="File" required="yes">
-        
-          <short-description>Sets Destination directory; required.</short-description>
-        
-          <description>
-          Sets Destination directory; required.
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-      
-        <element name="fileset" type="org.apache.tools.ant.types.FileSet" briefType="Fileset" required="NOTDEFINED">
-        
-          <short-description>Adds a set of files to translate as a nested fileset element.</short-description>
-        
-          <description>
-          Adds a set of files to translate as a nested fileset element.
-        </description>
-      
-        </element>
-
-    
-      </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="tstamp" category="utility" classname="org.apache.tools.ant.taskdefs.Tstamp">
-
-  
-    <short-description>Sets properties to the current time, or offsets from the current time.</short-description>
-  
-    <description>
-    Sets properties to the current time, or offsets from the current time.
- The default properties are TSTAMP, DSTAMP and TODAY;
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="prefix" type="java.lang.String" briefType="String" required="no">
-        
-          <short-description>Prefix for the properties.</short-description>
-        
-          <description>
-          Set a prefix for the properties. If the prefix does not end with a "."
- one is automatically added
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-      
-        <element name="format" type="org.apache.tools.ant.taskdefs.Tstamp.CustomFormat" briefType="" required="NOTDEFINED">
-        
-          <short-description>Create a custom format with the the current prefix.</short-description>
-        
-          <description>
-          create a custom format with the the current prefix.
-        </description>
-      
-        </element>
-
-    
-      </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="typedef" category="internal" classname="org.apache.tools.ant.taskdefs.Typedef">
-
-  
-    <short-description>Adds a data type definition to the current project.</short-description>
-  
-    <description>
-    Adds a data type definition to the current project.
- Two attributes are
- needed, the name that identifies this data type uniquely, and the full
- name of the class (including the packages) that implements this
- type.
- &lt;p&gt;You can also define a group of data types at once using the file or
- resource attributes.  These attributes point to files in the format of
- Java property files.   Each line defines a single data type in the
- format:&lt;/p&gt;
- &lt;pre&gt;
- typename=fully.qualified.java.classname
- &lt;/pre&gt;
- &lt;p&gt;Typedef should be used to add your own types to the system. Data
- types are things likepaths or filesets that can be defined at
- the project level and referenced via their ID attribute.&lt;/p&gt;
- &lt;p&gt;Custom data types usually need custom tasks to put them to good use.&lt;/p&gt;
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="classname" type="java.lang.String" briefType="String" required="yes, unless file or resource have      been specified.">
-        
-          <short-description>The full class name of the object being defined.</short-description>
-        
-          <description>
-          the full class name of the object being defined.
- Required, unless file or resource have
- been specified.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="classpath" type="org.apache.tools.ant.types.Path" briefType="Path" required="no">
-        
-          <short-description>Classpath to be used when searching for component being defined.</short-description>
-        
-          <description>
-          Set the classpath to be used when searching for component being defined
-        </description>
-      
-        </attribute>
-      
-        <attribute name="classpathref" type="org.apache.tools.ant.types.Reference" briefType="Reference" required="NOTDEFINED">
-        
-          <short-description>Reference to a classpath to use when loading the files.</short-description>
-        
-          <description>
-          reference to a classpath to use when loading the files.
- To actually share the same loader, set loaderref as well
-        </description>
-      
-        </attribute>
-      
-        <attribute name="file" type="java.io.File" briefType="File" required="no">
-        
-          <short-description>Name of the property file  to load
- ant name/classname pairs from.</short-description>
-        
-          <description>
-          Name of the property file  to load
- ant name/classname pairs from.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="loaderref" type="org.apache.tools.ant.types.Reference" briefType="Reference" required="no">
-        
-          <short-description>Use the reference to locate the loader.</short-description>
-        
-          <description>
-          Use the reference to locate the loader. If the loader is not
- found, taskdef will use the specified classpath and register it
- with the specified name.
- This allow multiple taskdef/typedef to use the same class loader,
- so they can be used together. It eliminate the need to
- put them in the CLASSPATH.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="name" type="java.lang.String" briefType="String" required="yes, unless file or resource have      been specified.">
-        
-          <short-description>Name of the property resource to load
- ant name/classname pairs from.</short-description>
-        
-          <description>
-          Name of the property resource to load
- ant name/classname pairs from.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="resource" type="java.lang.String" briefType="String" required="no">
-        
-          <short-description>Name of the property resource to load
- ant name/classname pairs from.</short-description>
-        
-          <description>
-          Name of the property resource to load
- ant name/classname pairs from.
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-      
-        <element name="classpath" type="org.apache.tools.ant.types.Path" briefType="Path" required="NOTDEFINED">
-        
-          <short-description>Create the classpath to be used when searching for component being defined.</short-description>
-        
-          <description>
-          Create the classpath to be used when searching for component being defined
-        </description>
-      
-        </element>
-
-    
-      </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="untar" category="packaging" classname="org.apache.tools.ant.taskdefs.Untar">
-
-  
-    <short-description>Untar a file.</short-description>
-  
-    <description>
-    Untar a file.
- &lt;p&gt;For JDK 1.1 &amp;quot;last modified time&amp;quot; field is set to current time instead of being
- carried from the archive file.&lt;/p&gt;
- &lt;p&gt;PatternSets are used to select files to extract
- &lt;I&gt;from&lt;/I&gt; the archive.  If no patternset is used, all files are extracted.
- &lt;/p&gt;
- &lt;p&gt;FileSet&gt;s may be used used to select archived files
- to perform unarchival upon.
- &lt;/p&gt;
- &lt;p&gt;File permissions will not be restored on extracted files.&lt;/p&gt;
- &lt;p&gt;The untar task recognizes the long pathname entries used by GNU tar.&lt;p&gt;
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="compression" type="org.apache.tools.ant.taskdefs.Untar.UntarCompressionMethod" briefType="&quot;none&quot;, &quot;gzip&quot;, &quot;bzip2&quot;" required="NOTDEFINED">
-        
-          <short-description>Set decompression algorithm to use; default=none.</short-description>
-        
-          <description>
-          Set decompression algorithm to use; default=none.
-
- Allowable values are
- &lt;ul&gt;
-   &lt;li&gt;none - no compression
-   &lt;li&gt;gzip - Gzip compression
-   &lt;li&gt;bzip2 - Bzip2 compression
- &lt;/ul&gt;
-        </description>
-      
-        </attribute>
-      
-        <attribute name="dest" type="java.io.File" briefType="File" required="NOTDEFINED">
-        
-          <short-description>Destination directory.</short-description>
-        
-          <description>
-          Set the destination directory. File will be unzipped into the
- destination directory.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="overwrite" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          <short-description>Should we overwrite files in dest, even if they are newer than
- the corresponding entries in the archive?.</short-description>
-        
-          <description>
-          Should we overwrite files in dest, even if they are newer than
- the corresponding entries in the archive?
-        </description>
-      
-        </attribute>
-      
-        <attribute name="src" type="java.io.File" briefType="File" required="NOTDEFINED">
-        
-          <short-description>Path to zip-file.</short-description>
-        
-          <description>
-          Set the path to zip-file.
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-      
-        <element name="fileset" type="org.apache.tools.ant.types.FileSet" briefType="Fileset" required="NOTDEFINED">
-        
-          <short-description>Add a fileset.</short-description>
-        
-          <description>
-          Add a fileset
-        </description>
-      
-        </element>
-
-      
-        <element name="patternset" type="org.apache.tools.ant.types.PatternSet" briefType="Patternset" required="NOTDEFINED">
-        
-          <short-description>Add a patternset.</short-description>
-        
-          <description>
-          Add a patternset
-        </description>
-      
-        </element>
-
-    
-      </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="unzip" category="packaging" classname="org.apache.tools.ant.taskdefs.Expand">
-
-  
-    <short-description>Unzip a file.</short-description>
-  
-    <description>
-    Unzip a file.
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="dest" type="java.io.File" briefType="File" required="yes">
-        
-          <short-description>Destination directory.</short-description>
-        
-          <description>
-          Set the destination directory. File will be unzipped into the
- destination directory.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="overwrite" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>Should we overwrite files in dest, even if they are newer than
- the corresponding entries in the archive?.</short-description>
-        
-          <description>
-          Should we overwrite files in dest, even if they are newer than
- the corresponding entries in the archive?
-        </description>
-      
-        </attribute>
-      
-        <attribute name="src" type="java.io.File" briefType="File" required="yes, if filesets are not used.">
-        
-          <short-description>Path to zip-file.</short-description>
-        
-          <description>
-          Set the path to zip-file.
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-      
-        <element name="fileset" type="org.apache.tools.ant.types.FileSet" briefType="Fileset" required="NOTDEFINED">
-        
-          <short-description>Add a fileset.</short-description>
-        
-          <description>
-          Add a fileset
-        </description>
-      
-        </element>
-
-      
-        <element name="patternset" type="org.apache.tools.ant.types.PatternSet" briefType="Patternset" required="NOTDEFINED">
-        
-          <short-description>Add a patternset.</short-description>
-        
-          <description>
-          Add a patternset
-        </description>
-      
-        </element>
-
-    
-      </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="uptodate" category="control" classname="org.apache.tools.ant.taskdefs.UpToDate">
-
-  
-    <short-description>Sets the given property if the specified target has a timestamp greater than all of the source files.</short-description>
-  
-    <description>
-    Sets the given property if the specified target has a timestamp
- greater than all of the source files.
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="property" type="java.lang.String" briefType="String" required="yes">
-        
-          <short-description>The property to set if the target file is more up-to-date than
- (each of) the source file(s).</short-description>
-        
-          <description>
-          The property to set if the target file is more up-to-date than
- (each of) the source file(s).
-        </description>
-      
-        </attribute>
-      
-        <attribute name="srcfile" type="java.io.File" briefType="File" required="yes, unless a nested        &lt;srcfiles&gt; element is present.">
-        
-          <short-description>The file that must be older than the target file
- if the property is to be set.</short-description>
-        
-          <description>
-          The file that must be older than the target file
- if the property is to be set.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="targetfile" type="java.io.File" briefType="File" required="yes, unless a nested        &lt;mapper&gt; element is present.">
-        
-          <short-description>The file which must be more up-to-date than (each of) the source file(s)
- if the property is to be set.</short-description>
-        
-          <description>
-          The file which must be more up-to-date than (each of) the source file(s)
- if the property is to be set.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="value" type="java.lang.String" briefType="String" required="no; defaults to true.">
-        
-          <short-description>The value to set the named property to if the target file is more
- up-to-date than (each of) the source file(s).</short-description>
-        
-          <description>
-          The value to set the named property to if the target file is more
- up-to-date than (each of) the source file(s). Defaults to 'true'.
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-      
-        <element name="srcfiles" type="org.apache.tools.ant.types.FileSet" briefType="Fileset" required="NOTDEFINED">
-        
-          <short-description>Nested &amp;lt;srcfiles&amp;gt; element.</short-description>
-        
-          <description>
-          Nested &amp;lt;srcfiles&amp;gt; element.
-        </description>
-      
-        </element>
-
-      
-        <element name="mapper" type="org.apache.tools.ant.types.Mapper" briefType="Mapper" required="NOTDEFINED">
-        
-          <short-description>Defines the FileNameMapper to use (nested mapper element).</short-description>
-        
-          <description>
-          Defines the FileNameMapper to use (nested mapper element).
-        </description>
-      
-        </element>
-
-    
-      </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="vajexport" category="other" classname="org.apache.tools.ant.taskdefs.optional.ide.VAJExport">
-
-  
-    <short-description>Export packages from the Visual Age for Java workspace.</short-description>
-  
-    <description>
-    Export packages from the Visual Age for Java workspace.
- The packages are specified similar to all other MatchingTasks.
- Since the VA Workspace is not file based, this task is simulating
- a directory hierarchy for the workspace:
- The 'root' contains all project 'dir's, and the projects contain
- their respective package 'dir's.
- Example:
- &lt;blockquote&gt;
- &amp;lt;vajexport destdir="C:/builddir/source"&gt;
- &amp;nbsp;&amp;lt;include name="/MyVAProject/org/foo/subsystem1/**" /&gt;
- &amp;nbsp;&amp;lt;exclude name="/MyVAProject/org/foo/subsystem1/test/**"/&gt;
- &amp;lt;/vajexport&gt;
- &lt;/blockquote&gt;
- exports all packages in the project MyVAProject which start with
- 'org.foo.subsystem1' except of these starting with
- 'org.foo.subsystem1.test'.
-
- There are flags to choose which items to export:
- exportSources:   export Java sources
- exportResources: export project resources
- exportClasses:   export class files
- exportDebugInfo: export class files with debug info (use with exportClasses)
- default is exporting Java files and resources.
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="defaultexcludes" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          <short-description>Sets whether default exclusions should be used or not; default true.</short-description>
-        
-          <description>
-          Sets whether default exclusions should be used or not; default true.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="destdir" type="java.io.File" briefType="File" required="NOTDEFINED">
-        
-          <short-description>Destination directory into which the selected
- items should be exported; required.</short-description>
-        
-          <description>
-          Set the destination directory into which the selected
- items should be exported; required.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="excludes" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Set of exclude patterns.</short-description>
-        
-          <description>
-          Sets the set of exclude patterns. Patterns may be separated by a comma
- or a space. Currently only patterns denoting packages are
- supported
-        </description>
-      
-        </attribute>
-      
-        <attribute name="exportclasses" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          <short-description>Optional flag to export the class files; default false.</short-description>
-        
-          <description>
-          optional flag to export the class files; default false.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="exportdebuginfo" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          <short-description>Optional flag to export the debug info; default false.
- debug info.</short-description>
-        
-          <description>
-          optional flag to export the debug info; default false.
- debug info
-        </description>
-      
-        </attribute>
-      
-        <attribute name="exportresources" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          <short-description>Optional flag to export the resource file; default true.</short-description>
-        
-          <description>
-          optional flag to export the resource file; default true.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="exportsources" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          <short-description>Optional flag to export the Java files; default true.</short-description>
-        
-          <description>
-          optional flag to export the Java files; default true.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="includes" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Set of include patterns.</short-description>
-        
-          <description>
-          Sets the set of include patterns. Patterns may be separated by a comma
- or a space. Currently only patterns denoting packages are
- supported
-        </description>
-      
-        </attribute>
-      
-        <attribute name="overwrite" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          <short-description>If Overwrite is set, files will be overwritten during export.</short-description>
-        
-          <description>
-          if Overwrite is set, files will be overwritten during export
-        </description>
-      
-        </attribute>
-      
-        <attribute name="remote" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Name and port of a remote tool server, optiona.</short-description>
-        
-          <description>
-          Name and port of a remote tool server, optiona.
- Format: &amp;lt;servername&amp;gt;:&amp;lt;port no&amp;gt;.
- If this attribute is set, the tasks will be executed on the specified tool
- server.
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-      
-        <element name="exclude" type="org.apache.tools.ant.types.PatternSet.NameEntry" briefType="" required="NOTDEFINED">
-        
-          <short-description>Add a name entry on the exclude list.</short-description>
-        
-          <description>
-          add a name entry on the exclude list
-        </description>
-      
-        </element>
-
-      
-        <element name="include" type="org.apache.tools.ant.types.PatternSet.NameEntry" briefType="" required="NOTDEFINED">
-        
-          <short-description>Add a name entry on the include list.</short-description>
-        
-          <description>
-          add a name entry on the include list
-        </description>
-      
-        </element>
-
-    
-      </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="vajimport" category="other" classname="org.apache.tools.ant.taskdefs.optional.ide.VAJImport">
-
-  
-    <short-description>Import source, class files, and resources to the Visual Age for Java workspace.</short-description>
-  
-    <description>
-    Import source, class files, and resources to the Visual Age for Java
- workspace.
- &lt;p&gt;
- Example:
- &lt;pre&gt;
- &amp;lt;vajimport project="MyVAProject"&amp;gt;
-   &amp;lt;fileset dir="src"&amp;gt;
-     &amp;lt;include name="org/foo/subsystem1/**" /&amp;gt;
-     &amp;lt;exclude name="/org/foo/subsystem1/test/**" /&amp;gt;
-  &amp;lt;/fileset&amp;gt;
- &amp;lt;/vajexport&amp;gt;
- &lt;/pre&gt;
- import all source and resource files from the "src" directory
- which start with 'org.foo.subsystem1', except of these starting with
- 'org.foo.subsystem1.test' into the project MyVAProject.
- &lt;/p&gt;
- &lt;p&gt;If MyVAProject isn't loaded into the Workspace, a new edition is
- created in the repository and automatically loaded into the Workspace.
- There has to be at least one nested FileSet element.
- &lt;/p&gt;
- &lt;p&gt;There are attributes to choose which items to export:
- &lt;table border="1" cellpadding="2" cellspacing="0"&gt;
- &lt;tr&gt;
-   &lt;td valign="top"&gt;&lt;b&gt;Attribute&lt;/b&gt;&lt;/td&gt;
-   &lt;td valign="top"&gt;&lt;b&gt;Description&lt;/b&gt;&lt;/td&gt;
-   &lt;td align="center" valign="top"&gt;&lt;b&gt;Required&lt;/b&gt;&lt;/td&gt;
- &lt;/tr&gt;
- &lt;tr&gt;
-   &lt;td valign="top"&gt;project&lt;/td&gt;
-   &lt;td valign="top"&gt;the name of the Project to import to&lt;/td&gt;
-   &lt;td align="center" valign="top"&gt;Yes&lt;/td&gt;
- &lt;/tr&gt;
- &lt;tr&gt;
-   &lt;td valign="top"&gt;importSources&lt;/td&gt;
-   &lt;td valign="top"&gt;import Java sources, defaults to "yes"&lt;/td&gt;
-   &lt;td align="center" valign="top"&gt;No&lt;/td&gt;
- &lt;/tr&gt;
- &lt;tr&gt;
-   &lt;td valign="top"&gt;importResources&lt;/td&gt;
-   &lt;td valign="top"&gt;import resource files (anything that doesn't
-                    end with .java or .class), defaults to "yes"&lt;/td&gt;
-   &lt;td align="center" valign="top"&gt;No&lt;/td&gt;
- &lt;/tr&gt;
- &lt;tr&gt;
-   &lt;td valign="top"&gt;importClasses&lt;/td&gt;
-   &lt;td valign="top"&gt;import class files, defaults to "no"&lt;/td&gt;
-   &lt;td align="center" valign="top"&gt;No&lt;/td&gt;
- &lt;/tr&gt;
- &lt;/table&gt;
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="defaultexcludes" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          <short-description>Sets whether default exclusions should be used or not.</short-description>
-        
-          <description>
-          Sets whether default exclusions should be used or not.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="importclasses" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          <short-description>Flag to import .class files; optional, default false.</short-description>
-        
-          <description>
-          Flag to import .class files; optional, default false.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="importresources" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          <short-description>Import resource files (anything that doesn't end in
- .class or .java); optional, default true.</short-description>
-        
-          <description>
-          Import resource files (anything that doesn't end in
- .class or .java); optional, default true.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="importsources" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          <short-description>Import .java files; optional, default true.</short-description>
-        
-          <description>
-          Import .java files; optional, default true.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="project" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>The VisualAge for Java Project name to import into.</short-description>
-        
-          <description>
-          The VisualAge for Java Project name to import into.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="remote" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Name and port of a remote tool server, optiona.</short-description>
-        
-          <description>
-          Name and port of a remote tool server, optiona.
- Format: &amp;lt;servername&amp;gt;:&amp;lt;port no&amp;gt;.
- If this attribute is set, the tasks will be executed on the specified tool
- server.
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-      
-        <element name="fileset" type="org.apache.tools.ant.types.FileSet" briefType="Fileset" required="NOTDEFINED">
-        
-          <short-description>Adds a set of files (nested fileset attribute).</short-description>
-        
-          <description>
-          Adds a set of files (nested fileset attribute).
-        </description>
-      
-        </element>
-
-    
-      </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="vajload" category="other" classname="org.apache.tools.ant.taskdefs.optional.ide.VAJLoad">
-
-  
-    <short-description>Load specific project versions into the Visual Age for Java workspace.</short-description>
-  
-    <description>
-    Load specific project versions into the Visual Age for Java workspace.
- Each project and version name has to be specified completely.
- Example:  
- &lt;blockquote&gt; 
- &amp;lt;vajload&gt;
- &amp;nbsp;&amp;lt;project name="MyVAProject" version="2.1"/&gt;
- &amp;nbsp;&amp;lt;project name="Apache Xerces" version="1.2.0"/&gt;
- &amp;lt;/vajload&gt;
- &lt;/blockquote&gt;
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="remote" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Name and port of a remote tool server, optiona.</short-description>
-        
-          <description>
-          Name and port of a remote tool server, optiona.
- Format: &amp;lt;servername&amp;gt;:&amp;lt;port no&amp;gt;.
- If this attribute is set, the tasks will be executed on the specified tool
- server.
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-      
-        <element name="vajproject" type="org.apache.tools.ant.taskdefs.optional.ide.VAJProjectDescription" briefType="" required="NOTDEFINED">
-        
-          <short-description>Add a project description entry on the project list.</short-description>
-        
-          <description>
-          Add a project description entry on the project list.
-        </description>
-      
-        </element>
-
-    
-      </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="vssadd" category="scm" classname="org.apache.tools.ant.taskdefs.optional.vss.MSVSSADD">
-
-  
-    <short-description>Performs Add commands to Microsoft Visual SourceSafe.</short-description>
-  
-    <description>
-    Performs Add commands to Microsoft Visual SourceSafe.
- Based on the VSS Checkin code by Martin Poeschl
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="autoresponse" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>What to respond with (sets the -I option).</short-description>
-        
-          <description>
-          What to respond with (sets the -I option). By default, -I- is
- used; values of Y or N will be appended to this.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="comment" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Comment to apply; optional.</short-description>
-        
-          <description>
-          Sets the comment to apply; optional.
- &lt;p&gt;
- If this is null or empty, it will be replaced with "-" which
- is what SourceSafe uses for an empty comment.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="localpath" type="org.apache.tools.ant.types.Path" briefType="Path" required="NOTDEFINED">
-        
-          <short-description>Local path.</short-description>
-        
-          <description>
-          Set the local path.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="login" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>The login to use when accessing VSS, formatted as "username,password";
- optional.</short-description>
-        
-          <description>
-          The login to use when accessing VSS, formatted as "username,password";
- optional.
- &lt;p&gt;
- You can omit the password if your database is not password protected.
-  if you have a password and omit it, Ant/VSS will hang.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="recursive" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          <short-description>Set behaviour recursive or non-recursive.</short-description>
-        
-          <description>
-          Set behaviour recursive or non-recursive
-        </description>
-      
-        </attribute>
-      
-        <attribute name="serverpath" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Directory where &lt;code&gt;srssafe.ini&lt;/code&gt; resides; optional.</short-description>
-        
-          <description>
-          Set the directory where &lt;code&gt;srssafe.ini&lt;/code&gt; resides; optional.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="ssdir" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Directory where &lt;code&gt;ss.exe&lt;/code&gt; resides; optional.</short-description>
-        
-          <description>
-          directory where &lt;code&gt;ss.exe&lt;/code&gt; resides; optional.
- By default the task expects it to be in the PATH.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="vsspath" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>SourceSafe path which specifies the project/file(s) you wish to 
- perform the action on; required.</short-description>
-        
-          <description>
-          SourceSafe path which specifies the project/file(s) you wish to 
- perform the action on; required. You should not specify the leading dollar-sign - 
- it is prepended by Ant automatically.
- &lt;p&gt;
- Ant can't cope with a '$' sign in an attribute so we have to add it here.
- Also we strip off any 'vss://' prefix which is an XMS special and should probably be removed!
-        </description>
-      
-        </attribute>
-      
-        <attribute name="writable" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          <short-description>Leave added files writable?.</short-description>
-        
-          <description>
-          Leave added files writable? Default: false.
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-    </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="vsscheckin" category="scm" classname="org.apache.tools.ant.taskdefs.optional.vss.MSVSSCHECKIN">
-
-  
-    <short-description>Performs CheckIn commands to Microsoft Visual SourceSafe.</short-description>
-  
-    <description>
-    Performs CheckIn commands to Microsoft Visual SourceSafe.
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="autoresponse" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>What to respond with (sets the -I option).</short-description>
-        
-          <description>
-          What to respond with (sets the -I option). By default, -I- is
- used; values of Y or N will be appended to this.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="comment" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Comment to apply; optional.</short-description>
-        
-          <description>
-          Set the comment to apply; optional.
- &lt;p&gt;
- If this is null or empty, it will be replaced with "-" which
- is what SourceSafe uses for an empty comment.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="localpath" type="org.apache.tools.ant.types.Path" briefType="Path" required="NOTDEFINED">
-        
-          <short-description>Local path.</short-description>
-        
-          <description>
-          Set the local path.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="login" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>The login to use when accessing VSS, formatted as "username,password";
- optional.</short-description>
-        
-          <description>
-          The login to use when accessing VSS, formatted as "username,password";
- optional.
- &lt;p&gt;
- You can omit the password if your database is not password protected.
-  if you have a password and omit it, Ant/VSS will hang.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="recursive" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          <short-description>Flag to tell the task to recurse down the tree;
- optional, default false.</short-description>
-        
-          <description>
-          Flag to tell the task to recurse down the tree;
- optional, default false.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="serverpath" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Directory where &lt;code&gt;srssafe.ini&lt;/code&gt; resides; optional.</short-description>
-        
-          <description>
-          Set the directory where &lt;code&gt;srssafe.ini&lt;/code&gt; resides; optional.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="ssdir" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Directory where &lt;code&gt;ss.exe&lt;/code&gt; resides; optional.</short-description>
-        
-          <description>
-          directory where &lt;code&gt;ss.exe&lt;/code&gt; resides; optional.
- By default the task expects it to be in the PATH.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="vsspath" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>SourceSafe path which specifies the project/file(s) you wish to 
- perform the action on; required.</short-description>
-        
-          <description>
-          SourceSafe path which specifies the project/file(s) you wish to 
- perform the action on; required. You should not specify the leading dollar-sign - 
- it is prepended by Ant automatically.
- &lt;p&gt;
- Ant can't cope with a '$' sign in an attribute so we have to add it here.
- Also we strip off any 'vss://' prefix which is an XMS special and should probably be removed!
-        </description>
-      
-        </attribute>
-      
-        <attribute name="writable" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          <short-description>Leave checked in files writable?.</short-description>
-        
-          <description>
-          Leave checked in files writable? Default: false.
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-    </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="vsscheckout" category="scm" classname="org.apache.tools.ant.taskdefs.optional.vss.MSVSSCHECKOUT">
-
-  
-    <short-description>Performs CheckOut commands to Microsoft Visual SourceSafe.</short-description>
-  
-    <description>
-    Performs CheckOut commands to Microsoft Visual SourceSafe.
- &lt;p&gt;If you specify two or more attributes from version, date and 
- label only one will be used in the order version, date, label.&lt;/p&gt;
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="autoresponse" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>What to respond with (sets the -I option).</short-description>
-        
-          <description>
-          What to respond with (sets the -I option). By default, -I- is
- used; values of Y or N will be appended to this.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="date" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Date to get;
- optional, only one of &lt;tt&gt;version&lt;/tt&gt;, &lt;tt&gt;label&lt;/tt&gt;, or &lt;tt&gt;date&lt;/tt&gt;
- allowed.</short-description>
-        
-          <description>
-          Set the date to get;
- optional, only one of &lt;tt&gt;version&lt;/tt&gt;, &lt;tt&gt;label&lt;/tt&gt;, or &lt;tt&gt;date&lt;/tt&gt;
- allowed.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="label" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Label to get;
- optional, only one of &lt;tt&gt;version&lt;/tt&gt;, &lt;tt&gt;label&lt;/tt&gt;, or &lt;tt&gt;date&lt;/tt&gt;
- allowed.</short-description>
-        
-          <description>
-          Set the label to get;
- optional, only one of &lt;tt&gt;version&lt;/tt&gt;, &lt;tt&gt;label&lt;/tt&gt;, or &lt;tt&gt;date&lt;/tt&gt;
- allowed.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="localpath" type="org.apache.tools.ant.types.Path" briefType="Path" required="NOTDEFINED">
-        
-          <short-description>Local path.</short-description>
-        
-          <description>
-          Set the local path.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="login" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>The login to use when accessing VSS, formatted as "username,password";
- optional.</short-description>
-        
-          <description>
-          The login to use when accessing VSS, formatted as "username,password";
- optional.
- &lt;p&gt;
- You can omit the password if your database is not password protected.
-  if you have a password and omit it, Ant/VSS will hang.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="recursive" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          <short-description>Flag to tell the task to recurse down the tree;
- optional, default false.</short-description>
-        
-          <description>
-          Flag to tell the task to recurse down the tree;
- optional, default false.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="serverpath" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Directory where &lt;code&gt;srssafe.ini&lt;/code&gt; resides; optional.</short-description>
-        
-          <description>
-          Set the directory where &lt;code&gt;srssafe.ini&lt;/code&gt; resides; optional.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="ssdir" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Directory where &lt;code&gt;ss.exe&lt;/code&gt; resides; optional.</short-description>
-        
-          <description>
-          directory where &lt;code&gt;ss.exe&lt;/code&gt; resides; optional.
- By default the task expects it to be in the PATH.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="version" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Version to get;
- optional, only one of &lt;tt&gt;version&lt;/tt&gt;, &lt;tt&gt;label&lt;/tt&gt;, or &lt;tt&gt;date&lt;/tt&gt;
- allowed.</short-description>
-        
-          <description>
-          Set the version to get;
- optional, only one of &lt;tt&gt;version&lt;/tt&gt;, &lt;tt&gt;label&lt;/tt&gt;, or &lt;tt&gt;date&lt;/tt&gt;
- allowed.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="vsspath" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>SourceSafe path which specifies the project/file(s) you wish to 
- perform the action on; required.</short-description>
-        
-          <description>
-          SourceSafe path which specifies the project/file(s) you wish to 
- perform the action on; required. You should not specify the leading dollar-sign - 
- it is prepended by Ant automatically.
- &lt;p&gt;
- Ant can't cope with a '$' sign in an attribute so we have to add it here.
- Also we strip off any 'vss://' prefix which is an XMS special and should probably be removed!
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-    </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="vsscp" category="scm" classname="org.apache.tools.ant.taskdefs.optional.vss.MSVSSCP">
-
-  
-    <short-description>Performs CP (Change Project) commands to Microsoft Visual SourceSafe.</short-description>
-  
-    <description>
-    Performs CP (Change Project) commands to Microsoft Visual SourceSafe.
- &lt;p&gt;This task is typically used before a VssAdd in order to set the target project&lt;/p&gt;
- Based on the VSS Checkin code by Martin Poeschl
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="autoresponse" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>What to respond with (sets the -I option).</short-description>
-        
-          <description>
-          What to respond with (sets the -I option). By default, -I- is
- used; values of Y or N will be appended to this.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="login" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>The login to use when accessing VSS, formatted as "username,password";
- optional.</short-description>
-        
-          <description>
-          The login to use when accessing VSS, formatted as "username,password";
- optional.
- &lt;p&gt;
- You can omit the password if your database is not password protected.
-  if you have a password and omit it, Ant/VSS will hang.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="serverpath" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Directory where &lt;code&gt;srssafe.ini&lt;/code&gt; resides; optional.</short-description>
-        
-          <description>
-          Set the directory where &lt;code&gt;srssafe.ini&lt;/code&gt; resides; optional.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="ssdir" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Directory where &lt;code&gt;ss.exe&lt;/code&gt; resides; optional.</short-description>
-        
-          <description>
-          directory where &lt;code&gt;ss.exe&lt;/code&gt; resides; optional.
- By default the task expects it to be in the PATH.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="vsspath" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>SourceSafe path which specifies the project/file(s) you wish to 
- perform the action on; required.</short-description>
-        
-          <description>
-          SourceSafe path which specifies the project/file(s) you wish to 
- perform the action on; required. You should not specify the leading dollar-sign - 
- it is prepended by Ant automatically.
- &lt;p&gt;
- Ant can't cope with a '$' sign in an attribute so we have to add it here.
- Also we strip off any 'vss://' prefix which is an XMS special and should probably be removed!
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-    </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="vsscreate" category="scm" classname="org.apache.tools.ant.taskdefs.optional.vss.MSVSSCREATE">
-
-  
-    <short-description>Creates a new project in Microsoft Visual SourceSafe.</short-description>
-  
-    <description>
-    Creates a new project in Microsoft Visual SourceSafe.
- &lt;p&gt;
- The following attributes are interpreted:
- &lt;table border="1"&gt;
-   &lt;tr&gt;
-     &lt;th&gt;Attribute&lt;/th&gt;
-     &lt;th&gt;Values&lt;/th&gt;
-     &lt;th&gt;Required&lt;/th&gt;
-   &lt;/tr&gt;
-   &lt;tr&gt;
-      &lt;td&gt;login&lt;/td&gt;
-      &lt;td&gt;username,password&lt;/td&gt;
-      &lt;td&gt;No&lt;/td&gt;
-   &lt;/tr&gt;
-   &lt;tr&gt;
-      &lt;td&gt;vsspath&lt;/td&gt;
-      &lt;td&gt;SourceSafe path of project to be created&lt;/td&gt;
-      &lt;td&gt;Yes&lt;/td&gt;
-   &lt;/tr&gt;
-   &lt;tr&gt;
-      &lt;td&gt;ssdir&lt;/td&gt;
-      &lt;td&gt;directory where &lt;code&gt;ss.exe&lt;/code&gt; resides. By default the task
-      expects it to be in the PATH.&lt;/td&gt;
-      &lt;td&gt;No&lt;/td&gt;
-   &lt;/tr&gt;
-   &lt;tr&gt;
-      &lt;td&gt;quiet&lt;/td&gt;
-      &lt;td&gt;suppress output (off by default)&lt;/td&gt;
-      &lt;td&gt;No&lt;/td&gt;
-   &lt;/tr&gt;
-   &lt;tr&gt;
-      &lt;td&gt;failOnError&lt;/td&gt;
-      &lt;td&gt;fail if there is an error creating the project (true by default)&lt;/td&gt;
-      &lt;td&gt;No&lt;/td&gt;
-   &lt;/tr&gt;   
-   &lt;tr&gt;
-      &lt;td&gt;autoresponse&lt;/td&gt;
-      &lt;td&gt;What to respond with (sets the -I option). By default, -I- is
-      used; values of Y or N will be appended to this.&lt;/td&gt;
-      &lt;td&gt;No&lt;/td&gt;
-   &lt;/tr&gt;
-   &lt;tr&gt;
-      &lt;td&gt;comment&lt;/td&gt;
-      &lt;td&gt;The comment to use for this label. Empty or '-' for no comment.&lt;/td&gt;
-      &lt;td&gt;No&lt;/td&gt;
-   &lt;/tr&gt;
- &lt;/table&gt;
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="autoresponse" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>What to respond with (sets the -I option).</short-description>
-        
-          <description>
-          What to respond with (sets the -I option). By default, -I- is
- used; values of Y or N will be appended to this.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="comment" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Comment to apply in SourceSafe.</short-description>
-        
-          <description>
-          Sets the comment to apply in SourceSafe.
- &lt;p&gt;
- If this is null or empty, it will be replaced with "-" which
- is what SourceSafe uses for an empty comment.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="failonerror" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          <short-description>Sets whether task should fail if there is an error creating the project;
- optional, default true.</short-description>
-        
-          <description>
-          Sets whether task should fail if there is an error creating the project;
- optional, default true.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="login" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>The login to use when accessing VSS, formatted as "username,password";
- optional.</short-description>
-        
-          <description>
-          The login to use when accessing VSS, formatted as "username,password";
- optional.
- &lt;p&gt;
- You can omit the password if your database is not password protected.
-  if you have a password and omit it, Ant/VSS will hang.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="quiet" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          <short-description>Sets/clears quiet mode; optional, default false.</short-description>
-        
-          <description>
-          Sets/clears quiet mode; optional, default false.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="serverpath" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Directory where &lt;code&gt;srssafe.ini&lt;/code&gt; resides; optional.</short-description>
-        
-          <description>
-          Set the directory where &lt;code&gt;srssafe.ini&lt;/code&gt; resides; optional.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="ssdir" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Directory where &lt;code&gt;ss.exe&lt;/code&gt; resides; optional.</short-description>
-        
-          <description>
-          directory where &lt;code&gt;ss.exe&lt;/code&gt; resides; optional.
- By default the task expects it to be in the PATH.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="vsspath" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>SourceSafe path which specifies the project/file(s) you wish to 
- perform the action on; required.</short-description>
-        
-          <description>
-          SourceSafe path which specifies the project/file(s) you wish to 
- perform the action on; required. You should not specify the leading dollar-sign - 
- it is prepended by Ant automatically.
- &lt;p&gt;
- Ant can't cope with a '$' sign in an attribute so we have to add it here.
- Also we strip off any 'vss://' prefix which is an XMS special and should probably be removed!
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-    </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="vssget" category="scm" classname="org.apache.tools.ant.taskdefs.optional.vss.MSVSSGET">
-
-  
-    <short-description>Perform Get commands to Microsoft Visual SourceSafe.</short-description>
-  
-    <description>
-    Perform Get commands to Microsoft Visual SourceSafe.
- &lt;p&gt;
- The following attributes are interpreted:
- &lt;table border="1"&gt;
-   &lt;tr&gt;
-     &lt;th&gt;Attribute&lt;/th&gt;
-     &lt;th&gt;Values&lt;/th&gt;
-     &lt;th&gt;Required&lt;/th&gt;
-   &lt;/tr&gt;
-   &lt;tr&gt;
-      &lt;td&gt;login&lt;/td&gt;
-      &lt;td&gt;username,password&lt;/td&gt;
-      &lt;td&gt;No&lt;/td&gt;
-   &lt;/tr&gt;
-   &lt;tr&gt;
-      &lt;td&gt;vsspath&lt;/td&gt;
-      &lt;td&gt;SourceSafe path&lt;/td&gt;
-      &lt;td&gt;Yes&lt;/td&gt;
-   &lt;/tr&gt;
-   &lt;tr&gt;
-      &lt;td&gt;localpath&lt;/td&gt;
-      &lt;td&gt;Override the working directory and get to the specified path&lt;/td&gt;
-      &lt;td&gt;No&lt;/td&gt;
-   &lt;/tr&gt;
-   &lt;tr&gt;
-      &lt;td&gt;writable&lt;/td&gt;
-      &lt;td&gt;true or false&lt;/td&gt;
-      &lt;td&gt;No&lt;/td&gt;
-   &lt;/tr&gt;
-   &lt;tr&gt;
-      &lt;td&gt;recursive&lt;/td&gt;
-      &lt;td&gt;true or false&lt;/td&gt;
-      &lt;td&gt;No&lt;/td&gt;
-   &lt;/tr&gt;
-   &lt;tr&gt;
-      &lt;td&gt;version&lt;/td&gt;
-      &lt;td&gt;a version number to get&lt;/td&gt;
-      &lt;td&gt;No&lt;/td&gt;
-   &lt;/tr&gt;
-   &lt;tr&gt;
-      &lt;td&gt;date&lt;/td&gt;
-      &lt;td&gt;a date stamp to get at&lt;/td&gt;
-      &lt;td&gt;No&lt;/td&gt;
-   &lt;/tr&gt;
-   &lt;tr&gt;
-      &lt;td&gt;label&lt;/td&gt;
-      &lt;td&gt;a label to get for&lt;/td&gt;
-      &lt;td&gt;No&lt;/td&gt;
-   &lt;/tr&gt;
-   &lt;tr&gt;
-      &lt;td&gt;quiet&lt;/td&gt;
-      &lt;td&gt;suppress output (off by default)&lt;/td&gt;
-      &lt;td&gt;No&lt;/td&gt;
-   &lt;/tr&gt;
-   &lt;tr&gt;
-      &lt;td&gt;autoresponse&lt;/td&gt;
-      &lt;td&gt;What to respond with (sets the -I option). By default, -I- is
-      used; values of Y or N will be appended to this.&lt;/td&gt;
-      &lt;td&gt;No&lt;/td&gt;
-   &lt;/tr&gt;
- &lt;/table&gt;
- &lt;p&gt;Note that only one of version, date or label should be specified&lt;/p&gt;
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="autoresponse" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>What to respond with (sets the -I option).</short-description>
-        
-          <description>
-          What to respond with (sets the -I option). By default, -I- is
- used; values of Y or N will be appended to this.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="date" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Date to get;
- optional, only one of &lt;tt&gt;version&lt;/tt&gt;, &lt;tt&gt;label&lt;/tt&gt;, or &lt;tt&gt;date&lt;/tt&gt;
- allowed.</short-description>
-        
-          <description>
-          Set the date to get;
- optional, only one of &lt;tt&gt;version&lt;/tt&gt;, &lt;tt&gt;label&lt;/tt&gt;, or &lt;tt&gt;date&lt;/tt&gt;
- allowed.
- &lt;p&gt;
- ORIGINAL COMMENT THAT DOES NOT SEEM AT ALL VALID:
- Note we assume that if the supplied string has the value "null" that something
- went wrong and that the string value got populated from a null object. This
- happens if a ant variable is used e.g. date="${date}" when date
- has not been defined to ant!
-        </description>
-      
-        </attribute>
-      
-        <attribute name="label" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Label to get;
- optional, only one of &lt;tt&gt;version&lt;/tt&gt;, &lt;tt&gt;label&lt;/tt&gt;, or &lt;tt&gt;date&lt;/tt&gt;
- allowed.</short-description>
-        
-          <description>
-          Set the label to get;
- optional, only one of &lt;tt&gt;version&lt;/tt&gt;, &lt;tt&gt;label&lt;/tt&gt;, or &lt;tt&gt;date&lt;/tt&gt;
- allowed.
- &lt;p&gt;
- Note we assume that if the supplied string has the value "null" that something
- went wrong and that the string value got populated from a null object. This
- happens if a ant variable is used e.g. label="${label_server}" when label_server
- has not been defined to ant!
-        </description>
-      
-        </attribute>
-      
-        <attribute name="localpath" type="org.apache.tools.ant.types.Path" briefType="Path" required="NOTDEFINED">
-        
-          <short-description>Override the working directory and get to the specified path; optional.</short-description>
-        
-          <description>
-          Override the working directory and get to the specified path; optional.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="login" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>The login to use when accessing VSS, formatted as "username,password";
- optional.</short-description>
-        
-          <description>
-          The login to use when accessing VSS, formatted as "username,password";
- optional.
- &lt;p&gt;
- You can omit the password if your database is not password protected.
-  if you have a password and omit it, Ant/VSS will hang.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="quiet" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          <short-description>Flag to suppress output when true ; false by default.</short-description>
-        
-          <description>
-          Flag to suppress output when true ; false by default.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="recursive" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          <short-description>Flag to tell the task to recurse down the tree;
- optional, default false.</short-description>
-        
-          <description>
-          Flag to tell the task to recurse down the tree;
- optional, default false.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="serverpath" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Directory where &lt;code&gt;srssafe.ini&lt;/code&gt; resides; optional.</short-description>
-        
-          <description>
-          Set the directory where &lt;code&gt;srssafe.ini&lt;/code&gt; resides; optional.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="ssdir" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Directory where &lt;code&gt;ss.exe&lt;/code&gt; resides; optional.</short-description>
-        
-          <description>
-          directory where &lt;code&gt;ss.exe&lt;/code&gt; resides; optional.
- By default the task expects it to be in the PATH.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="version" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Version number to get; 
- optional, only one of &lt;tt&gt;version&lt;/tt&gt;, &lt;tt&gt;label&lt;/tt&gt;, or &lt;tt&gt;date&lt;/tt&gt;
- allowed.</short-description>
-        
-          <description>
-          Set a version number to get; 
- optional, only one of &lt;tt&gt;version&lt;/tt&gt;, &lt;tt&gt;label&lt;/tt&gt;, or &lt;tt&gt;date&lt;/tt&gt;
- allowed.
- &lt;p&gt;
- ORIGINAL COMMENT THAT DOES NOT SEEM AT ALL VALID:
- Note we assume that if the supplied string has the value "null" that something
- went wrong and that the string value got populated from a null object. This
- happens if a ant variable is used e.g. version="${ver_server}" when ver_server
- has not been defined to ant!
- NO, in this case the version string is "${ver_server}".
-        </description>
-      
-        </attribute>
-      
-        <attribute name="vsspath" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>SourceSafe path which specifies the project/file(s) you wish to 
- perform the action on; required.</short-description>
-        
-          <description>
-          SourceSafe path which specifies the project/file(s) you wish to 
- perform the action on; required. You should not specify the leading dollar-sign - 
- it is prepended by Ant automatically.
- &lt;p&gt;
- Ant can't cope with a '$' sign in an attribute so we have to add it here.
- Also we strip off any 'vss://' prefix which is an XMS special and should probably be removed!
-        </description>
-      
-        </attribute>
-      
-        <attribute name="writable" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          <short-description>Make fetched files  writable; optional, default false.</short-description>
-        
-          <description>
-          make fetched files  writable; optional, default false.
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-    </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="vsshistory" category="scm" classname="org.apache.tools.ant.taskdefs.optional.vss.MSVSSHISTORY">
-
-  
-    <short-description>Performs History commands to Microsoft Visual SourceSafe.</short-description>
-  
-    <description>
-    Performs History commands to Microsoft Visual SourceSafe.
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="dateformat" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Format of dates in fromDate and toDate; optional.</short-description>
-        
-          <description>
-          Format of dates in fromDate and toDate; optional.
- Used when calculating dates with 
- the numdays attribute. 
- This string uses the formatting rules of SimpleDateFormat. 
-  Defaults to DateFormat.SHORT.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="fromdate" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Start Date for the Comparison of two versions; optional.</short-description>
-        
-          <description>
-          Set the Start Date for the Comparison of two versions; optional.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="fromlabel" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Start Label; optional.</short-description>
-        
-          <description>
-          Set the Start Label; optional
-        </description>
-      
-        </attribute>
-      
-        <attribute name="login" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>The login to use when accessing VSS, formatted as "username,password";
- optional.</short-description>
-        
-          <description>
-          The login to use when accessing VSS, formatted as "username,password";
- optional.
- &lt;p&gt;
- You can omit the password if your database is not password protected.
-  if you have a password and omit it, Ant/VSS will hang.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="numdays" type="int" briefType="int" required="NOTDEFINED">
-        
-          <short-description>Number of days for comparison; 
- optional.</short-description>
-        
-          <description>
-          Set the number of days for comparison; 
- optional.
- &lt;p&gt;
- The default value is 2 days. (maybe)
-        </description>
-      
-        </attribute>
-      
-        <attribute name="output" type="java.io.File" briefType="File" required="NOTDEFINED">
-        
-          <short-description>Output file name for the history; optional.</short-description>
-        
-          <description>
-          Set the output file name for the history; optional.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="recursive" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          <short-description>Flag to tell the task to recurse down the tree;
- optional, default false.</short-description>
-        
-          <description>
-          Flag to tell the task to recurse down the tree;
- optional, default false.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="serverpath" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Directory where &lt;code&gt;srssafe.ini&lt;/code&gt; resides; optional.</short-description>
-        
-          <description>
-          Set the directory where &lt;code&gt;srssafe.ini&lt;/code&gt; resides; optional.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="ssdir" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Directory where &lt;code&gt;ss.exe&lt;/code&gt; resides; optional.</short-description>
-        
-          <description>
-          directory where &lt;code&gt;ss.exe&lt;/code&gt; resides; optional.
- By default the task expects it to be in the PATH.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="style" type="org.apache.tools.ant.taskdefs.optional.vss.MSVSSHISTORY.BriefCodediffNofile" briefType="&quot;brief&quot;, &quot;codediff&quot;, &quot;nofile&quot;, &quot;default&quot;" required="NOTDEFINED">
-        
-          <short-description>Specify the output style; optional.</short-description>
-        
-          <description>
-          Specify the output style; optional.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="todate" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>End Date for the Comparison of two versions; optional.</short-description>
-        
-          <description>
-          Set the End Date for the Comparison of two versions; optional.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="tolabel" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>End Label ; optional.</short-description>
-        
-          <description>
-          Set the End Label ; optional
-        </description>
-      
-        </attribute>
-      
-        <attribute name="user" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Name the user whose changes we would like to see; optional.</short-description>
-        
-          <description>
-          Name the user whose changes we would like to see; optional
-        </description>
-      
-        </attribute>
-      
-        <attribute name="vsspath" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>SourceSafe path which specifies the project/file(s) you wish to 
- perform the action on; required.</short-description>
-        
-          <description>
-          SourceSafe path which specifies the project/file(s) you wish to 
- perform the action on; required. You should not specify the leading dollar-sign - 
- it is prepended by Ant automatically.
- &lt;p&gt;
- Ant can't cope with a '$' sign in an attribute so we have to add it here.
- Also we strip off any 'vss://' prefix which is an XMS special and should probably be removed!
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-    </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="vsslabel" category="scm" classname="org.apache.tools.ant.taskdefs.optional.vss.MSVSSLABEL">
-
-  
-    <short-description>Performs Label commands to Microsoft Visual SourceSafe.</short-description>
-  
-    <description>
-    Performs Label commands to Microsoft Visual SourceSafe.
-
- &lt;p&gt;
- The following attributes are interpreted:
- &lt;table border="1"&gt;
-   &lt;tr&gt;
-     &lt;th&gt;Attribute&lt;/th&gt;
-     &lt;th&gt;Values&lt;/th&gt;
-     &lt;th&gt;Required&lt;/th&gt;
-   &lt;/tr&gt;
-   &lt;tr&gt;
-      &lt;td&gt;login&lt;/td&gt;
-      &lt;td&gt;username,password&lt;/td&gt;
-      &lt;td&gt;No&lt;/td&gt;
-   &lt;/tr&gt;
-   &lt;tr&gt;
-      &lt;td&gt;vsspath&lt;/td&gt;
-      &lt;td&gt;SourceSafe path&lt;/td&gt;
-      &lt;td&gt;Yes&lt;/td&gt;
-   &lt;/tr&gt;
-   &lt;tr&gt;
-      &lt;td&gt;ssdir&lt;/td&gt;
-      &lt;td&gt;directory where &lt;code&gt;ss.exe&lt;/code&gt; resides. By default the task
-      expects it to be in the PATH.&lt;/td&gt;
-      &lt;td&gt;No&lt;/td&gt;
-   &lt;/tr&gt;
-   &lt;tr&gt;
-      &lt;td&gt;label&lt;/td&gt;
-      &lt;td&gt;A label to apply to the hierarchy&lt;/td&gt;
-      &lt;td&gt;Yes&lt;/td&gt;
-   &lt;/tr&gt;
-   &lt;tr&gt;
-      &lt;td&gt;version&lt;/td&gt;
-      &lt;td&gt;An existing file or project version to label&lt;/td&gt;
-      &lt;td&gt;No&lt;/td&gt;
-   &lt;/tr&gt;
-   &lt;tr&gt;
-      &lt;td&gt;autoresponse&lt;/td&gt;
-      &lt;td&gt;What to respond with (sets the -I option). By default, -I- is
-      used; values of Y or N will be appended to this.&lt;/td&gt;
-      &lt;td&gt;No&lt;/td&gt;
-   &lt;/tr&gt;
-   &lt;tr&gt;
-      &lt;td&gt;comment&lt;/td&gt;
-      &lt;td&gt;The comment to use for this label. Empty or '-' for no comment.&lt;/td&gt;
-      &lt;td&gt;No&lt;/td&gt;
-   &lt;/tr&gt;
- &lt;/table&gt;
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="autoresponse" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>What to respond with (sets the -I option).</short-description>
-        
-          <description>
-          What to respond with (sets the -I option). By default, -I- is
- used; values of Y or N will be appended to this.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="comment" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>The comment to use for this label; optional.</short-description>
-        
-          <description>
-          The comment to use for this label; optional.
- Empty or '-' for no comment.
- &lt;p&gt;
- If this is null or empty, it will be replaced with "-" which
- is what SourceSafe uses for an empty comment.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="label" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Label to apply; required.</short-description>
-        
-          <description>
-          Set the label to apply; required.
- &lt;p&gt;
- Note we assume that if the supplied string has the value "null" that something
- went wrong and that the string value got populated from a null object. This
- happens if a ant variable is used e.g. label="${label_server}" when label_server
- has not been defined to ant!
-        </description>
-      
-        </attribute>
-      
-        <attribute name="login" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>The login to use when accessing VSS, formatted as "username,password";
- optional.</short-description>
-        
-          <description>
-          The login to use when accessing VSS, formatted as "username,password";
- optional.
- &lt;p&gt;
- You can omit the password if your database is not password protected.
-  if you have a password and omit it, Ant/VSS will hang.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="serverpath" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Directory where &lt;code&gt;srssafe.ini&lt;/code&gt; resides; optional.</short-description>
-        
-          <description>
-          Set the directory where &lt;code&gt;srssafe.ini&lt;/code&gt; resides; optional.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="ssdir" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Directory where &lt;code&gt;ss.exe&lt;/code&gt; resides; optional.</short-description>
-        
-          <description>
-          directory where &lt;code&gt;ss.exe&lt;/code&gt; resides; optional.
- By default the task expects it to be in the PATH.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="version" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Name an existing file or project version to label; optional.</short-description>
-        
-          <description>
-          Name an existing file or project version to label; optional.
- By default the current version is labelled.
- &lt;p&gt;
- Note we assume that if the supplied string has the value "null" that something
- went wrong and that the string value got populated from a null object. This
- happens if a ant variable is used e.g. version="${ver_server}" when ver_server
- has not been defined to ant!
-        </description>
-      
-        </attribute>
-      
-        <attribute name="vsspath" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>SourceSafe path which specifies the project/file(s) you wish to 
- perform the action on; required.</short-description>
-        
-          <description>
-          SourceSafe path which specifies the project/file(s) you wish to 
- perform the action on; required. You should not specify the leading dollar-sign - 
- it is prepended by Ant automatically.
- &lt;p&gt;
- Ant can't cope with a '$' sign in an attribute so we have to add it here.
- Also we strip off any 'vss://' prefix which is an XMS special and should probably be removed!
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-    </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="waitfor" category="control" classname="org.apache.tools.ant.taskdefs.WaitFor">
-
-  
-    <short-description>Wait for an external event to occur.</short-description>
-  
-    <description>
-    Wait for an external event to occur.
-
- Wait for an external process to start or to complete some
- task. This is useful with the &lt;code&gt;parallel&lt;/code&gt; task to
- syncronize the execution of tests with server startup.
-
- The following attributes can be specified on a waitfor task:
- &lt;ul&gt;
- &lt;li&gt;maxwait - maximum length of time to wait before giving up&lt;/li&gt;
- &lt;li&gt;maxwaitunit - The unit to be used to interpret maxwait attribute&lt;/li&gt;
- &lt;li&gt;checkevery - amount of time to sleep between each check&lt;/li&gt;
- &lt;li&gt;checkeveryunit - The unit to be used to interpret checkevery attribute&lt;/li&gt;
- &lt;li&gt;timeoutproperty - name of a property to set if maxwait has been exceeded.&lt;/li&gt;
- &lt;/ul&gt;
-
- The maxwaitunit and checkeveryunit are allowed to have the following values:
- millesond, second, minute, hour, day and week. The default is millisecond.
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="checkevery" type="long" briefType="long" required="no">
-        
-          <short-description>Time between each check.</short-description>
-        
-          <description>
-          Set the time between each check
-        </description>
-      
-        </attribute>
-      
-        <attribute name="checkeveryunit" type="org.apache.tools.ant.taskdefs.WaitFor.Unit" briefType="&quot;millisecond&quot;, &quot;second&quot;, &quot;minute&quot;, &quot;hour&quot;, &quot;day&quot;, &quot;week&quot;" required="no">
-        
-          <short-description>Check every time unit.</short-description>
-        
-          <description>
-          Set the check every time unit
-        </description>
-      
-        </attribute>
-      
-        <attribute name="maxwait" type="long" briefType="long" required="no">
-        
-          <short-description>Maximum length of time to wait.</short-description>
-        
-          <description>
-          Set the maximum length of time to wait
-        </description>
-      
-        </attribute>
-      
-        <attribute name="maxwaitunit" type="org.apache.tools.ant.taskdefs.WaitFor.Unit" briefType="&quot;millisecond&quot;, &quot;second&quot;, &quot;minute&quot;, &quot;hour&quot;, &quot;day&quot;, &quot;week&quot;" required="no">
-        
-          <short-description>Max wait time unit.</short-description>
-        
-          <description>
-          Set the max wait time unit
-        </description>
-      
-        </attribute>
-      
-        <attribute name="timeoutproperty" type="java.lang.String" briefType="String" required="no">
-        
-          <short-description>Name the property to set after a timeout.</short-description>
-        
-          <description>
-          Name the property to set after a timeout.
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-      
-        <element name="and" type="org.apache.tools.ant.taskdefs.condition.And" briefType="" required="NOTDEFINED">
-        
-          <short-description>Add an &amp;lt;and&amp;gt; condition "container".</short-description>
-        
-          <description>
-          Add an &amp;lt;and&amp;gt; condition "container".
-        </description>
-      
-        </element>
-
-      
-        <element name="available" type="org.apache.tools.ant.taskdefs.Available" briefType="" required="NOTDEFINED">
-        
-          <short-description>Add an &amp;lt;available&amp;gt; condition.</short-description>
-        
-          <description>
-          Add an &amp;lt;available&amp;gt; condition.
-        </description>
-      
-        </element>
-
-      
-        <element name="checksum" type="org.apache.tools.ant.taskdefs.Checksum" briefType="" required="NOTDEFINED">
-        
-          <short-description>Add an &amp;lt;checksum&amp;gt; condition.</short-description>
-        
-          <description>
-          Add an &amp;lt;checksum&amp;gt; condition.
-        </description>
-      
-        </element>
-
-      
-        <element name="contains" type="org.apache.tools.ant.taskdefs.condition.Contains" briefType="" required="NOTDEFINED">
-        
-          <short-description>Add a &amp;lt;contains&amp;gt; condition.</short-description>
-        
-          <description>
-          Add a &amp;lt;contains&amp;gt; condition.
-        </description>
-      
-        </element>
-
-      
-        <element name="equals" type="org.apache.tools.ant.taskdefs.condition.Equals" briefType="" required="NOTDEFINED">
-        
-          <short-description>Add an &amp;lt;equals&amp;gt; condition.</short-description>
-        
-          <description>
-          Add an &amp;lt;equals&amp;gt; condition.
-        </description>
-      
-        </element>
-
-      
-        <element name="filesmatch" type="org.apache.tools.ant.taskdefs.condition.FilesMatch" briefType="" required="NOTDEFINED">
-        
-          <short-description>Add a &amp;lt;filesmatch&amp;gt; condition.</short-description>
-        
-          <description>
-          Add a &amp;lt;filesmatch&amp;gt; condition.
-        </description>
-      
-        </element>
-
-      
-        <element name="http" type="org.apache.tools.ant.taskdefs.condition.Http" briefType="" required="NOTDEFINED">
-        
-          <short-description>Add an &amp;lt;http&amp;gt; condition.</short-description>
-        
-          <description>
-          Add an &amp;lt;http&amp;gt; condition.
-        </description>
-      
-        </element>
-
-      
-        <element name="isfalse" type="org.apache.tools.ant.taskdefs.condition.IsFalse" briefType="" required="NOTDEFINED">
-        
-          <short-description>Add a &amp;lt;isfalse&amp;gt; condition.</short-description>
-        
-          <description>
-          Add a &amp;lt;isfalse&amp;gt; condition.
-        </description>
-      
-        </element>
-
-      
-        <element name="isset" type="org.apache.tools.ant.taskdefs.condition.IsSet" briefType="" required="NOTDEFINED">
-        
-          <short-description>Add an &amp;lt;isset&amp;gt; condition.</short-description>
-        
-          <description>
-          Add an &amp;lt;isset&amp;gt; condition.
-        </description>
-      
-        </element>
-
-      
-        <element name="istrue" type="org.apache.tools.ant.taskdefs.condition.IsTrue" briefType="" required="NOTDEFINED">
-        
-          <short-description>Add a &amp;lt;istrue&amp;gt; condition.</short-description>
-        
-          <description>
-          Add a &amp;lt;istrue&amp;gt; condition.
-        </description>
-      
-        </element>
-
-      
-        <element name="not" type="org.apache.tools.ant.taskdefs.condition.Not" briefType="" required="NOTDEFINED">
-        
-          <short-description>Add an &amp;lt;not&amp;gt; condition "container".</short-description>
-        
-          <description>
-          Add an &amp;lt;not&amp;gt; condition "container".
-        </description>
-      
-        </element>
-
-      
-        <element name="or" type="org.apache.tools.ant.taskdefs.condition.Or" briefType="" required="NOTDEFINED">
-        
-          <short-description>Add an &amp;lt;or&amp;gt; condition "container".</short-description>
-        
-          <description>
-          Add an &amp;lt;or&amp;gt; condition "container".
-        </description>
-      
-        </element>
-
-      
-        <element name="os" type="org.apache.tools.ant.taskdefs.condition.Os" briefType="" required="NOTDEFINED">
-        
-          <short-description>Add an &amp;lt;os&amp;gt; condition.</short-description>
-        
-          <description>
-          Add an &amp;lt;os&amp;gt; condition.
-        </description>
-      
-        </element>
-
-      
-        <element name="socket" type="org.apache.tools.ant.taskdefs.condition.Socket" briefType="" required="NOTDEFINED">
-        
-          <short-description>Add a &amp;lt;socket&amp;gt; condition.</short-description>
-        
-          <description>
-          Add a &amp;lt;socket&amp;gt; condition.
-        </description>
-      
-        </element>
-
-      
-        <element name="uptodate" type="org.apache.tools.ant.taskdefs.UpToDate" briefType="" required="NOTDEFINED">
-        
-          <short-description>Add an &amp;lt;uptodate&amp;gt; condition.</short-description>
-        
-          <description>
-          Add an &amp;lt;uptodate&amp;gt; condition.
-        </description>
-      
-        </element>
-
-    
-      </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="war" category="packaging" classname="org.apache.tools.ant.taskdefs.War" matchingTask="true">
-
-  
-    <short-description>An extension of &amp;lt;jar&amp;gt; to create a WAR archive.</short-description>
-  
-    <description>
-    An extension of &amp;lt;jar&amp;gt; to create a WAR archive.
- Contains special treatment for files that should end up in the
- &lt;code&gt;WEB-INF/lib&lt;/code&gt;, &lt;code&gt;WEB-INF/classes&lt;/code&gt; or
- &lt;code&gt;WEB-INF&lt;/code&gt; directories of the Web Application Archive.&lt;/p&gt;
- &lt;p&gt;(The War task is a shortcut for specifying the particular layout of a WAR file. 
- The same thing can be accomplished by using the &lt;i&gt;prefix&lt;/i&gt; and &lt;i&gt;fullpath&lt;/i&gt;
- attributes of zipfilesets in a Zip or Jar task.)&lt;/p&gt;
- &lt;p&gt;The extended zipfileset element from the zip task (with attributes &lt;i&gt;prefix&lt;/i&gt;, &lt;i&gt;fullpath&lt;/i&gt;, and &lt;i&gt;src&lt;/i&gt;) is available in the War task.&lt;/p&gt;
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="basedir" type="java.io.File" briefType="File" required="no">
-        
-          <short-description>Directory from which to archive files; optional.</short-description>
-        
-          <description>
-          Directory from which to archive files; optional.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="compress" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>Whether we want to compress the files or only store them;
- optional, default=true;.</short-description>
-        
-          <description>
-          Whether we want to compress the files or only store them;
- optional, default=true;
-        </description>
-      
-        </attribute>
-      
-        <attribute name="destfile" type="java.io.File" briefType="File" required="yes">
-        
-          <short-description>The file to create; required.</short-description>
-        
-          <description>
-          The file to create; required.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="duplicate" type="org.apache.tools.ant.taskdefs.Zip.Duplicate" briefType="&quot;add&quot;, &quot;preserve&quot;, &quot;fail&quot;" required="no">
-        
-          <short-description>Sets behavior for when a duplicate file is about to be added -
- one of &lt;code&gt;keep&lt;/code&gt;, &lt;code&gt;skip&lt;/code&gt; or &lt;code&gt;overwrite&lt;/code&gt;.</short-description>
-        
-          <description>
-          Sets behavior for when a duplicate file is about to be added -
- one of &lt;code&gt;keep&lt;/code&gt;, &lt;code&gt;skip&lt;/code&gt; or &lt;code&gt;overwrite&lt;/code&gt;.
- Possible values are: &lt;code&gt;keep&lt;/code&gt; (keep both
- of the files); &lt;code&gt;skip&lt;/code&gt; (keep the first version
- of the file found); &lt;code&gt;overwrite&lt;/code&gt; overwrite the file
- with the new file
- Default for zip tasks is &lt;code&gt;keep&lt;/code&gt;
-        </description>
-      
-        </attribute>
-      
-        <attribute name="encoding" type="java.lang.String" briefType="String" required="no">
-        
-          <short-description>Encoding to use for filenames, defaults to the platform's
- default encoding.</short-description>
-        
-          <description>
-          Encoding to use for filenames, defaults to the platform's
- default encoding.
-
- &lt;p&gt;For a list of possible values see &lt;a
- href="http://java.sun.com/products/jdk/1.2/docs/guide/internat/encoding.doc.html"&gt;http://java.sun.com/products/jdk/1.2/docs/guide/internat/encoding.doc.html&lt;/a&gt;.&lt;/p&gt;
-        </description>
-      
-        </attribute>
-      
-        <attribute name="filesonly" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>If true, emulate Sun's jar utility by not adding parent directories;
- optional, defaults to false.</short-description>
-        
-          <description>
-          If true, emulate Sun's jar utility by not adding parent directories;
- optional, defaults to false.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="index" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          <short-description>Set whether or not to create an index list for classes.</short-description>
-        
-          <description>
-          Set whether or not to create an index list for classes.
- This may speed up classloading in some cases.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="manifest" type="java.io.File" briefType="File" required="no">
-        
-          <short-description>The manifest file to use.</short-description>
-        
-          <description>
-          The manifest file to use. This can be either the location of a manifest,
- or the name of a jar added through a fileset. If its the name of an added
- jar, the task expects the manifest to be in the jar at META-INF/MANIFEST.MF.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="update" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>If true, updates an existing file, otherwise overwrite
- any existing one; optional defaults to false.</short-description>
-        
-          <description>
-          If true, updates an existing file, otherwise overwrite
- any existing one; optional defaults to false.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="webxml" type="java.io.File" briefType="File" required="yes, unless update is set to true">
-        
-          <short-description>Deployment descriptor to use (WEB-INF/web.xml);
- required unless &lt;tt&gt;update=true&lt;/tt&gt;.</short-description>
-        
-          <description>
-          set the deployment descriptor to use (WEB-INF/web.xml);
- required unless &lt;tt&gt;update=true&lt;/tt&gt;
-        </description>
-      
-        </attribute>
-      
-        <attribute name="whenempty" type="org.apache.tools.ant.taskdefs.Zip.WhenEmpty" briefType="&quot;fail&quot;, &quot;skip&quot;, &quot;create&quot;" required="NOTDEFINED">
-        
-          <short-description>Sets behavior of the task when no files match.</short-description>
-        
-          <description>
-          Sets behavior of the task when no files match.
- Possible values are: &lt;code&gt;fail&lt;/code&gt; (throw an exception
- and halt the build); &lt;code&gt;skip&lt;/code&gt; (do not create
- any archive, but issue a warning); &lt;code&gt;create&lt;/code&gt;
- (make an archive with no entries).
- Default for zip tasks is &lt;code&gt;skip&lt;/code&gt;;
- for jar tasks, &lt;code&gt;create&lt;/code&gt;.
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-      
-        <element name="classes" type="org.apache.tools.ant.types.ZipFileSet" briefType="ZipFileset" required="NOTDEFINED">
-        
-          <short-description>Add files under WEB-INF/classes.</short-description>
-        
-          <description>
-          add files under WEB-INF/classes
-        </description>
-      
-        </element>
-
-      
-        <element name="manifest" type="org.apache.tools.ant.taskdefs.Manifest" briefType="" required="NOTDEFINED">
-        
-          <short-description>Allows the manifest for the archive file to be provided inline
- in the buildfile rather than in an external file.</short-description>
-        
-          <description>
-          Allows the manifest for the archive file to be provided inline
- in the buildfile rather than in an external file.
-        </description>
-      
-        </element>
-
-      
-        <element name="fileset" type="org.apache.tools.ant.types.FileSet" briefType="Fileset" required="NOTDEFINED">
-        
-          <short-description>Adds a set of files.</short-description>
-        
-          <description>
-          Adds a set of files.
-        </description>
-      
-        </element>
-
-      
-        <element name="lib" type="org.apache.tools.ant.types.ZipFileSet" briefType="ZipFileset" required="NOTDEFINED">
-        
-          <short-description>Add files under WEB-INF/lib/.</short-description>
-        
-          <description>
-          add files under WEB-INF/lib/
-        </description>
-      
-        </element>
-
-      
-        <element name="metainf" type="org.apache.tools.ant.types.ZipFileSet" briefType="ZipFileset" required="NOTDEFINED">
-        
-          <short-description>Adds a zipfileset to include in the META-INF directory.</short-description>
-        
-          <description>
-          Adds a zipfileset to include in the META-INF directory.
-        </description>
-      
-        </element>
-
-      
-        <element name="webinf" type="org.apache.tools.ant.types.ZipFileSet" briefType="ZipFileset" required="NOTDEFINED">
-        
-          <short-description>Files to add under WEB-INF;.</short-description>
-        
-          <description>
-          files to add under WEB-INF;
-        </description>
-      
-        </element>
-
-      
-        <element name="zipgroupfileset" type="org.apache.tools.ant.types.FileSet" briefType="Fileset" required="NOTDEFINED">
-        
-          <short-description>Adds a group of zip files.</short-description>
-        
-          <description>
-          Adds a group of zip files.
-        </description>
-      
-        </element>
-
-      
-        <element name="zipfileset" type="org.apache.tools.ant.types.ZipFileSet" briefType="ZipFileset" required="NOTDEFINED">
-        
-          <short-description>Adds a set of files that can be
- read from an archive and be given a prefix/fullpath.</short-description>
-        
-          <description>
-          Adds a set of files that can be
- read from an archive and be given a prefix/fullpath.
-        </description>
-      
-        </element>
-
-    
-      </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="wljspc" category="other" classname="org.apache.tools.ant.taskdefs.optional.jsp.WLJspc" matchingTask="true">
-
-  
-    <short-description>Precompiles JSP's using WebLogic's JSP compiler (weblogic.jspc).</short-description>
-  
-    <description>
-    Precompiles JSP's using WebLogic's JSP compiler (weblogic.jspc).
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="classpath" type="org.apache.tools.ant.types.Path" briefType="Path" required="yes">
-        
-          <short-description>Classpath to be used for this compilation.</short-description>
-        
-          <description>
-          Set the classpath to be used for this compilation.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="dest" type="java.io.File" briefType="File" required="yes">
-        
-          <short-description>Directory containing the source jsp's.</short-description>
-        
-          <description>
-          Set the directory containing the source jsp's
-        </description>
-      
-        </attribute>
-      
-        <attribute name="package" type="java.lang.String" briefType="String" required="yes">
-        
-          <short-description>Package under which the compiled classes go.</short-description>
-        
-          <description>
-          Set the package under which the compiled classes go
-        </description>
-      
-        </attribute>
-      
-        <attribute name="src" type="java.io.File" briefType="File" required="yes">
-        
-          <short-description>Directory containing the source jsp's.</short-description>
-        
-          <description>
-          Set the directory containing the source jsp's
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-      
-        <element name="classpath" type="org.apache.tools.ant.types.Path" briefType="Path" required="NOTDEFINED">
-        
-          <short-description>Maybe creates a nested classpath element.</short-description>
-        
-          <description>
-          Maybe creates a nested classpath element.
-        </description>
-      
-        </element>
-
-    
-      </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="wlrun" category="other" classname="org.apache.tools.ant.taskdefs.optional.ejb.WLRun">
-
-  
-    <short-description>Starts a WebLogic server.</short-description>
-  
-    <description>
-    Starts a WebLogic server.
- A number of parameters are used to control the operation of the weblogic instance. Note that the task,
- and hence ant, will not complete until the weblogic instance is stopped.&lt;/p&gt;
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="args" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Additional argument string passed to the Weblogic instance;
- optional.</short-description>
-        
-          <description>
-          Additional argument string passed to the Weblogic instance;
- optional.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="beahome" type="java.io.File" briefType="File" required="NOTDEFINED">
-        
-          <short-description>The location of the BEA Home; implicitly
- selects Weblogic 6.0; optional.</short-description>
-        
-          <description>
-          The location of the BEA Home; implicitly
- selects Weblogic 6.0; optional.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="classpath" type="org.apache.tools.ant.types.Path" briefType="Path" required="NOTDEFINED">
-        
-          <short-description>The classpath to be used with the Java Virtual Machine that runs the Weblogic
- Server; required.</short-description>
-        
-          <description>
-          The classpath to be used with the Java Virtual Machine that runs the Weblogic
- Server; required. Prior to Weblogic 6.0, this is typically set to the Weblogic
- boot classpath. Under Weblogic 6.0 this should include all the
- weblogic jars
-        </description>
-      
-        </attribute>
-      
-        <attribute name="domain" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Domain to run in; required for WL6.0.</short-description>
-        
-          <description>
-          Set the Domain to run in; required for WL6.0
-        </description>
-      
-        </attribute>
-      
-        <attribute name="home" type="java.io.File" briefType="File" required="NOTDEFINED">
-        
-          <short-description>The location where weblogic lives.</short-description>
-        
-          <description>
-          The location where weblogic lives.
- Required. This is the absolute location, not relative to
-  BEA home.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="jvmargs" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Additional arguments to pass to the weblogic JVM.</short-description>
-        
-          <description>
-          Set the additional arguments to pass to the weblogic JVM
-        </description>
-      
-        </attribute>
-      
-        <attribute name="name" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>The name of the weblogic server within the weblogic home which is to be run.</short-description>
-        
-          <description>
-          The name of the weblogic server within the weblogic home which is to be run.
- Optiona, defaults to &amp;quot;myserver&amp;quot;
-        </description>
-      
-        </attribute>
-      
-        <attribute name="pkpassword" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Private key password so the server can decrypt the SSL private key file;
- optional and only applicable to WL6.0.</short-description>
-        
-          <description>
-          Set the private key password so the server can decrypt the SSL private key file;
- optional and only applicable to WL6.0.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="password" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Management password of the server;
- optional and only applicable to WL6.0.</short-description>
-        
-          <description>
-          Set the management password of the server;
- optional and only applicable to WL6.0.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="policy" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>The name of the security policy file within the weblogic home directory that
- is to be used.</short-description>
-        
-          <description>
-          The name of the security policy file within the weblogic home directory that
- is to be used. If not specified, the default policy file &lt;code&gt;weblogic.policy&lt;/code&gt;
- is used.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="properties" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>The name of the server's properties file within the weblogic home directory
- used to control the weblogic instance;
- required for WL4.5.1.</short-description>
-        
-          <description>
-          The name of the server's properties file within the weblogic home directory
- used to control the weblogic instance;
- required for WL4.5.1
-        </description>
-      
-        </attribute>
-      
-        <attribute name="username" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Management username to run the server;
- optional and only applicable to WL6.0.</short-description>
-        
-          <description>
-          Set the management username to run the server;
- optional and only applicable to WL6.0.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="weblogicmainclass" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Name of the main class for weblogic; optional.</short-description>
-        
-          <description>
-          name of the main class for weblogic; optional.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="wlclasspath" type="org.apache.tools.ant.types.Path" briefType="Path" required="NOTDEFINED">
-        
-          <short-description>Weblogic classpath used by the Weblogic Server;
- optional, and only applicable to WL4.5.1
-
- The weblogic classpath is used by weblogic to support dynamic class loading.</short-description>
-        
-          <description>
-          Set the weblogic classpath used by the Weblogic Server;
- optional, and only applicable to WL4.5.1
-
- The weblogic classpath is used by weblogic to support dynamic class loading.
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-      
-        <element name="classpath" type="org.apache.tools.ant.types.Path" briefType="Path" required="NOTDEFINED">
-        
-          <short-description>Add the classpath for the user classes.</short-description>
-        
-          <description>
-          Add the classpath for the user classes
-        </description>
-      
-        </element>
-
-      
-        <element name="wlclasspath" type="org.apache.tools.ant.types.Path" briefType="Path" required="NOTDEFINED">
-        
-          <short-description>Get the classpath to the weblogic classpaths.</short-description>
-        
-          <description>
-          Get the classpath to the weblogic classpaths
-        </description>
-      
-        </element>
-
-    
-      </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="wlstop" category="other" classname="org.apache.tools.ant.taskdefs.optional.ejb.WLStop">
-
-  
-    <short-description>Shuts down a WebLogic server.</short-description>
-  
-    <description>
-    Shuts down a WebLogic server.
- To shut down an instance you must supply both a username and
- a password.
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="beahome" type="java.io.File" briefType="File" required="NOTDEFINED">
-        
-          <short-description>The location of the BEA Home; implicitly
- selects Weblogic 6.0 shutdown; optional.</short-description>
-        
-          <description>
-          The location of the BEA Home; implicitly
- selects Weblogic 6.0 shutdown; optional.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="classpath" type="org.apache.tools.ant.types.Path" briefType="Path" required="NOTDEFINED">
-        
-          <short-description>The classpath to be used with the Java Virtual Machine that runs the Weblogic
- Shutdown command;.</short-description>
-        
-          <description>
-          The classpath to be used with the Java Virtual Machine that runs the Weblogic
- Shutdown command;
-        </description>
-      
-        </attribute>
-      
-        <attribute name="delay" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Delay (in seconds) before shutting down the server;
- optional.</short-description>
-        
-          <description>
-          Set the delay (in seconds) before shutting down the server;
- optional.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="password" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>The password for the account specified in the
- user parameter; required.</short-description>
-        
-          <description>
-          The password for the account specified in the
- user parameter; required
-        </description>
-      
-        </attribute>
-      
-        <attribute name="url" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>URL to which the weblogic server is listening
- for T3 connections; required.</short-description>
-        
-          <description>
-          Set the URL to which the weblogic server is listening
- for T3 connections; required.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="user" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>The username of the account which will be used to shutdown the server;
- required.</short-description>
-        
-          <description>
-          The username of the account which will be used to shutdown the server;
- required.
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-      
-        <element name="classpath" type="org.apache.tools.ant.types.Path" briefType="Path" required="NOTDEFINED">
-        
-          <short-description>The classpath to be used with the Java Virtual Machine that runs the Weblogic
- Shutdown command;.</short-description>
-        
-          <description>
-          The classpath to be used with the Java Virtual Machine that runs the Weblogic
- Shutdown command;
-        </description>
-      
-        </element>
-
-    
-      </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="wsdltodotnet" category="dotnet" classname="org.apache.tools.ant.taskdefs.optional.dotnet.WsdlToDotnet">
-
-  
-    <short-description>Converts a WSDL file or URL resource into a .NET language.</short-description>
-  
-    <description>
-    Converts a WSDL file or URL resource into a .NET language.
-
- See "Creating an XML Web Service Proxy", "wsdl.exe" docs in
- the framework SDK documentation
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="destfile" type="java.io.File" briefType="File" required="NOTDEFINED">
-        
-          <short-description>Name of the file to generate.</short-description>
-        
-          <description>
-          Name of the file to generate. Required
-        </description>
-      
-        </attribute>
-      
-        <attribute name="extraoptions" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Any extra WSDL.EXE options which aren't explicitly
-  supported by the ant wrapper task; optional.</short-description>
-        
-          <description>
-          Any extra WSDL.EXE options which aren't explicitly
-  supported by the ant wrapper task; optional
-        </description>
-      
-        </attribute>
-      
-        <attribute name="failonerror" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          <short-description>Should failure halt the build?.</short-description>
-        
-          <description>
-          Should failure halt the build? optional, default=true
-        </description>
-      
-        </attribute>
-      
-        <attribute name="language" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Language; one of "CS", "JS", or "VB"
- optional, default is CS for C# source.</short-description>
-        
-          <description>
-          set the language; one of "CS", "JS", or "VB"
- optional, default is CS for C# source
-        </description>
-      
-        </attribute>
-      
-        <attribute name="namespace" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>Namespace to place  the source in.
- optional; default "".</short-description>
-        
-          <description>
-          namespace to place  the source in.
- optional; default ""
-        </description>
-      
-        </attribute>
-      
-        <attribute name="server" type="boolean" briefType="boolean" required="NOTDEFINED">
-        
-          <short-description>Flag to enable server side code generation;
- optional, default=false.</short-description>
-        
-          <description>
-          flag to enable server side code generation;
- optional, default=false
-        </description>
-      
-        </attribute>
-      
-        <attribute name="srcfile" type="java.io.File" briefType="File" required="NOTDEFINED">
-        
-          <short-description>The local WSDL file to parse; either url or srcFile is required.</short-description>
-        
-          <description>
-          The local WSDL file to parse; either url or srcFile is required.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="url" type="java.lang.String" briefType="String" required="NOTDEFINED">
-        
-          <short-description>URL to fetch.</short-description>
-        
-          <description>
-          Sets the URL to fetch. Fetching is by wsdl.exe; Ant proxy settings
- are ignored; either url or srcFile is required.
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-    </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="xmlproperty" category="xml" classname="org.apache.tools.ant.taskdefs.XmlProperty">
-
-  
-    <short-description>Loads property values from a valid XML file, generating the property names from the file's element and attribute names.</short-description>
-  
-    <description>
-    Loads property values from a valid XML file,
- generating the property names from the file's element and attribute names.
-
- Example:
- &lt;pre&gt;
-   &amp;lt;root-tag myattr="true"&amp;gt;
-     &amp;lt;inner-tag someattr="val"&amp;gt;Text&amp;lt;/inner-tag&amp;gt;
-     &amp;lt;a2&amp;gt;&amp;lt;a3&amp;gt;&amp;lt;a4&amp;gt;false&amp;lt;/a4&amp;gt;&amp;lt;/a3&amp;gt;&amp;lt;/a2&amp;gt;
-   &amp;lt;/root-tag&amp;gt;
-&lt;/pre&gt;
- this generates
- &lt;pre&gt;
-  root-tag(myattr)=true
-  root-tag.inner-tag=Text
-  root-tag.inner-tag(someattr)=val
-  root-tag.a2.a3.a4=false
- &lt;/pre&gt;
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="collapseattributes" type="boolean" briefType="boolean" required="no, default is false.">
-        
-          <short-description>Flag to treat attributes as nested elements;
- optional, default false.</short-description>
-        
-          <description>
-          flag to treat attributes as nested elements;
- optional, default false
-        </description>
-      
-        </attribute>
-      
-        <attribute name="file" type="java.io.File" briefType="File" required="yes">
-        
-          <short-description>The XML file to parse; required.</short-description>
-        
-          <description>
-          The XML file to parse; required.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="keeproot" type="boolean" briefType="boolean" required="no, default is true.">
-        
-          <short-description>Flag to include the xml root tag as a 
- first value in the property name; optional, 
- default is true.</short-description>
-        
-          <description>
-          flag to include the xml root tag as a 
- first value in the property name; optional, 
- default is true
-        </description>
-      
-        </attribute>
-      
-        <attribute name="prefix" type="java.lang.String" briefType="String" required="no">
-        
-          <short-description>The prefix to prepend to each property.</short-description>
-        
-          <description>
-          the prefix to prepend to each property
-        </description>
-      
-        </attribute>
-      
-        <attribute name="validate" type="boolean" briefType="boolean" required="no, default is false.">
-        
-          <short-description>Flag to validate the XML file; optional, default false.</short-description>
-        
-          <description>
-          flag to validate the XML file; optional, default false
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-    </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="xmlvalidate" category="other" classname="org.apache.tools.ant.taskdefs.optional.XMLValidateTask">
-
-  
-    <short-description>Checks XML files are valid (or only well formed).</short-description>
-  
-    <description>
-    Checks XML files are valid (or only well formed). The
- task uses the SAX2 parser implementation provided by JAXP by default
- (probably the one that is used by Ant itself), but one can specify any
- SAX1/2 parser if needed
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="classname" type="java.lang.String" briefType="String" required="no">
-        
-          <short-description>Specify the class name of the SAX parser to be used. (optional).</short-description>
-        
-          <description>
-          Specify the class name of the SAX parser to be used. (optional)
-        </description>
-      
-        </attribute>
-      
-        <attribute name="classpath" type="org.apache.tools.ant.types.Path" briefType="Path" required="NOTDEFINED">
-        
-          <short-description>Specify the classpath to be searched to load the parser (optional).</short-description>
-        
-          <description>
-          Specify the classpath to be searched to load the parser (optional)
-        </description>
-      
-        </attribute>
-      
-        <attribute name="classpathref" type="org.apache.tools.ant.types.Reference" briefType="Reference" required="no">
-        
-          <short-description>Where to find the parser class; optional.</short-description>
-        
-          <description>
-          Where to find the parser class; optional.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="failonerror" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>Specify how parser error are to be handled; 
- optional, default=true
- &lt;p&gt;
- If set to &lt;code&gt;true&lt;/code&gt; (default), throw a buildException if the parser yields an error.</short-description>
-        
-          <description>
-          Specify how parser error are to be handled; 
- optional, default=true
- &lt;p&gt;
- If set to &lt;code&gt;true&lt;/code&gt; (default), throw a buildException if the parser yields an error.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="file" type="java.io.File" briefType="File" required="no">
-        
-          <short-description>Specify the file to be checked; optional.</short-description>
-        
-          <description>
-          specify the file to be checked; optional.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="lenient" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>Specify whether the parser should be validating.</short-description>
-        
-          <description>
-          Specify whether the parser should be validating. Default is &lt;code&gt;true&lt;/code&gt;.
- &lt;p&gt;
- If set to false, the validation will fail only if the parsed document is not well formed XML.
- &lt;p&gt;
- this option is ignored if the specified class with {@link #setClassName(String)} is not a SAX2
- XMLReader.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="warn" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>Specify how parser error are to be handled.</short-description>
-        
-          <description>
-          Specify how parser error are to be handled.
- &lt;p&gt;
- If set to &lt;code&gt;true&lt;/true&gt; (default), log a warn message for each SAX warn event.
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-      
-        <element name="xmlcatalog" type="org.apache.tools.ant.types.XMLCatalog" briefType="XMLCatalog" required="NOTDEFINED">
-        
-          <short-description>Add an XMLCatalog as a nested element; optional.</short-description>
-        
-          <description>
-          add an XMLCatalog as a nested element; optional.
-        </description>
-      
-        </element>
-
-      
-        <element name="fileset" type="org.apache.tools.ant.types.FileSet" briefType="Fileset" required="NOTDEFINED">
-        
-          <short-description>Specify a set of file to be checked.</short-description>
-        
-          <description>
-          specify a set of file to be checked
-        </description>
-      
-        </element>
-
-      
-        <element name="classpath" type="org.apache.tools.ant.types.Path" briefType="Path" required="NOTDEFINED">
-        
-          <short-description>No description.</short-description>
-        
-          <description>
-          
-        </description>
-      
-        </element>
-
-      
-        <element name="dtd" type="org.apache.tools.ant.types.DTDLocation" briefType="" required="NOTDEFINED">
-        
-          <short-description>Create a DTD location record; optional.</short-description>
-        
-          <description>
-          Create a DTD location record; optional.
- This stores the location of a DTD. The DTD is identified
- by its public Id.
-        </description>
-      
-        </element>
-
-    
-      </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="xslt" category="xml" classname="org.apache.tools.ant.taskdefs.XSLTProcess" matchingTask="true">
-
-  
-    <short-description>Processes a set of XML documents via XSLT.</short-description>
-  
-    <description>
-    Processes a set of XML documents via XSLT. This is
- useful for building views of XML based documentation.
-  </description>
-
-  
-    <structure>
-
-    
-      <attributes>
-      
-        <attribute name="basedir" type="java.io.File" briefType="File" required="no">
-        
-          <short-description>Base directory; 
- optional, default is the project's basedir.</short-description>
-        
-          <description>
-          Set the base directory; 
- optional, default is the project's basedir.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="classpath" type="org.apache.tools.ant.types.Path" briefType="Path" required="no">
-        
-          <short-description>Optional classpath to the XSL processor.</short-description>
-        
-          <description>
-          Set the optional classpath to the XSL processor
-        </description>
-      
-        </attribute>
-      
-        <attribute name="classpathref" type="org.apache.tools.ant.types.Reference" briefType="Reference" required="no">
-        
-          <short-description>Reference to an optional classpath to the XSL processor.</short-description>
-        
-          <description>
-          Set the reference to an optional classpath to the XSL processor
-        </description>
-      
-        </attribute>
-      
-        <attribute name="destdir" type="java.io.File" briefType="File" required="yes, unless in and out have been        specified.">
-        
-          <short-description>Destination directory into which the XSL result
- files should be copied to; 
- required, unless &lt;tt&gt;in&lt;/tt&gt; and &lt;tt&gt;out&lt;/tt&gt; are
- specified.</short-description>
-        
-          <description>
-          Set the destination directory into which the XSL result
- files should be copied to; 
- required, unless &lt;tt&gt;in&lt;/tt&gt; and &lt;tt&gt;out&lt;/tt&gt; are
- specified.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="extension" type="java.lang.String" briefType="String" required="no">
-        
-          <short-description>Desired file extension to be used for the target;
- optional, default is html.</short-description>
-        
-          <description>
-          Set the desired file extension to be used for the target;
- optional, default is html.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="force" type="boolean" briefType="boolean" required="no; default is false">
-        
-          <short-description>Set whether to check dependencies, or always generate;
- optional, default is false.</short-description>
-        
-          <description>
-          Set whether to check dependencies, or always generate;
- optional, default is false.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="in" type="java.io.File" briefType="File" required="no">
-        
-          <short-description>Specifies a single XML document to be styled.</short-description>
-        
-          <description>
-          specifies a single XML document to be styled. Should be used 
- with the &lt;tt&gt;out&lt;/tt&gt; attribute; ; required if &lt;tt&gt;out&lt;/tt&gt; is set
-        </description>
-      
-        </attribute>
-      
-        <attribute name="out" type="java.io.File" briefType="File" required="no">
-        
-          <short-description>Specifies the output name for the styled result from the 
- &lt;tt&gt;in&lt;/tt&gt; attribute; required if &lt;tt&gt;in&lt;/tt&gt; is set.</short-description>
-        
-          <description>
-          Specifies the output name for the styled result from the 
- &lt;tt&gt;in&lt;/tt&gt; attribute; required if &lt;tt&gt;in&lt;/tt&gt; is set
-        </description>
-      
-        </attribute>
-      
-        <attribute name="processor" type="java.lang.String" briefType="String" required="no">
-        
-          <short-description>Name of the XSL processor to use; optional, default trax.</short-description>
-        
-          <description>
-          Set the name of the XSL processor to use; optional, default trax.
- Other values are "xalan" for Xalan1 and "xslp" for XSL:P, though the
- later is strongly deprecated.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="scanincludeddirectories" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>Whether to style all files in the included directories as well;
- optional, default is true.</short-description>
-        
-          <description>
-          Whether to style all files in the included directories as well;
- optional, default is true.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="style" type="java.lang.String" briefType="String" required="yes">
-        
-          <short-description>Name of the stylesheet to use - given either relative
- to the project's basedir or as an absolute path; required.</short-description>
-        
-          <description>
-          Name of the stylesheet to use - given either relative
- to the project's basedir or as an absolute path; required.
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-      
-        <element name="xmlcatalog" type="org.apache.tools.ant.types.XMLCatalog" briefType="XMLCatalog" required="NOTDEFINED">
-        
-          <short-description>Add the catalog to our internal catalog.</short-description>
-        
-          <description>
-          Add the catalog to our internal catalog
-        </description>
-      
-        </element>
-
-      
-        <element name="classpath" type="org.apache.tools.ant.types.Path" briefType="Path" required="NOTDEFINED">
-        
-          <short-description>Optional classpath to the XSL processor.</short-description>
-        
-          <description>
-          Set the optional classpath to the XSL processor
-        </description>
-      
-        </element>
-
-      
-        <element name="outputproperty" type="org.apache.tools.ant.taskdefs.XSLTProcess.OutputProperty" briefType="" required="NOTDEFINED">
-        
-          <short-description>Create an instance of an output property to be configured.</short-description>
-        
-          <description>
-          Create an instance of an output property to be configured.
-        </description>
-      
-        </element>
-
-      
-        <element name="param" type="org.apache.tools.ant.taskdefs.XSLTProcess.Param" briefType="" required="NOTDEFINED">
-        
-          <short-description>Create an instance of an XSL parameter for configuration by Ant.</short-description>
-        
-          <description>
-          Create an instance of an XSL parameter for configuration by Ant.
-        </description>
-      
-        </element>
-
-    
-      </elements>
-
-  
-    </structure>
-
-
-  </task>
-
-
-
-  <task name="zip" category="packaging" classname="org.apache.tools.ant.taskdefs.Zip" matchingTask="true">
-    <short-description>Create a Zip file.</short-description>
-    <description>
-    Create a Zip file.
-  </description>
-    <structure>
-      <attributes>
-        <attribute name="basedir" type="java.io.File" briefType="File" required="no">
-          <short-description>Directory from which to archive files; optional.</short-description>
-          <description>
-          Directory from which to archive files; optional.
-        </description>
-        </attribute>
-        <attribute name="compress" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>Whether we want to compress the files or only store them;
- optional, default=true;.</short-description>
-        
-          <description>
-          Whether we want to compress the files or only store them;
- optional, default=true;
-        </description>
-      
-        </attribute>
-      
-        <attribute name="destfile" type="java.io.File" briefType="File" required="yes">
-        
-          <short-description>The file to create; required.</short-description>
-        
-          <description>
-          The file to create; required.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="duplicate" type="org.apache.tools.ant.taskdefs.Zip.Duplicate" briefType="&quot;add&quot;, &quot;preserve&quot;, &quot;fail&quot;" required="no">
-        
-          <short-description>Sets behavior for when a duplicate file is about to be added -
- one of &lt;code&gt;keep&lt;/code&gt;, &lt;code&gt;skip&lt;/code&gt; or &lt;code&gt;overwrite&lt;/code&gt;.</short-description>
-        
-          <description>
-          Sets behavior for when a duplicate file is about to be added -
- one of &lt;code&gt;keep&lt;/code&gt;, &lt;code&gt;skip&lt;/code&gt; or &lt;code&gt;overwrite&lt;/code&gt;.
- Possible values are: &lt;code&gt;keep&lt;/code&gt; (keep both
- of the files); &lt;code&gt;skip&lt;/code&gt; (keep the first version
- of the file found); &lt;code&gt;overwrite&lt;/code&gt; overwrite the file
- with the new file
- Default for zip tasks is &lt;code&gt;keep&lt;/code&gt;
-        </description>
-      
-        </attribute>
-      
-        <attribute name="encoding" type="java.lang.String" briefType="String" required="no">
-        
-          <short-description>Encoding to use for filenames, defaults to the platform's
- default encoding.</short-description>
-        
-          <description>
-          Encoding to use for filenames, defaults to the platform's
- default encoding.
-
- &lt;p&gt;For a list of possible values see &lt;a
- href="http://java.sun.com/products/jdk/1.2/docs/guide/internat/encoding.doc.html"&gt;http://java.sun.com/products/jdk/1.2/docs/guide/internat/encoding.doc.html&lt;/a&gt;.&lt;/p&gt;
-        </description>
-      
-        </attribute>
-      
-        <attribute name="filesonly" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>If true, emulate Sun's jar utility by not adding parent directories;
- optional, defaults to false.</short-description>
-        
-          <description>
-          If true, emulate Sun's jar utility by not adding parent directories;
- optional, defaults to false.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="update" type="boolean" briefType="boolean" required="no">
-        
-          <short-description>If true, updates an existing file, otherwise overwrite
- any existing one; optional defaults to false.</short-description>
-        
-          <description>
-          If true, updates an existing file, otherwise overwrite
- any existing one; optional defaults to false.
-        </description>
-      
-        </attribute>
-      
-        <attribute name="whenempty" type="org.apache.tools.ant.taskdefs.Zip.WhenEmpty" briefType="&quot;fail&quot;, &quot;skip&quot;, &quot;create&quot;" required="no">
-        
-          <short-description>Sets behavior of the task when no files match.</short-description>
-        
-          <description>
-          Sets behavior of the task when no files match.
- Possible values are: &lt;code&gt;fail&lt;/code&gt; (throw an exception
- and halt the build); &lt;code&gt;skip&lt;/code&gt; (do not create
- any archive, but issue a warning); &lt;code&gt;create&lt;/code&gt;
- (make an archive with no entries).
- Default for zip tasks is &lt;code&gt;skip&lt;/code&gt;;
- for jar tasks, &lt;code&gt;create&lt;/code&gt;.
-        </description>
-      
-        </attribute>
-    
-      </attributes>
-
-    
-      <elements>
-      
-        <element name="fileset" type="org.apache.tools.ant.types.FileSet" briefType="Fileset" required="NOTDEFINED">
-        
-          <short-description>Adds a set of files.</short-description>
-        
-          <description>
-          Adds a set of files.
-        </description>
-      
-        </element>
-
-      
-        <element name="zipgroupfileset" type="org.apache.tools.ant.types.FileSet" briefType="Fileset" required="NOTDEFINED">
-        
-          <short-description>Adds a group of zip files.</short-description>
-        
-          <description>
-          Adds a group of zip files.
-        </description>
-      
-        </element>
-
-      
-        <element name="zipfileset" type="org.apache.tools.ant.types.ZipFileSet" briefType="ZipFileset" required="NOTDEFINED">
-        
-          <short-description>Adds a set of files that can be
- read from an archive and be given a prefix/fullpath.</short-description>
-        
-          <description>
-          Adds a set of files that can be
- read from an archive and be given a prefix/fullpath.
-        </description>
-      
-        </element>
-
-    
-      </elements>
-
-  
-    </structure>
-  </task>
-
-
-  <task name="target">
-    <short-description>Ant target that is executable and may depend on other targets.</short-description>
-    <description>
-		Ant target that is executable and may depend on other targets. 
-	</description>
-	<structure>
-		<attributes>
-			<attribute name="name" required="yes">
-				<short-description>the name of the target.</short-description>
-				<description>the name of the target.</description>
-			</attribute>
-			<attribute name="depends" required="no">
-				<short-description>a comma-separated list of names of targets on which this target depends.</short-description>
-				<description>a comma-separated list of names of targets on which this target depends.</description>
-			</attribute>
-			<attribute name="if" required="no">
-				<short-description>the name of the property that must be set in order for this target to execute.</short-description>
-				<description>the name of the property that must be set in order for this target to execute.</description>
-			</attribute>
-			<attribute name="unless" required="no">
-				<short-description>the name of the property that must not be set in order for this target to execute.</short-description>
-				<description>the name of the property that must not be set in order for this target to execute.</description>
-			</attribute>
-			<attribute name="description" required="no">
-				<short-description>a short description of this target's function.</short-description>
-				<description>a short description of this target's function.</description>
-			</attribute>
-		</attributes>
-	</structure>
-  </task>
-
-</tasks>
-
diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/dtd/AntDTDMessages.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/dtd/AntDTDMessages.java
deleted file mode 100644
index 8ca9eff..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/dtd/AntDTDMessages.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.ui.internal.dtd;
-
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-public class AntDTDMessages {
-
-	private static final String BUNDLE_NAME = "org.eclipse.ant.ui.internal.dtd.AntDTDMessages"; //$NON-NLS-1$
-
-	private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME);
-
-	private AntDTDMessages() {
-	}
-
-	public static String getString(String key) {
-		try {
-			return RESOURCE_BUNDLE.getString(key);
-		} catch (MissingResourceException e) {
-			return '!' + key + '!';
-		}
-	}
-}
diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/dtd/AntDTDMessages.properties b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/dtd/AntDTDMessages.properties
deleted file mode 100644
index 0e5cf69..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/dtd/AntDTDMessages.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2003 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Common Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/cpl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-Parser.XML_parser_does_not_support_DeclHandler_1=XML parser does not support DeclHandler
-Parser.Error_parsing_XML_document_or_DTD_2=Error parsing XML document or DTD
diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/dtd/IAtom.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/dtd/IAtom.java
deleted file mode 100644
index 7c57c95..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/dtd/IAtom.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2003 Object Factory Inc.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *		Object Factory Inc. - Initial implementation
- *******************************************************************************/
-package org.eclipse.ant.ui.internal.dtd;
-
-/**
- * Schema atom interface.
- * @author Bob Foster
- */
-public interface IAtom {
-
-	public static final int ELEMENT = 0;
-	public static final int ATTRIBUTE = 1;
-	
-	/**
-	 * Return the atom name.
-	 */
-	public String getName();
-	
-	/**
-	 * Return the atom name.
-	 */
-	public String toString();
-}
diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/dtd/IAttribute.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/dtd/IAttribute.java
deleted file mode 100644
index 660f00a..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/dtd/IAttribute.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2003 Object Factory Inc.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *		Object Factory Inc. - Initial implementation
- *******************************************************************************/
-package org.eclipse.ant.ui.internal.dtd;
-
-/**
- * Schema attribute interface.
- * @author Bob Foster
- */
-public interface IAttribute extends IAtom {
-
-	public static final String CDATA = "CDATA"; //$NON-NLS-1$
-	public static final String ID = "ID"; //$NON-NLS-1$
-	public static final String IDREF = "IDREF"; //$NON-NLS-1$
-	public static final String IDREFS = "IDREFS"; //$NON-NLS-1$
-	public static final String NMTOKEN = "NMTOKEN"; //$NON-NLS-1$
-	public static final String NMTOKENS = "NMTOKENS"; //$NON-NLS-1$
-	public static final String ENTITY = "ENTITY"; //$NON-NLS-1$
-	public static final String ENTITIES = "ENTITIES"; //$NON-NLS-1$
-	public static final String NOTATION = "NOTATION"; //$NON-NLS-1$
-	public static final String ENUMERATION = "enumeration"; //$NON-NLS-1$
-	
-	/**
-	 * @return the attribute type. This will be one of "CDATA", "ID", "IDREF",
-	 * "IDREFS", "NMTOKEN", "NMTOKENS", "ENTITY", "ENTITIES", "NOTATION" or
-	 * "enumeration". The type is interned and may be compared to a constant
-	 * with ==. For "NOTATION" or "enumeration", <code>getEnum()</code> will
-	 * return a list of values.
-	 */
-	public String getType();
-	
-	/**
-	 * 
-	 * @return String[] or null if type is not "NOTATION" or "ENUMERATION".
-	 */
-	public String[] getEnum();
-	
-	/**
-	 * Return the element the attribute is defined in.
-	 */
-	public IElement getElement();
-	
-	/**
-	 * Return the default value or null if none.
-	 */
-	public String getDefault();
-	
-	/**
-	 * Return true if the default value is fixed.
-	 */
-	public boolean isFixed();
-	
-	/**
-	 * Return true if attribute is required, false if it is optional.
-	 */
-	public boolean isRequired();
-}
diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/dtd/IDfm.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/dtd/IDfm.java
deleted file mode 100644
index ed1d75d..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/dtd/IDfm.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2003 Object Factory Inc.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *		Object Factory Inc. - Initial implementation
- *******************************************************************************/
-package org.eclipse.ant.ui.internal.dtd;
-
-/**
- * A Dfm is an IModel converted to a form more appropriate for
- * validation. The whole point of a Dfm is to run fast.
- * @author Bob Foster
- */
-public interface IDfm {
-
-	/**
-	 * Return true if no further symbols are required.
-	 */
-	boolean isAccepting();
-	
-	/**
-	 * If the symbol represented by name is acceptable,
-	 * return the dfm to apply to the next (child) symbol.
-	 * Otherwise, return null.
-	 */
-	IDfm advance(String name);
-	
-	/**
-	 * If the symbol represented by the namespace,name pair is acceptable,
-	 * return the dfm to apply to the next (child) symbol. Otherwise, return
-	 * null.
-	 */
-	IDfm advance(String namespace, String localname);
-	
-	/**
-	 * If the symbol represented by name is acceptable
-	 * to <code>advance()</code>
-	 * return the corresponding atom.
-	 * Otherwise, return null.
-	 */
-	IAtom getAtom(String name);
-	
-	/**
-	 * Return the symbols for which <code>advance()</code>
-	 * will return a next dfm. If no symbols will
-	 * advance this dfm or if any symbol will, returns
-	 * an empty array. Use <code>isAny()</code> and
-	 * <code>isEmpty()</code> to disambiguate the
-	 * cases.
-	 */
-	String[] getAccepts();
-	
-	/**
-	 * Return the symbols for which <code>advance()</code>
-	 * will return a next dfm. If no symbols will
-	 * advance this dfm or if any symbol will, returns
-	 * null. Use <code>isAny()</code> and
-	 * <code>isEmpty()</code> to disambiguate the
-	 * cases.
-	 */
-	Object[] getKeys();
-	
-	/**
-	 * Return true if dfm will accept any symbol
-	 * and return itself; false otherwise.
-	 * This interface keeps the dfm from needing
-	 * schema knowledge, but a better way to
-	 * process an ANY dfm for elements is use the 
-	 * schema to look up the element and use its 
-	 * dfm instead of this one.
-	 */
-	boolean isAny();
-	
-	/**
-	 * Return true if dfm will reject every symbol
-	 * (<code>advance()</code> returns null);
-	 * false otherwise. Included for completeness,
-	 * so every element can have a dfm, regardless
-	 * of its type.
-	 */
-	boolean isEmpty();
-}
diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/dtd/IElement.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/dtd/IElement.java
deleted file mode 100644
index 4adf63a..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/dtd/IElement.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2003 Object Factory Inc.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *		Object Factory Inc. - Initial implementation
- *******************************************************************************/
-package org.eclipse.ant.ui.internal.dtd;
-
-import java.util.Map;
-
-/**
- * IElement interface.
- * @author Bob Foster
- */
-public interface IElement extends IAtom {
-
-	/**
-	 * @return true if the element has been referenced in a schema but is not
-	 * yet defined.
-	 */
-	public boolean isUndefined();
-	
-	/**
-	 * @return true if element model is <code>"(#PCDATA)"</code>.
-	 */
-	public boolean isText();
-	
-	/**
-	 * @return true if element model is mixed, i.e., 
-	 * <code>"(#PCDATA|...)*"</code>.
-	 * @return String
-	 */
-	public boolean isMixed();
-	
-	/**
-	 * @return true if element model is EMPTY.
-	 */
-	public boolean isEmpty();
-	
-	/**
-	 * @return true if element model is ANY.
-	 */
-	public boolean isAny();
-	
-	/**
-	 * @return the element's content model. The content model will be empty
-	 * if <code>isText()</code>, <code>isAny()</code> or <code>isEmpty()</code>.
-	 * Note that the content model deals with child elements only; use
-	 * <code>isMixed()</code> to see if text is also allowed.
-	 */
-	public IModel getContentModel();
-	
-	/**
-	 * @return the DFM corresponding to the content model. Every element
-	 * has a DFM.
-	 */
-	public IDfm getDfm();
-	
-	/**
-	 * @return Map with attribute qname keys and IAttr values.
-	 * If element has no attributes, the map is empty.
-	 * Map must not be modified by caller; for performance reasons,
-	 * it is not a copy.
-	 */
-	public Map getAttributes();
-}
diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/dtd/IModel.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/dtd/IModel.java
deleted file mode 100644
index 368f4b7..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/dtd/IModel.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2003 Object Factory Inc.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *		Object Factory Inc. - Initial implementation
- *******************************************************************************/
-package org.eclipse.ant.ui.internal.dtd;
-
-import org.eclipse.ant.ui.internal.dtd.schema.Nfm;
-
-
-/**
- * Content model.
- * This is the printable version of the model.
- * The walkable version is the IDfm.
- * @author Bob Foster
- */
-public interface IModel {
-
-	public static final int UNKNOWN = 0;
-	public static final int SEQUENCE = 1;
-	public static final int CHOICE = 2;
-	public static final int LEAF = 4;
-	
-	public static final int UNBOUNDED = Integer.MAX_VALUE;
-	
-	/**
-	 * @return one of SEQUENCE, CHOICE, LEAF
-	 */
-	public int getKind();
-	
-	/**
-	 * @return one of 0 or 1.
-	 */
-	public int getMinOccurs();
-	
-	/**
-	 * @return one of 1 or UNBOUNDED.
-	 */
-	public int getMaxOccurs();
-	
-	/**
-	 * @return if SEQUENCE or CHOICE return array of sub-models; otherwise
-	 * undefined.
-	 */
-	public IModel[] getContents();
-	
-	/**
-	 * @return if LEAF return atom; otherwise undefined.
-	 */
-	public IAtom getLeaf();
-	
-	/**
-	 * @return if SEQUENCE or CHOICE return "," and "|", respectively; otherwise
-	 * undefined. Useful when printing model.
-	 */
-	public String getOperator();
-	
-	/**
-	 * @return one of "", "?", "*" or "+". Useful when printing model.
-	 */
-	public String getQualifier();
-	
-	/**
-	 * Convert content model to string representation.
-	 */
-	public String stringRep();
-	
-	/**
-	 * Convert the model to an Nfm on demand.
-	 * @return Nfm
-	 */
-	public Nfm toNfm();
-}
diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/dtd/ISchema.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/dtd/ISchema.java
deleted file mode 100644
index 094562f..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/dtd/ISchema.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2003 Object Factory Inc.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *		Object Factory Inc. - Initial implementation
- *******************************************************************************/
-package org.eclipse.ant.ui.internal.dtd;
-
-public interface ISchema {
-
-	/**
-	 * Find element by name.
-	 * @param qname Element name.
-	 * @return element or null if no such element.
-	 */
-	IElement getElement(String qname);
-	
-	/**
-	 * @return IElement[] of all visible elements.
-	 */
-	IElement[] getElements();
-	
-	/**
-	 * @return Exception thrown by parser when schema was built or <code>null</code> if none.
-	 * Note that the exception does not necessarily mean the schema is
-	 * incomplete.
-	 */
-	Exception getErrorException();
-}
diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/dtd/ParseError.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/dtd/ParseError.java
deleted file mode 100644
index 2194f7d..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/dtd/ParseError.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2003 Object Factory Inc.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *		Object Factory Inc. - Initial implementation
- *******************************************************************************/
-package org.eclipse.ant.ui.internal.dtd;
-
-/**
- * @author Bob Foster
- */
-public class ParseError extends Exception {
-	
-	/**
-	 * Constructor for ParseError.
-	 * @param msg Message
-	 */
-	public ParseError(String msg) {
-		super(msg);
-	}
-}
diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/dtd/Parser.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/dtd/Parser.java
deleted file mode 100644
index 1ed181d..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/dtd/Parser.java
+++ /dev/null
@@ -1,185 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2003 Object Factory Inc.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *		Object Factory Inc. - Initial implementation
- *******************************************************************************/
-package org.eclipse.ant.ui.internal.dtd;
-
-import java.io.IOException;
-import java.io.Reader;
-import java.io.StringReader;
-
-import org.apache.xerces.parsers.SAXParser;
-import org.eclipse.ant.ui.internal.dtd.schema.SchemaFactory;
-import org.xml.sax.EntityResolver;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-import org.xml.sax.SAXNotRecognizedException;
-import org.xml.sax.SAXNotSupportedException;
-import org.xml.sax.XMLReader;
-import org.xml.sax.ext.DeclHandler;
-
-/**
- * Simple parser for DTDs. Returns ISchema representing the DTD.
- * 
- * To parse a DTD, you must parse an XML document. The <code>parseDTD()</code>
- * method builds a temporary XML document in memory that refers to or includes
- * the DTD.
- * 
- * There is no dependency in this package on any code outside the package except
- * XMLReader.
- * 
- * To hide the underlying parser, XML parser exceptions are wrapped by a
- * ParseError. Unless debugging, the two string constants are sufficient to
- * determine the cause of the error.
- * @author Bob Foster
- */
-public class Parser {
-	
-	/** ParseError message when system parser doesn't do the job */
-	public static final String NOT_SUPPORTED = AntDTDMessages.getString("Parser.XML_parser_does_not_support_DeclHandler_1"); //$NON-NLS-1$
-	/** ParseError message for a well-formed or validation error in XML or DTD.
-	 *  Currently not returned. */
-	public static final String PARSE_ERROR = AntDTDMessages.getString("Parser.Error_parsing_XML_document_or_DTD_2"); //$NON-NLS-1$
-	
-	private static final String INTERNAL = "internal://usereader.objfac.com"; //$NON-NLS-1$
-	
-	/**
-	 * Parse the XML document at the input source and return a document walker
-	 * that can be used to validate any document with the same DTD (internal and
-	 * external) or provide user assistance for this document.
-	 * @param inputSource Source for XML document to start DTD parse. Must
-	 * contain a DOCTYPE declaration with internal or external subset, or both.
-	 * @param entityResolver EntityResolver or null.
-	 * @return schema for document.
-	 * @throws ParseError for NOT_SUPPORTED or PARSE_ERROR.
-	 * @throws IOException
-	 */
-	public ISchema parse(InputSource inputSource, EntityResolver entityResolver) throws ParseError, IOException {
-		XMLReader parser = null;
-		SchemaFactory factory = new SchemaFactory();
-		try {
-			parser = new SAXParser();
-			DeclHandler handler = factory;
-			parser.setProperty("http://xml.org/sax/properties/declaration-handler", //$NON-NLS-1$
-			handler);
-			if (entityResolver != null)
-				parser.setEntityResolver(entityResolver);
-			parser.parse(inputSource);
-		} catch (SAXNotRecognizedException e) {
-			throw new ParseError(NOT_SUPPORTED);
-		} catch (SAXNotSupportedException e) {
-			throw new ParseError(NOT_SUPPORTED);
-		} catch (SAXException e) {
-			// Don't care about errors in XML, so just fall thru.
-			// If parse failed in DTD, may have incomplete schema,
-			// but this is better than no schema.
-			factory.setErrorException(e);
-		}
-
-		return factory.getSchema();
-	}
-	
-	/**
-	 * Parse the XML document at the argument URL and return a document walker
-	 * that can be used to validate any document with the same DTD (internal
-	 * and external) or provide user assistance for this document.
-	 * @param url Of XML document to start DTD parse. Must contain a DOCTYPE
-	 * declaration with internal or external subset, or both.
-	 * @return IWalker that can be used to traverse document.
-	 * @throws ParseError for NOT_SUPPORTED or PARSE_ERROR.
-	 * @throws IOException
-	 */
-	public ISchema parse(String url) throws ParseError, IOException {
-		return parse(new InputSource(url), null);
-	}
-	
-	/**
-	 * Parse the XML document using the argument reader and return a document
-	 * walker that can be used to validate any document with the same DTD
-	 * (internal and external) or provide user assistance for this document.
-	 * @param reader Reader for XML document to start DTD parse. Must contain a
-	 * DOCTYPE declaration with internal or external subset, or both.
-	 * @return IWalker that can be used to traverse document.
-	 * @throws ParseError for NOT_SUPPORTED or PARSE_ERROR.
-	 * @throws IOException
-	 */
-	public ISchema parse(Reader reader) throws ParseError, IOException {
-		return parse(new InputSource(reader), null);
-	}
-	
-	/**
-	 * Parse the DTD with the given public and system ids and return a document
-	 * walker that can be used to validate or provide user assistance for any
-	 * document with the same external DTD and no internal subset.
-	 * @param pub PUBLIC id of DTD.
-	 * @param sys SYSTEM id of DTD.
-	 * @param root Plausible root element qname. Any name will do but a
-	 * name that will not cause a validation error is preferred.
-	 * @return IWalker that can be used to traverse document.
-	 * @throws ParseError for NOT_SUPPORTED or PARSE_ERROR.
-	 * @throws IOException
-	 */
-	public ISchema parseDTD(String pub, String sys, String root) throws ParseError, IOException {
-		return parse(new InputSource(new DTDReader(pub, sys, root)), null);
-	}
-	
-	/**
-	 * Parse the DTD from the reader and return a document walker that can be
-	 * used to validate or provide user assistance for any document with the
-	 * same external DTD and no internal subset.
-	 * @param reader Reader for external subset DTD
-	 * @param root Plausible root element qname. Any name will do but a
-	 * name that will not cause a validation error is preferred.
-	 * @return IWalker that can be used to traverse document.
-	 * @throws ParseError for NOT_SUPPORTED or PARSE_ERROR.
-	 * @throws IOException
-	 */
-	public ISchema parseDTD(Reader reader, String root) throws ParseError, IOException {
-		return parse(new InputSource(new DTDReader(INTERNAL, INTERNAL, root)), new DTDEntityResolver(reader));
-	}
-	
-	private static class DTDReader extends Reader {
-		private Reader fDelegate;
-		
-		public DTDReader(String pub, String sys, String root) {
-			String document = "<!DOCTYPE "+root+" PUBLIC '"+pub+"' '"+sys+"'><"+root+"/>"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
-			fDelegate = new StringReader(document);
-		}
-		
-		/**
-		 * @see java.io.Reader#close()
-		 */
-		public void close() throws IOException {
-			fDelegate.close();
-		}
-
-		/**
-		 * @see java.io.Reader#read(char, int, int)
-		 */
-		public int read(char[] cbuf, int off, int len) throws IOException {
-			return fDelegate.read(cbuf, off, len);
-		}
-	}
-	
-	private static class DTDEntityResolver implements EntityResolver {
-		private Reader reader;
-		public DTDEntityResolver(Reader reader) {
-			this.reader = reader;
-		}
-		/**
-		 * @see org.xml.sax.EntityResolver#resolveEntity(java.lang.String, java.lang.String)
-		 */
-		public InputSource resolveEntity(String publicId, String systemId) throws SAXException, IOException {
-			if (publicId.equals(INTERNAL) && systemId.equals(INTERNAL))
-				return new InputSource(reader);
-			return null;
-		}
-	}
-	
-}
diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/dtd/schema/AntDTDSchemaMessages.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/dtd/schema/AntDTDSchemaMessages.java
deleted file mode 100644
index 8bfffd5..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/dtd/schema/AntDTDSchemaMessages.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.ui.internal.dtd.schema;
-
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-public class AntDTDSchemaMessages {
-
-	private static final String BUNDLE_NAME = "org.eclipse.ant.ui.internal.dtd.schema.AntDTDSchemaMessages"; //$NON-NLS-1$
-
-	private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME);
-
-	private AntDTDSchemaMessages() {
-	}
-
-	public static String getString(String key) {
-		try {
-			return RESOURCE_BUNDLE.getString(key);
-		} catch (MissingResourceException e) {
-			return '!' + key + '!';
-		}
-	}
-}
diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/dtd/schema/AntDTDSchemaMessages.properties b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/dtd/schema/AntDTDSchemaMessages.properties
deleted file mode 100644
index 2d0c0b7..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/dtd/schema/AntDTDSchemaMessages.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2003 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Common Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/cpl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-Model.model_may_not_be_changed=model may not be changed once its contents have been requested
-Model.***UNKNOWN***_2=<UNKNOWN>
-NfmParser.Ambiguous=Ambiguous content model starting with {0}
-SchemaFactory.Doubly_defined=Element {0} is doubly defined
-SchemaFactory.Start_with_left_parenthesis=Element {0} model does not start with left parenthesis
-SchemaFactory.Expecting_operator_or_right_parenthesis=Expecting operator or right parenthesis in element {0} model {1}
-SchemaFactory.Unexpected_end=Unexpected end of content model for element {0}: {1}
diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/dtd/schema/Atom.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/dtd/schema/Atom.java
deleted file mode 100644
index dd1c8b9..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/dtd/schema/Atom.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2003 Object Factory Inc.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *		Object Factory Inc. - Initial implementation
- *******************************************************************************/
-package org.eclipse.ant.ui.internal.dtd.schema;
-
-import org.eclipse.ant.ui.internal.dtd.IAtom;
-
-/**
- * Atom contains information common to elements and attributes.
- * @author Bob Foster
- */
-public class Atom implements IAtom {
-	
-	protected String fName;
-	protected int fKind;
-
-	protected Atom(int kind, String name) {
-		fKind = kind;
-		fName = name.intern();
-	}
-	
-	public String getName() {
-		return fName;
-	}
-	
-	public String toString() {
-		return fName;
-	}
-}
diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/dtd/schema/Attribute.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/dtd/schema/Attribute.java
deleted file mode 100644
index 60bdab8..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/dtd/schema/Attribute.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2003 Object Factory Inc.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *		Object Factory Inc. - Initial implementation
- *******************************************************************************/
-package org.eclipse.ant.ui.internal.dtd.schema;
-
-import org.eclipse.ant.ui.internal.dtd.*;
-
-/**
- * Attr contains information about a single attribute.
- * @author Bob Foster
- */
-public class Attribute extends Atom implements IAttribute {
-	private String fType;
-	private String[] fEnum;
-	private IElement fElement;
-	private String fDefault;
-	private boolean fFixed;
-	private boolean fRequired;
-	
-	/**
-	 * Constructor.
-	 * @param name Attribute qname.
-	 * @param element Parent element.
-	 */
-	public Attribute(String name, IElement element) {
-		super(ATTRIBUTE, name);
-		fElement = element;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ant.ui.internal.dtd.IAttribute#getType()
-	 */
-	public String getType() {
-		return fType;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ant.ui.internal.dtd.IAttribute#getEnum()
-	 */
-	public String[] getEnum() {
-		return fEnum;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ant.ui.internal.dtd.IAttribute#getElement()
-	 */
-	public IElement getElement() {
-		return fElement;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ant.ui.internal.dtd.IAttribute#getDefault()
-	 */
-	public String getDefault() {
-		return fDefault;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ant.ui.internal.dtd.IAttribute#isFixed()
-	 */
-	public boolean isFixed() {
-		return fFixed;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ant.ui.internal.dtd.IAttribute#isRequired()
-	 */
-	public boolean isRequired() {
-		return fRequired;
-	}
-	
-	public void setType(String type) {
-		fType = type;
-	}
-	
-	/**
-	 * Sets the default value.
-	 * @param defaultValue Value
-	 */
-	public void setDefault(String defaultValue) {
-		fDefault = defaultValue;
-	}
-
-	/**
-	 * Sets the enum.
-	 * @param enum The enum to set
-	 */
-	public void setEnum(String[] enum) {
-		fEnum = enum;
-	}
-
-	/**
-	 * Sets the fixed.
-	 * @param fixed The fixed to set
-	 */
-	public void setFixed(boolean fixed) {
-		fFixed = fixed;
-	}
-
-	/**
-	 * Sets the required.
-	 * @param required The required to set
-	 */
-	public void setRequired(boolean required) {
-		fRequired = required;
-	}
-}
diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/dtd/schema/Dfm.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/dtd/schema/Dfm.java
deleted file mode 100644
index e9cc7aa..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/dtd/schema/Dfm.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2003 Object Factory Inc.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *		Object Factory Inc. - Initial implementation
- *******************************************************************************/
-package org.eclipse.ant.ui.internal.dtd.schema;
-
-import org.eclipse.ant.ui.internal.dtd.IAtom;
-import org.eclipse.ant.ui.internal.dtd.IDfm;
-import org.eclipse.ant.ui.internal.dtd.util.Factory;
-import org.eclipse.ant.ui.internal.dtd.util.FactoryObject;
-import org.eclipse.ant.ui.internal.dtd.util.MapHolder;
-import org.eclipse.ant.ui.internal.dtd.util.SortedMap;
-
-
-/**
- * Deterministic finite state machine.
- * Once constructed DFM is immutable and can be used by multiple threads.
- * A Dfm node is essentially an accepting flag and a hashtable mapping atoms to
- * Dfm nodes. (Almost of com. objfac. dtd. util is aimed at reducing the storage
- * overhead of hundreds of little hashtables.)
- * @author Bob Foster
- */
-public class Dfm extends MapHolder implements IDfm, FactoryObject {
-
-	public boolean accepting;
-	public boolean empty, any;
-	public int id;
-	private static int unique = 0;
-	private static Factory factory = new Factory();
-	private Dfm fNext;
-	
-	public static Dfm dfm(boolean accepting) {
-		Dfm dfm = free();
-		dfm.accepting = accepting;
-		return dfm;
-	}
-
-	protected Dfm() {
-	}
-	
-	private static Dfm free() {
-		Dfm dfm = (Dfm) factory.getFree();
-		if (dfm == null)
-			dfm = new Dfm();
-		dfm.accepting = dfm.empty = dfm.any = false;
-		dfm.id = unique++;
-		return dfm;
-	}
-
-	public static Dfm dfm(IAtom accept, Dfm follow) {
-		Dfm dfm = free();
-		dfm.keys = new Object[1];
-		dfm.keys[0] = accept;
-		dfm.values = new Object[1];
-		dfm.values[0] = follow;
-		return dfm;
-	}
-	
-	public static void free(Dfm dfm) {
-		dfm.setKeys(null);
-		dfm.setValues(null);
-		factory.setFree(dfm);
-	}
-	
-	public boolean isAccepting() {
-		return accepting;
-	}
-	
-	public IDfm advance(String name) {
-		if (any)
-			return this;
-		if (empty)
-			return null;
-		if (keys == null)
-			return null;
-		SortedMap map = getIndirectStringMap(this);
-		Dfm dfm = (Dfm) map.get(name);
-		freeMap(map);
-		return dfm;
-	}
-	
-	public String[] getAccepts() {
-		if (keys == null)
-			return new String[0];
-		String[] s = new String[keys.length];
-		for (int i = 0; i < s.length; i++) {
-			s[i] = keys[i].toString();
-		}
-		return s;
-	}
-
-	public Dfm[] getFollows() {
-		if (values == null)
-			return new Dfm[0];
-		Dfm[] s = new Dfm[values.length];
-		System.arraycopy(values,0,s,0,values.length);
-		return s;
-	}
-
-	public void merge(Dfm other) {
-		accepting |= other.accepting;
-		SortedMap map = getIndirectStringMap(this);
-		SortedMap othermap = getIndirectStringMap(other);
-		map.merge(othermap);
-		freeMap(map);
-		freeMap(othermap);
-	}
-	
-	public SortedMap getMap() {
-		return getIndirectStringMap(this);
-	}
-	
-	/**
-	 * @see com.objfac.util.FactoryObject#next()
-	 */
-	public FactoryObject next() {
-		return fNext;
-	}
-
-	/**
-	 * @see com.objfac.util.FactoryObject#next(FactoryObject)
-	 */
-	public void next(FactoryObject obj) {
-		fNext = (Dfm) obj;
-	}
-
-	/**
-	 * @see com.objfac.xml.schema.IDfm#isAny()
-	 */
-	public boolean isAny() {
-		return any;
-	}
-
-	/**
-	 * @see com.objfac.xml.schema.IDfm#isEmpty()
-	 */
-	public boolean isEmpty() {
-		return empty;
-	}
-
-	/**
-	 * @see com.objfac.xml.schema.IDfm#getAtom(String)
-	 */
-	public IAtom getAtom(String name) {
-		Object[] allKeys = getKeys();
-		if (empty || allKeys == null){
-			return null;
-		}
-		SortedMap map = getIndirectStringMap(this);
-		int index = map.keyIndex(name);
-		if (index < 0) {
-			return null;
-		}
-		return (IAtom) allKeys[index];
-	}
-
-	/**
-	 * @see com.objfac.xml.schema.IDfm#advance(java.lang.String, java.lang.String)
-	 */
-	public IDfm advance(String namespace, String localname) {
-		// no namespace support here
-		return advance(localname);
-	}
-
-}
diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/dtd/schema/Element.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/dtd/schema/Element.java
deleted file mode 100644
index 2f77a88..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/dtd/schema/Element.java
+++ /dev/null
@@ -1,194 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2003 Object Factory Inc.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *		Object Factory Inc. - Initial implementation
- *******************************************************************************/
-package org.eclipse.ant.ui.internal.dtd.schema;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.ant.ui.internal.dtd.IAttribute;
-import org.eclipse.ant.ui.internal.dtd.IDfm;
-import org.eclipse.ant.ui.internal.dtd.IElement;
-import org.eclipse.ant.ui.internal.dtd.IModel;
-import org.eclipse.ant.ui.internal.dtd.ParseError;
-
-public class Element extends Atom implements IElement {
-	private boolean fUndefined = true;
-	private boolean fText;
-	private boolean fMixed;
-	private IModel fModel;
-	private HashMap fMap = new HashMap(4); 
-	private Dfm fElementDfm;
-
-	/**
-	 * Constructor
-	 * @param name QName of element.
-	 */
-	public Element(String name) {
-		super(ELEMENT, name);
-	}
-
-	/**
-	 * Set undefined property.
-	 * @param undefined False if defined; otherwise true (default).
-	 */
-	public void setUndefined(boolean undefined) {
-		fUndefined = undefined;
-	}
-	
-	/**
-	 * Set text property.
-	 * @param text True if text only; otherwise false (default).
-	 */
-	public void setText(boolean text) {
-		fText = text;
-	}
-	
-	/**
-	 * Set mixed property.
-	 * @param mixed True if text plus element content allowed; otherwise false
-	 * (default).
-	 */
-	public void setMixed(boolean mixed) {
-		fMixed = mixed;
-	}
-	
-	/**
-	 * Set model property.
-	 * @param model Dfm describing content model.
-	 */
-	public void setContentModel(IModel model) {
-		fModel = model;
-	}
-	
-	/**
-	 * Add an attribute to the attribute map.
-	 * @param attribute Attribute to add.
-	 */
-	public void addAttribute(IAttribute attribute) {
-		fMap.put(attribute.getName(), attribute);
-	}
-	
-	/**
-	 * @see org.eclipse.ant.ui.internal.dtd.IElement#getAttributes()
-	 */
-	public Map getAttributes() {
-		return fMap;
-	}
-
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ant.ui.internal.dtd.IElement#isMixed()
-	 */
-	public IModel getContentModel() {
-		return fModel;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ant.ui.internal.dtd.IElement#isMixed()
-	 */
-	public boolean isMixed() {
-		return fMixed;
-	}
-	/**
-	 * @see org.eclipse.ant.ui.internal.dtd.IElement#isText()
-	 */
-	public boolean isText() {
-		return fText;
-	}
-
-	/**
-	 * @see org.eclipse.ant.ui.internal.dtd.IElement#isUndefined()
-	 */
-	public boolean isUndefined() {
-		return fUndefined;
-	}
-
-	/**
-	 * @see org.eclipse.ant.ui.internal.dtd.IElement#getDfm()
-	 */
-	public IDfm getDfm() {
-		Dfm dfm = fElementDfm;
-		if (dfm == null) {
-			dfm = parseElementDfm();
-			fElementDfm = dfm;
-		}
-		return dfm;
-	}
-	
-	private Dfm parseElementDfm() {
-		Dfm dfm;
-		if (fAny) {
-			dfm = Dfm.dfm(true);
-			dfm.any = true;
-		}
-		else if (fEmpty || fText) {
-			dfm = Dfm.dfm(true);
-			dfm.empty = true;
-		}
-		else {
-			dfm = parseModel(fModel);
-		}
-		return dfm;
-	}
-	
-	private Dfm parseModel(IModel model) {
-		Dfm dfm;
-		Nfm nfm = model.toNfm();
-		if (nfm != null) {
-			try {
-				dfm = fNfmParser.parse(nfm, true);
-			} catch (ParseError e) {
-				//??? this would be the place to log the error
-				dfm = Dfm.dfm(false);
-			}
-		}
-		else {
-			dfm = Dfm.dfm(false);
-		}
-		return dfm;
-	}
-	
-	private static final NfmParser fNfmParser = new NfmParser();
-	private boolean fAny;
-	private boolean fEmpty;
-
-	/**
-	 * @see org.eclipse.ant.ui.internal.dtd.IElement#isAny()
-	 */
-	public boolean isAny() {
-		return fAny;
-	}
-
-	/**
-	 * @see org.eclipse.ant.ui.internal.dtd.IElement#isEmpty()
-	 */
-	public boolean isEmpty() {
-		return fEmpty;
-	}
-
-	/**
-	 * Sets the any.
-	 * @param any The any to set
-	 */
-	public void setAny(boolean any) {
-		fAny = any;
-	}
-
-	/**
-	 * Sets the empty.
-	 * @param empty The empty to set
-	 */
-	public void setEmpty(boolean empty) {
-		fEmpty = empty;
-	}
-
-}
-
diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/dtd/schema/Model.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/dtd/schema/Model.java
deleted file mode 100644
index 9e42141..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/dtd/schema/Model.java
+++ /dev/null
@@ -1,248 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2003 Object Factory Inc.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *		Object Factory Inc. - Initial implementation
- *******************************************************************************/
-package org.eclipse.ant.ui.internal.dtd.schema;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-
-import org.eclipse.ant.ui.internal.dtd.IAtom;
-import org.eclipse.ant.ui.internal.dtd.IModel;
-
-/**
- * IModel implementation.
- * @author Bob Foster
- */
-public class Model implements IModel {
-	
-	protected int fKind;
-	protected int fMin = 1;
-	protected int fMax = 1;
-	protected int fNum = 0;
-	protected IModel[] fContents;
-	protected List fContentsList;
-	protected IAtom fLeaf;
-	protected boolean fMixed;
-	
-	protected static IModel[] fEmptyContents = new IModel[0];
-	
-	public Model(int kind) {
-		fKind = kind;
-	}
-	
-	public Model() {
-		fKind = UNKNOWN;
-	}
-	
-	public void setKind(int kind) {
-		fKind = kind;
-	}
-	
-	public void setMinOccurs(int min) {
-		fMin = min;
-	}
-	
-	public void setMaxOccurs(int max) {
-		fMax = max;
-	}
-	
-	public void setContents(IModel[] contents) {
-		fContents = contents;
-	}
-	
-	public void addModel(IModel model) {
-		if (fContents != null)
-			throw new IllegalStateException(AntDTDSchemaMessages.getString("Model.model_may_not_be_changed")); //$NON-NLS-1$
-			
-		if (fContentsList == null)
-			fContentsList = new LinkedList();
-			
-		fContentsList.add(model);
-	}
-	
-	public void setLeaf(IAtom leaf) {
-		fLeaf = leaf;
-	}
-
-	protected static final String[] fOps = {"?",",","|","&","!!!"}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
-
-	private Nfm qualifyNfm(Nfm nfm) {
-		if (nfm == null)
-			return null;
-		if (fMin == 1 && fMax == 1)
-			return nfm;
-		if (fMin == 0 && fMax == 1) {
-			return Nfm.getQuestion(nfm);
-		}
-		if (fMin == 0 && fMax == UNBOUNDED) {
-			return Nfm.getStar(nfm);
-		}
-		if (fMin == 1 && fMax == UNBOUNDED) {
-			return Nfm.getPlus(nfm);
-		}
-		//the following cases cannot be reached by DTD models
-		if (fMax == 0)
-			return Nfm.getNfm(null);
-		if (fMax == UNBOUNDED) {
-			return Nfm.getUnbounded(nfm, fMin);
-		}
-		else {
-			return Nfm.getMinMax(nfm, fMin, fMax);
-		}
-	}
-
-	public Model shallowCopy() {
-		Model copy = new Model(getKind());
-		copy.fMixed = fMixed;
-		copy.fLeaf = fLeaf;
-		if (fContents != null) {
-			copy.fContentsList = new LinkedList();
-			for (int i = 0; i < fContents.length; i++) {
-				copy.fContentsList.add(fContents[i]);
-			}
-		}
-		else if (fContentsList != null) {
-			copy.fContentsList = new LinkedList();
-			Iterator it = fContentsList.iterator();
-			while (it.hasNext()) {
-				copy.fContentsList.add(it.next());
-			}
-		}
-		return copy;
-	}
-
-	/**
-	 * @see org.eclipse.ant.ui.internal.dtd.IModel#getKind()
-	 */
-	public int getKind() {
-		return 0;
-	}
-
-	/**
-	 * @see org.eclipse.ant.ui.internal.dtd.IModel#getMinOccurs()
-	 */
-	public int getMinOccurs() {
-		return fMin;
-	}
-
-	/**
-	 * @see org.eclipse.ant.ui.internal.dtd.IModel#getMaxOccurs()
-	 */
-	public int getMaxOccurs() {
-		return fMax;
-	}
-
-	/**
-	 * @see org.eclipse.ant.ui.internal.dtd.IModel#getContents()
-	 */
-	public IModel[] getContents() {
-		// A model contents may be referred to many times
-		// it would be inefficient to convert to array each time
-		if (fContents == null) {
-			if (fContentsList != null) {
-				fContents = (IModel[]) fContentsList.toArray(new IModel[fContentsList.size()]);
-				fContentsList = null;
-			}
-			else
-				fContents = fEmptyContents;
-		}
-		return fContents;
-	}
-
-	/**
-	 * @see org.eclipse.ant.ui.internal.dtd.IModel#getLeaf()
-	 */
-	public IAtom getLeaf() {
-		return fLeaf;
-	}
-
-	/**
-	 * @see org.eclipse.ant.ui.internal.dtd.IModel#getOperator()
-	 */
-	public String getOperator() {
-		return fOps[fKind];
-	}
-
-	/**
-	 * @see org.eclipse.ant.ui.internal.dtd.schema.IModel#stringRep()
-	 */
-	public String stringRep() {
-		StringBuffer buf = new StringBuffer();
-		stringRep(buf);
-		return buf.toString();
-	}
-	
-	private void stringRep(StringBuffer buf) {
-		switch (getKind()) {
-			case IModel.CHOICE:
-			case IModel.SEQUENCE:
-				buf.append('(');
-				Iterator it = fContentsList.iterator();
-				while (it.hasNext()) {
-					Model model = (Model) it.next();
-					model.stringRep(buf);
-					if (it.hasNext())
-						buf.append(getOperator());
-				}
-				buf.append(')');
-				buf.append(getQualifier());
-				break;
-			case IModel.LEAF:
-				IAtom atom = getLeaf();
-				buf.append(atom.getName());
-				break;
-			default:
-				buf.append(AntDTDSchemaMessages.getString("Model.***UNKNOWN***_2")); //$NON-NLS-1$
-				break;
-		}
-	}
-
-	/**
-	 * @see org.eclipse.ant.ui.internal.dtd.IModel#getQualifier()
-	 */
-	public String getQualifier() {
-		return fMin == 1 ? (fMax == UNBOUNDED ? "+" : "") : (fMax == UNBOUNDED ? "*" : "?"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-	}
-	
-	/**
-	 * @see org.eclipse.ant.ui.internal.dtd.IModel#toNfm()
-	 */
-	public Nfm toNfm() {
-		Nfm nfm = null;
-		switch (fKind) {
-			case CHOICE:
-			case SEQUENCE:
-			{
-				IModel[] contents = getContents();
-				if (contents == null || contents.length == 0)
-					nfm = null;
-				else {
-					nfm = contents[0].toNfm();
-					for (int i = 1; i < contents.length; i++) {
-						Nfm tmp = contents[i].toNfm();
-						if (fKind == SEQUENCE) {
-							nfm = Nfm.getComma(nfm, tmp);
-						} else {
-							nfm = Nfm.getOr(nfm, tmp);
-						}
-					}
-				}
-				break;
-			}
-			case LEAF:
-			{
-				nfm = Nfm.getNfm(fLeaf);
-				break;
-			}
-		}
-		return qualifyNfm(nfm);
-	}
-	
-}
diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/dtd/schema/Nfm.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/dtd/schema/Nfm.java
deleted file mode 100644
index a786f9e..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/dtd/schema/Nfm.java
+++ /dev/null
@@ -1,289 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2003 Object Factory Inc.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *		Object Factory Inc. - Initial implementation
- *******************************************************************************/
-package org.eclipse.ant.ui.internal.dtd.schema;
-
-import org.eclipse.ant.ui.internal.dtd.IAtom;
-import org.eclipse.ant.ui.internal.dtd.util.Factory;
-import org.eclipse.ant.ui.internal.dtd.util.FactoryObject;
-
-
-/**
- * Non-deterministic finite state machine.
- * @author Bob Foster
- */
-public class Nfm implements FactoryObject {
-	private NfmNode start;
-	private NfmNode stop;
-	
-	public NfmNode getStart() {
-		return start;
-	}
-	
-	public NfmNode getStop() {
-		return stop;
-	}
-	
-	/**
-	 * Construct an nfm such that:
-	 * <pre>
-	 * start  stop
-	 *   |      |
-	 * +---+  +---+
-	 * | s |->|   |
-	 * +---+  +---+
-	 * </pre>
-	 * In all pictures, boxes are NfmNodes.
-	 */
-	private static Nfm nfm(IAtom s) {
-		Nfm nfm = free();
-		nfm.stop = NfmNode.nfmNode();
-		nfm.start = NfmNode.nfmNode(s, nfm.stop);
-		return nfm;
-	}
-	
-	/**
-	 * Construct an nfm that "wraps" an existing nfm x such that:
-	 * <pre>
-	 * start                            stop
-	 *   |                                |
-	 * +---+  +---------+  +---------+  +---+
-	 * |   |->| x start |  | x stop  |->|   |
-	 * +---+  +---------+  +---------+  +---+
-	 * </pre>
-	 */
-	private static Nfm nfm(Nfm x) {
-		Nfm nfm = free();
-		nfm.start = NfmNode.nfmNode(x.start);
-		nfm.stop = NfmNode.nfmNode();
-		x.stop.next1 = nfm.stop;
-		return nfm;
-	}
-	
-	private static Nfm nfm() {
-		Nfm nfm = free();
-		nfm.start = NfmNode.nfmNode();
-		nfm.stop = NfmNode.nfmNode();
-		return nfm;
-	}
-
-	public static Nfm getNfm(IAtom s) {
-		return nfm(s);
-	}
-	
-	/**
-	 * "Star" an existing nfm x.
-	 * <pre>
-	 * start                            stop
-	 *   |                                |
-	 * +---+  +---------+  +---------+  +---+
-	 * |   |->| x start |  | x stop  |->|   |
-	 * +---+  +---------+  +---------+  +---+
-	 *   |         |            |         |
-	 *   |         +-----<------+         |
-	 *   +------>-------------------------+
-	 * </pre>
-	 * Frees x.
-	 */
-	public static Nfm getStar(Nfm x) {
-		// Make the back link
-		x.stop.next2 = x.start;
-		Nfm tmp = nfm(x);
-		// Make the forward link
-		tmp.start.next2 = tmp.stop;
-		free(x);
-		return tmp;
-	}
-	
-	/**
-	 * "Question" an existing nfm x: x => x?
-	 * <pre>
-	 * start                            stop
-	 *   |                                |
-	 * +---+  +---------+  +---------+  +---+
-	 * |   |->| x start |  | x stop  |->|   |
-	 * +---+  +---------+  +---------+  +---+
-	 *   |                                |
-	 *   +---------------->---------------+
-	 * </pre>
-	 * Frees x.
-	 */
-	public static Nfm getQuestion(Nfm x) {
-		Nfm tmp = nfm(x);
-		// Make the forward link
-		tmp.start.next2 = tmp.stop;
-		free(x);
-		return tmp;
-	}
-
-	/**
-	 * "Plus" an existing nfm x -> x+
-	 * <pre>
-	 * start                            stop
-	 *   |                                |
-	 * +---+  +---------+  +---------+  +---+
-	 * |   |->| x start |  | x stop  |->|   |
-	 * +---+  +---------+  +---------+  +---+
-	 *             |            |
-	 *             +-----<------+
-	 * </pre>
-	 * Frees x.
-	 */
-	public static Nfm getPlus(Nfm x) {
-		// Make the back link
-		x.stop.next2 = x.start;
-		Nfm tmp = nfm(x);
-		free(x);
-		return tmp;
-	}
-	
-	/**
-	 * "Or" two existing nfms x,y -> x|y
-	 * <pre>
-	 * start                            stop
-	 *   |                                |
-	 * +---+  +---------+  +---------+  +---+
-	 * |   |->| x start |  | x stop  |->|   |
-	 * +---+  +---------+  +---------+  +---+
-	 *   |                                |
-	 *   |    +---------+  +---------+    |
-	 *   +--->| y start |  | y stop  |-->-+
-	 *        +---------+  +---------+
-	 * </pre>
-	 * Frees x and y.
-	 */
-	public static Nfm getOr(Nfm x, Nfm y) {
-		Nfm tmp = nfm();
-		tmp.start.next1 = x.start;
-		tmp.start.next2 = y.start;
-		x.stop.next1 = tmp.stop;
-		y.stop.next1 = tmp.stop;
-		free(x);
-		free(y);
-		return tmp;
-	}
-	
-	/**
-	 * "Comma" two existing nfms x,y -> x,y
-	 * 
-	 * <p>Re-uses x so that x.stop is first
-	 * transformed to y.start and then
-	 * x.stop is reset to y.stop.
-	 * This is as efficient as possible.
-	 * <pre>
-	 * x start      former x stop   x stop
-	 *     |               |           |
-	 * +---------+  +----------+  +--------+
-	 * | x start |  | y start  |->| y stop |
-	 * +---------+  +----------+  +--------+
-	 * </pre>
-	 * Frees y, returns x modified.
-	 */
-	public static Nfm getComma(Nfm x, Nfm y) {
-		x.stop.next1 = y.start.next1;
-		x.stop.next2 = y.start.next2;
-		x.stop.symbol = y.start.symbol;
-		x.stop = y.stop;
-		free(y);
-		return x;
-	}
-	
-	/**
-	 * "{min,*}" an existing nfm x -> x[0],x[1],...,x[min-1],x[min]*
-	 * Frees x.
-	 */
-	public static Nfm getUnbounded(Nfm x, int min) {
-		if (min == 0)
-			return getStar(x);
-		if (min == 1)
-			return getPlus(x);
-		Nfm last1 = nfm(x), last2 = nfm(x);
-		for (int i = 2; i < min; i++) {
-			last1 = getComma(last1, last2);
-			free(last2);
-			last2 = nfm(x);
-		}
-		free(x);
-		return getComma(last1, getStar(last2));
-	}
-	
-	/**
-	 * "{min,max}" an existing nfm x -> x[0],x[1],...,x[min-1],x[min]?,...,x[max-1]?
-	 * Frees or returns x.
-	 */
-	public static Nfm getMinMax(Nfm x, int min, int max) {
-		if (max == Integer.MAX_VALUE)
-			return getUnbounded(x, min);
-		if (max == 0) {
-			free(x);
-			return nfm((IAtom)null);
-		}
-		if (max == 1) {
-			if (min == 0)
-				return getQuestion(x);
-			return x;
-		}
-		Nfm last = null;
-		int i = 0;
-		for (; i < min; i++) {
-			if (last == null)
-				last = nfm(x);
-			else {
-				Nfm tmp = nfm(x);
-				last = getComma(last, tmp);
-				free(tmp);
-			}
-		}
-		for (; i < max; i++) {
-			if (last == null)
-				last = getQuestion(x);
-			else {
-				Nfm tmp = getQuestion(x);
-				last = getComma(last, tmp);
-				free(tmp);
-				//??? this is inefficient since the first failure
-				//    in a sequence of x?,x?,...,x? can skip to
-				//    the end rather than keep trying to match x
-			}
-		}
-		free(x);
-		return last;
-	}
-	
-	// Below here is factory stuff
-	
-	/**
-	 * @see com.objfac.util.FactoryObject#next()
-	 */
-	public FactoryObject next() {
-		return fNext;
-	}
-
-	/**
-	 * @see com.objfac.util.FactoryObject#next(FactoryObject)
-	 */
-	public void next(FactoryObject obj) {
-		fNext = (Nfm) obj;
-	}
-	private Nfm fNext;
-	private static Factory fFactory = new Factory();
-	private static Nfm free() {
-		Nfm nfm = (Nfm) fFactory.getFree();
-		if (nfm == null)
-			return new Nfm();
-		return nfm;
-	}
-	public static void free(Nfm nfm) {
-		nfm.start = nfm.stop = null;
-		fFactory.setFree(nfm);
-	}
-	private Nfm() {
-	}
-}
diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/dtd/schema/NfmNode.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/dtd/schema/NfmNode.java
deleted file mode 100644
index 86dcf58..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/dtd/schema/NfmNode.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2003 Object Factory Inc.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *		Object Factory Inc. - Initial implementation
- *******************************************************************************/
-package org.eclipse.ant.ui.internal.dtd.schema;
-
-import org.eclipse.ant.ui.internal.dtd.IAtom;
-import org.eclipse.ant.ui.internal.dtd.util.Factory;
-import org.eclipse.ant.ui.internal.dtd.util.FactoryObject;
-
-/**
- * Non-deterministic finite state machine node.<p>
- * 
- * Following Aho & Ullman, nfm nodes contain two
- * transition links. The graph is constructed so
- * that no node requires more than two links.
- * There are exactly these kinds of nodes:
- * <pre>
- *		Symbol	Next1	Next2	Meaning
- *		  "a"	 fwd	 null	Regexp "a"
- *		  null	 null	 null	Accepting node
- *		  null	 fwd1	 fwd2	Start node of ? and * regexp
- *								fwd2 points to stop node
- *		  null	 fwd	 bkw	Internal node of + and * regexp
- *								fwd points to stop node
- *								bkw points, e.g., in "a*" to start node of "a"
- *		  null	 fwd1	 fwd2	Start node of | regexp, e.g., "a|b",
- *								fwd nodes point to start nodes of "a" and "b".
- *		  null	 fwd	 null	Internal node of |.
- *								fwd points to stop node.
- * </pre>
- * See Nfm for pictures of how nodes are used.
- * @author Bob Foster
- */
-public class NfmNode implements FactoryObject {
-
-	public IAtom symbol;
-	public NfmNode next1;
-	public NfmNode next2;
-	public Dfm dfm;
-	public int mark;
-	
-	private NfmNode() {
-	}
-	
-	public static NfmNode nfmNode(IAtom symbol, NfmNode next) {
-		NfmNode nfm = getFree();
-		nfm.symbol = symbol;
-		nfm.next1 = next;
-		return nfm;
-	}
-	
-	public static NfmNode nfmNode(NfmNode next) {
-		NfmNode nfm = getFree();
-		nfm.next1 = next;
-		return nfm;
-	}
-	
-	public static NfmNode nfmNode() {
-		return getFree();
-	}
-	
-	/**
-	 * Free all NfmNodes in use.
-	 */
-	public static void freeAll() {
-		while (fUsed != null) {
-			FactoryObject nfm = fUsed;
-			fUsed = nfm.next();
-			setFree((NfmNode)nfm);
-		}
-	}
-	
-	// Below here is factory stuff
-	
-	/**
-	 * @see com.objfac.util.FactoryObject#next()
-	 */
-	public FactoryObject next() {
-		return next;
-	}
-
-	/**
-	 * @see com.objfac.util.FactoryObject#next(FactoryObject)
-	 */
-	public void next(FactoryObject obj) {
-		next = (NfmNode) obj;
-	}
-	private NfmNode next;
-	private static Factory fFactory = new Factory();
-	private static FactoryObject fUsed = null;
-	private static NfmNode getFree() {
-		NfmNode nfm = (NfmNode) fFactory.getFree();
-		if (nfm == null)
-			nfm = new NfmNode();
-		nfm.next(fUsed);
-		fUsed = nfm;
-		return nfm;
-	}
-	private static void setFree(NfmNode nfm) {
-		nfm.symbol = null;
-		nfm.next1 = nfm.next2 = null;
-		nfm.dfm = null;
-		nfm.mark = 0;
-		fFactory.setFree(nfm);
-	}
-}
diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/dtd/schema/NfmParser.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/dtd/schema/NfmParser.java
deleted file mode 100644
index 0d0529a..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/dtd/schema/NfmParser.java
+++ /dev/null
@@ -1,356 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2003 Object Factory Inc.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *		Object Factory Inc. - Initial implementation
- *******************************************************************************/
-package org.eclipse.ant.ui.internal.dtd.schema;
-
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.ant.ui.internal.dtd.IAtom;
-import org.eclipse.ant.ui.internal.dtd.ParseError;
-import org.eclipse.ant.ui.internal.dtd.util.SortedMap;
-
-/**
- * NfmParser parses an NFA and returns an equivalent DFA if it can do so in
- * linear time and space (in terms of the original NFA).<p>
- * 
- * As used here, NfmParser is called lazily when someone actually asks for a
- * Dfm. This is for performance reasons. Why go to the work of calculating all
- * those Dfms if nobody ever uses them?
- * 
- * Well-formed errors in content models have already been detected. The only
- * error that can arise in NfmParser is an ambiguity error.
- * 
- * Bruggemann-Klein showed that if an NFA is 1-unambiguous, an epsilon-free NFA
- * constructed from it in linear time is actually a DFA. This is obvious
- * in NfmParser. The algorithm works by removing all ambiguous transitions as
- * the graph is constructed, then proving that the reduced graph is equivalent
- * to the original in time linear in the number of ambiguous transitions.
- * 
- * An effort is made to keep the DFA small, but there is no optimization
- * step, as DFAs are small anyway, with some linear inflation around *.
- * In a pathological case, like the classical (a*,a*,a*,..., a*) the number
- * of transitions in the DFA can be quadratic but this algorithm will not blow
- * up exponentially.
- * 
- * @author Bob Foster
- */
-public class NfmParser {
-	
-	public Dfm parse(Nfm nfm, boolean optimize) throws ParseError {
-		
-		// Parse nfm into dfm
-		
-		Dfm dfm = parseStart(nfm.getStart(), nfm.getStop());
-		
-		// Make list of dfms in graph
-		
-		ArrayList dfms = new ArrayList();
-		collect(dfm, dfms);
-		
-		// Detect accept conflicts
-		
-		HashMap duplicates = new HashMap();
-		detect(dfms, duplicates);
-		
-		// Replace duplicate dfms in graph
-		
-		replace(dfms, duplicates);
-		
-		// Allow nfm memory to be re-used
-		
-		Nfm.free(nfm);
-		NfmNode.freeAll();
-		
-		return dfm;
-	}
-	
-	private void reportError(String name) throws ParseError {
-		throw new ParseError(MessageFormat.format(AntDTDSchemaMessages.getString("NfmParser.Ambiguous"), new String[]{name})); //$NON-NLS-1$
-	}
-
-	public static void collect(Dfm dfm, List dfms) {
-		dfms.add(dfm);
-		collect1(dfm, dfms);
-	}
-	
-	private static void collect1(Dfm dfm, List dfms) {
-		Object[] follows = dfm.getValues();
-		if (follows != null) {
-			for (int i = 0; i < follows.length; i++) {
-				Dfm follow = (Dfm) follows[i];
-				if (!dfms.contains(follow)) {
-					dfms.add(follow);
-					collect1(follow, dfms);
-				}
-			}
-		}
-	}
-
-
-	/**
-	 * Replace duplicate dfms found during conflict resolution.
-	 */
-	private void replace(ArrayList dfms, HashMap removed) {
-		for (int i = 0; i < dfms.size(); i++) {
-			Dfm dfm = (Dfm) dfms.get(i);
-			Object[] follows = dfm.getValues();
-			if (follows != null) {
-				for (int j = 0; j < follows.length; j++) {
-					Dfm replacement, follow = (Dfm) follows[j];
-					while ((replacement = (Dfm) removed.get(follow)) != null)
-						follow = replacement;
-					follows[j] = follow;
-				}
-			}
-		}
-		
-		// release dfms so can be re-used
-		Iterator rit = removed.keySet().iterator();
-		while (rit.hasNext())
-			Dfm.free((Dfm)rit.next());
-	}
-
-
-	/**
-	 * Detect conflicts in each state. Two transitions are a potential conflict
-	 * if they accept the same string value. They are an actual conflict if
-	 * their follow dfms are not identical and they are an actual ambiguity if
-	 * the transition atoms of the follow dfms are not pairwise identical.
-	 * This is derived from the rule of Bruggemann-Klein, which determines
-	 * that (a|a)b is not ambiguous, but both (a,b)|(a,c) and (a,b)|(a,b) are.
-	 * The latter might be surprising, but that's committee work for you.
-	 * If two transitions are not ambiguous, one can be removed without
-	 * affecting the language accepted, and thus we have converted our
-	 * epsilon-free NFA into a DFA. If any two transitions are ambiguous,
-	 * we report an error and our responsibility ends. Note that no transitions
-	 * can be removed until all have been checked; this might disguise the
-	 * ambiguity in, e.g., ((a|a),b,(a|a))*.
-	 */
-	private void detect(ArrayList dfms, HashMap duplicates) throws ParseError {
-		for (Iterator iter = dfms.iterator(); iter.hasNext();) {
-			Dfm dfm = (Dfm) iter.next();
-			
-			Object[] accepts = dfm.getKeys();
-			Object[] follows = dfm.getValues();
-			if (accepts != null) {
-				String last = null;
-				for (int i = 0, lasti = -1; i < accepts.length; i++) {
-					String accept = accepts[i].toString();
-					// accepts strings are interned allowing identity comparison
-					
-					if (last != null && last == accept) {
-						if (follows[i] != follows[lasti])
-							checkConflict(new Conflict(accept, (Dfm)follows[lasti], (Dfm)follows[i]));
-					}
-					else {
-						last = accept;
-						lasti = i;
-					}
-				}
-			}
-		}
-		
-		// once more for removal
-		
-		for (Iterator iter = dfms.iterator(); iter.hasNext();) {
-			Dfm dfm = (Dfm) iter.next();
-			
-			// record conflicts
-			Object[] accepts = dfm.getKeys();
-			Object[] follows = dfm.getValues();
-			boolean remove = false;
-			if (accepts != null) {
-				boolean[] removes = new boolean[accepts.length];
-				String last = null;
-				for (int i = 0, lasti = -1; i < accepts.length; i++) {
-					String accept = accepts[i].toString();
-					
-					if (last != null && last == accept) {
-						remove = true;
-						removes[i] = true;
-						if (follows[i] != follows[lasti]) {
-							Dfm dfmhi = (Dfm) follows[i];
-							Dfm dfmlo = (Dfm) follows[lasti];
-							if (dfmhi.id < dfmlo.id) {
-								Dfm tmp = dfmhi;
-								dfmhi = dfmlo;
-								dfmlo = tmp;
-							}
-							Dfm dup = (Dfm) duplicates.get(dfmhi);
-							if (dup == null || dfmlo.id < dup.id) {
-								duplicates.put(dfmhi, dfmlo);
-							} else {
-								duplicates.put(dfmlo, dup);
-							}
-						}
-					}
-					else {
-						last = accept;
-						lasti = i;
-					}
-				}
-			
-				if (remove) {
-					SortedMap map = dfm.getMap();
-					int i = 0;
-					for (Iterator iterator = map.keyIterator(); iterator.hasNext(); i++) {
-						iterator.next();
-						if (removes[i])
-							iterator.remove();
-					}
-					Dfm.freeMap(map);
-				}
-			}
-		}
-	}
-	
-	/**
-	 * Check conflict and report ambiguity.
-	 * @param conflict Potential ambiguity
-	 */
-	private void checkConflict(Conflict conflict) throws ParseError {
-		if (conflict.dfm1.accepting != conflict.dfm2.accepting) {
-			reportError(conflict.name);
-		}
-		Object[] accept1 = conflict.dfm1.getKeys();
-		Object[] accept2 = conflict.dfm2.getKeys();
-		if ((accept1 == null) != (accept2 == null)) {
-			reportError(conflict.name);
-		}
-		if (accept1 != null) {
-			if (accept1.length != accept2.length) {
-				reportError(conflict.name);
-			}
-			for (int j = 0; j < accept2.length; j++) {
-				if (accept1[j] != accept2[j]) {
-					reportError(conflict.name);
-				}
-			}
-		}
-	}
-
-	/**
-	 * Recursive parse that visits every node reachable from
-	 * the start symbol.
-	 */
-	private Dfm parseStart(NfmNode start, NfmNode accept) {
-		// mark the start node
-		Dfm result = Dfm.dfm(false);
-		start.dfm = result;
-
-		// we can minimize alias dfms by marking all starting transfer links
-		while (start.next1 != null && start.next2 == null && start.symbol == null) {
-			start = start.next1;
-			start.dfm = result;
-		}
-		
-		Dfm parsed = parse(1, start, accept);
-		result.merge(parsed);
-		
-		Dfm.free(parsed);
-		
-		return result;
-	}
-	
-	private void parseNext(int mark, Dfm result, NfmNode start, NfmNode accept) {
-		Dfm parsed = parse(mark+1, start, accept);
-		result.merge(parsed);
-		
-		Dfm.free(parsed);
-	}
-	
-	/**
-	 * Recursive parse that visits every node reachable from
-	 * the start symbol.
-	 */
-	private Dfm parse(int mark, NfmNode start, NfmNode accept) {
-		
-		// eliminate useless recursion (note that accept node has no branches)
-		while (start.next1 != null && start.next2 == null && start.symbol == null)
-			start = start.next1;
-			
-		// if we reached the accept node, return an empty dfm that accepts
-		if (start == accept)
-			return Dfm.dfm(true);
-		
-		// for a symbol, construct a dfm that accepts the symbol
-		if (start.symbol != null) {
-			Dfm nextdfm = null;
-			NfmNode next = start.next1, snext = next;
-			while (snext.dfm == null && snext.next1 != null && snext.next2 == null && snext.symbol == null)
-				snext = snext.next1;
-			if (snext.dfm != null) {
-				for (NfmNode n = next; n != snext; n = n.next1)
-					n.dfm = snext.dfm;
-				nextdfm = snext.dfm;
-			}
-			else {
-				nextdfm = Dfm.dfm(false);
-				snext.dfm = nextdfm;
-				for (NfmNode n = next; n != snext; n = n.next1)
-					n.dfm = nextdfm;
-				parseNext(mark, nextdfm, snext, accept);
-			}
-			Dfm dfm = Dfm.dfm((IAtom)start.symbol, nextdfm);
-			return dfm;
-		}
-		
-		// otherwise, follow both branches and return the combined result
-		Dfm dfm1 = null, dfm2 = null;
-		int saveMark;
-		if (start.next1 != null && start.next1.mark != mark) {
-			saveMark = start.next1.mark;
-			start.next1.mark = mark;
-			dfm1 = parse(mark, start.next1, accept);
-			start.next1.mark = saveMark;
-		}
-		if (start.next2 != null && start.next2.mark != mark) {
-			saveMark = start.next2.mark;
-			start.next2.mark = mark;
-			dfm2 = parse(mark, start.next2, accept);
-			start.next2.mark = saveMark;
-		}
-			
-		if (dfm2 != null) {
-			if (dfm1 != null)
-				dfm1.merge(dfm2);
-			else
-				dfm1 = dfm2;
-		}
-		return dfm1;
-	}
-
-	private static class Conflict {
-		public String name;
-		public Dfm dfm1, dfm2;
-		public Conflict(String name, Dfm dfm1, Dfm dfm2) {
-			this.name = name;
-			this.dfm1 = dfm1;
-			this.dfm2 = dfm2;
-		}
-		public int hashCode() {
-			return dfm1.hashCode() + dfm2.hashCode();
-		}
-		public boolean equals(Object o) {
-			if (o == this)
-				return true;
-			if (!(o instanceof Conflict))
-				return false;
-			Conflict other = (Conflict) o;
-			return (dfm1 == other.dfm1 && dfm2 == other.dfm2)
-				|| (dfm1 == other.dfm2 && dfm2 == other.dfm1);
-		}
-	}
-	
-}
diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/dtd/schema/Schema.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/dtd/schema/Schema.java
deleted file mode 100644
index 9546366..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/dtd/schema/Schema.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2003 Object Factory Inc.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *		Object Factory Inc. - Initial implementation
- *******************************************************************************/
-package org.eclipse.ant.ui.internal.dtd.schema;
-
-import java.util.HashMap;
-
-import org.eclipse.ant.ui.internal.dtd.IElement;
-import org.eclipse.ant.ui.internal.dtd.ISchema;
-
-/**
- * This is a very simple schema suitable for DTDs.
- * Once constructed, a schema is immutable and could be
- * used by multiple threads. However, since in general
- * the schema will reflect the internal DTD subset,
- * re-use for multiple documents is problematic.
- * @author Bob Foster
- */
-public class Schema implements ISchema {
-	private HashMap fElementMap = new HashMap();
-	private Exception fErrorException;
-	/**
-	 * @see org.eclipse.ant.ui.internal.dtd.ISchema#getElement(java.lang.String)
-	 */
-	public IElement getElement(String qname) {
-		return (IElement) fElementMap.get(qname);
-	}
-
-	/**
-	 * @see org.eclipse.ant.ui.internal.dtd.ISchema#getElements()
-	 */
-	public IElement[] getElements() {
-		return (IElement[]) fElementMap.entrySet().toArray(new IElement[fElementMap.entrySet().size()]);
-	}
-	
-	/**
-	 * Add a visible element to the schema.
-	 * @param element Element to add.
-	 */
-	public void addElement(IElement element) {
-		fElementMap.put(element.getName(), element);
-	}
-	
-	/**
-	 * Sets the exception thrown by then parser when the schema was built.
-	 * Note that the exception does not necessarily mean the schema is incomplete.
-	 * 
-	 * @param fErrorException the Exception
-	 */
-	public void setErrorException(Exception e) {
-		fErrorException = e;
-	}
-
-	/**
-	 * @see org.eclipse.ant.ui.internal.dtd.schema.ISchema#getErrorException()
-	 */
-	public Exception getErrorException() {
-		return fErrorException;
-	}
-}
diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/dtd/schema/SchemaFactory.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/dtd/schema/SchemaFactory.java
deleted file mode 100644
index ed41739..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/dtd/schema/SchemaFactory.java
+++ /dev/null
@@ -1,288 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2003 Object Factory Inc.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *		Object Factory Inc. - Initial implementation
- *******************************************************************************/
-package org.eclipse.ant.ui.internal.dtd.schema;
-
-import java.text.MessageFormat;
-import java.util.HashSet;
-import java.util.LinkedList;
-
-import org.eclipse.ant.ui.internal.dtd.IModel;
-import org.eclipse.ant.ui.internal.dtd.ISchema;
-import org.xml.sax.SAXException;
-import org.xml.sax.ext.DeclHandler;
-
-/**
- * SchemaFactory is a SAX DeclHandler that converts DTD ELEMENT and ATTLIST
- * declarations to schema form on the fly. The only two methods available to
- * external users of SchemaFactory are its constructor and
- * <code>getSchema()</code>. The latter returns the schema built by this process
- * and should not be called until the XML parser to which this handler is
- * attached has finished parsing.
- * @author Bob Foster
- */
-public class SchemaFactory implements DeclHandler {
-	// used for parsing models
-	private char[] fBuf;
-	private int fLen;
-	private int fPos;
-	private Element fElement;
-	
-	private Schema fSchema;
-	private static HashSet fTypes = new HashSet();
-	private Exception fErrorException;
-	static {
-		fTypes.add("CDATA"); //$NON-NLS-1$
-		fTypes.add("ID"); //$NON-NLS-1$
-		fTypes.add("IDREF"); //$NON-NLS-1$
-		fTypes.add("IDREFS"); //$NON-NLS-1$
-		fTypes.add("NMTOKEN"); //$NON-NLS-1$
-		fTypes.add("NMTOKENS"); //$NON-NLS-1$
-		fTypes.add("ENTITY"); //$NON-NLS-1$
-		fTypes.add("ENTITIES"); //$NON-NLS-1$
-	}
-	
-	/**
-	 * Constructor.
-	 */
-	public SchemaFactory() {
-		fSchema = new Schema();
-	}
-	
-	/**
-	 * @return ISchema produced from the DeclHandler. The schema is always
-	 * correct, though it may be incomplete if the parse was interrupted due to
-	 * validation or well-formed errors.
-	 */
-	public ISchema getSchema() {
-		fSchema.setErrorException(fErrorException);
-		return fSchema;
-	}
-	
-	/**
-	 * @see org.xml.sax.ext.DeclHandler#attributeDecl(java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String)
-	 */
-	public void attributeDecl(String eName, String aName, String type, String valueDefault, String value) throws SAXException {
-		Element element = getElement(eName);
-		Attribute attr = (Attribute) element.getAttributes().get(aName);
-		if (attr == null) {
-			attr = new Attribute(aName, element);
-			element.addAttribute(attr);
-			
-			String[] enum = null;
-			if (fTypes.contains(type))
-				attr.setType(type);
-			else if (type.startsWith("NOTATION")) //$NON-NLS-1$
-				enum = parseValues(type.substring("NOTATION".length()+1), ','); //$NON-NLS-1$
-			else {
-			    type = stripSurroundingParentheses(type);
-				enum = parseValues(type, '|');
-			}
-			attr.setEnum(enum);
-			
-			attr.setRequired(valueDefault == null || !valueDefault.equals("#IMPLIED")); //$NON-NLS-1$
-			attr.setFixed(valueDefault != null && valueDefault.equals("#FIXED")); //$NON-NLS-1$
-			attr.setDefault(value);
-		}
-	}
-	
-
-    /**
-     * Strips the surrounding parentheses from <code>aString</code>.
-     * <P>
-     * i.e.: (true|false) -> true|false
-     */
-    private String stripSurroundingParentheses(String aString) {
-        if(aString.startsWith("(")) { //$NON-NLS-1$
-            aString = aString.substring(1);
-        }
-        if(aString.endsWith(")")) { //$NON-NLS-1$
-            aString = aString.substring(0, aString.length()-1);
-        }
-        return aString;
-    }
-	
-	
-	/**
-	 * @param eName Element name
-	 * @return Element from schema or new element. Either way
-	 * the element is in the schema upon return.
-	 */
-	private Element getElement(String eName) {
-		Element element = (Element) fSchema.getElement(eName);
-		if (element == null) {
-			element = new Element(eName);
-			fSchema.addElement(element); 
-		}
-		return element;
-	}
-
-	private String[] parseValues(String type, char separator) {
-		int start = 0, pos, len = type.length();
-		LinkedList values = new LinkedList();
-		while (start < len) {
-			pos = type.indexOf(separator, start);
-			if (pos < 0) pos = len;
-			String term = type.substring(start, pos);
-			start = pos + 1;
-			values.add(term);
-		}
-		return (String[]) values.toArray(new String[values.size()]);
-	}
-
-	/**
-	 * @see org.xml.sax.ext.DeclHandler#elementDecl(java.lang.String, java.lang.String)
-	 */
-	public void elementDecl(String name, String model) throws SAXException {
-		Element element = getElement(name);
-		if (!element.isUndefined()) {
-			// if the element has already been defined, this is an error
-			throw new SAXException(MessageFormat.format(AntDTDSchemaMessages.getString("SchemaFactory.Doubly_defined"), new String[]{name})); //$NON-NLS-1$
-		}
-		
-		fElement = element;
-		if (model.equals("ANY")) //$NON-NLS-1$
-			element.setAny(true);
-		else if (model.equals("EMPTY")) //$NON-NLS-1$
-			element.setEmpty(true);
-		else if (model.equals("(#PCDATA)")) //$NON-NLS-1$
-			element.setText(true);
-		else if (model.startsWith("(#PCDATA")) //$NON-NLS-1$
-			element.setMixed(true);
-		else
-			element.setContentModel(parseModel(model));
-	}
-
-	/**
-	 * Convert model string to IModel. The <code>fElement</code>
-	 * variable is an implicit argument to this method, and it
-	 * sets <code>fBuf</code>, <code>fPos</code> and <code>fLen</code> for use
-	 * by other parser methods.
-	 * @param model String from DTD, with parameter entities replaced.
-	 * @return IModel
-	 * @throws SAXException if syntax error detected in model. This is a
-	 * validation error. Since the DTD is usually not read unless the parser is
-	 * validating, we may not ever be handed a bad content model, but we need to
-	 * check them, just the same.
-	 */
-	private IModel parseModel(String model) throws SAXException {
-		fBuf = model.toCharArray();
-		fLen = fBuf.length;
-		if (fBuf[0] != '(') {
-			throw new SAXException(
-				MessageFormat.format(AntDTDSchemaMessages.getString("SchemaFactory.Start_with_left_parenthesis"), new String[]{fElement.getName()})); //$NON-NLS-1$
-		}
-
-		IModel emodel;
-		boolean ortext = model.startsWith("(#PCDATA|"); //$NON-NLS-1$
-		if (ortext) {
-			fPos = "(#PCDATA".length() + 1; //$NON-NLS-1$
-			emodel = scanExpr();
-		}
-		else {
-			fPos = 0;
-			emodel = scanExpr();
-		}
-		return emodel;
-	}
-
-	/**
-	 * Scan a parenthesized expression starting
-	 * from the left parenthesis or leftmost operator.
-	 * @return IModel
-	 */
-	private IModel scanExpr() throws SAXException {
-		// skip opening ( or |
-		fPos++;
-		return scanExpr(scanElement());
-	}
-	
-	/**
-	 * Scan a parenthesized expression with the
-	 * first term in hand.
-	 * @param term The first operand in the expression, pre-scanned.
-	 * @return IModel
-	 * @throws SAXException if errors are detected in the model.
-	 */
-	private IModel scanExpr(IModel term) throws SAXException {
-		checkLen();
-		if (fBuf[fPos] != ')') {
-			char op = fBuf[fPos];
-			if (op != '|' && op != ',') {
-				throw new SAXException(
-					MessageFormat.format(AntDTDSchemaMessages.getString("SchemaFactory.Expecting_operator_or_right_parenthesis"),  //$NON-NLS-1$
-						new String[]{fElement.getName(),String.valueOf(fBuf)}));
-			}
-			Model model = new Model(op == '|' ? IModel.CHOICE : IModel.SEQUENCE);
-			model.addModel(term);
-			term = model;
-			
-			while (fBuf[fPos] == op) {
-				fPos++;
-				IModel next = scanElement();
-				model.addModel(next);
-			}
-			if (fBuf[fPos] != ')') {
-				throw new SAXException(
-						MessageFormat.format(AntDTDSchemaMessages.getString("SchemaFactory.Expecting_operator_or_right_parenthesis"),  //$NON-NLS-1$
-						new String[]{fElement.getName(), String.valueOf(fBuf)}));					
-			}
-			fPos++;
-		}
-		return term;
-	}
-
-	/**
-	 * Scan an element name or a parenthesized sub-expression.
-	 * @return IModel
-	 * @throws SAXException
-	 */
-	private IModel scanElement() throws SAXException {
-		checkLen();
-		if (fBuf[fPos] == '(')
-			return scanExpr();
-		StringBuffer sb = new StringBuffer();
-		while (fBuf[fPos] != '|' && fBuf[fPos] != ',' && fBuf[fPos] != ')'
-		&& fBuf[fPos] != '*' && fBuf[fPos] != '+' && fBuf[fPos] != '?' ) {
-			sb.append(fBuf[fPos++]);
-			checkLen();
-		}
-		String name = sb.toString();
-		Element element = getElement(name);
-		Model model = new Model(IModel.LEAF);
-		model.setLeaf(element);
-		return model;
-	}
-
-	private void checkLen() throws SAXException {
-		if (fPos == fLen) {
-			throw new SAXException(
-				MessageFormat.format(AntDTDSchemaMessages.getString("SchemaFactory.Unexpected_end"),  //$NON-NLS-1$
-					new String[]{fElement.getName(),
-						String.valueOf(fBuf)}));
-		}	
-	}
-
-	/**
-	 * @see org.xml.sax.ext.DeclHandler#externalEntityDecl(java.lang.String, java.lang.String, java.lang.String)
-	 */
-	public void externalEntityDecl(String name, String publicId, String systemId) throws SAXException {
-	}
-
-	/**
-	 * @see org.xml.sax.ext.DeclHandler#internalEntityDecl(java.lang.String, java.lang.String)
-	 */
-	public void internalEntityDecl(String name, String value) throws SAXException {
-	}
-
-	public void setErrorException(Exception e) {
-		fErrorException = e;
-	}
-}
diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/dtd/util/AntDTDUtilMessages.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/dtd/util/AntDTDUtilMessages.java
deleted file mode 100644
index 1fbb3df..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/dtd/util/AntDTDUtilMessages.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.ui.internal.dtd.util;
-
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-public class AntDTDUtilMessages {
-
-	private static final String BUNDLE_NAME = "org.eclipse.ant.ui.internal.dtd.util.AntDTDUtilMessages"; //$NON-NLS-1$
-
-	private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME);
-
-	private AntDTDUtilMessages() {
-	}
-
-	public static String getString(String key) {
-		try {
-			return RESOURCE_BUNDLE.getString(key);
-		} catch (MissingResourceException e) {
-			return '!' + key + '!';
-		}
-	}
-}
diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/dtd/util/AntDTDUtilMessages.properties b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/dtd/util/AntDTDUtilMessages.properties
deleted file mode 100644
index 9f6b4ac..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/dtd/util/AntDTDUtilMessages.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2003 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Common Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/cpl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-SortedMap.next()_called_for_empty_array_1=next() called for empty array
-SortedMap.remove({0})_in_empty_map_2=remove({0}) in empty map
diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/dtd/util/Factory.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/dtd/util/Factory.java
deleted file mode 100644
index bcb09c8..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/dtd/util/Factory.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2003 Object Factory Inc.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *		Object Factory Inc. - Initial implementation
- *******************************************************************************/
-package org.eclipse.ant.ui.internal.dtd.util;
-
-import java.lang.ref.SoftReference;
-
-/**
- * Factory maintains a free list and, with FactoryObject,
- * serves as a basis for factories of all types.
- * Factory should only be subclassed in singleton classes;
- * for static factories, it may be instantiated as
- * a static object.
- * @author Bob Foster
- */
-public class Factory {
-	
-	/**
-	 * Return the first object on the free list
-	 * or null if none.
-	 */
-	public FactoryObject getFree() {
-		Head head = getHead();
-		FactoryObject obj = head.next;
-		if (obj != null) {
-			head.next = obj.next();
-			obj.next(null);
-		}
-		return obj;
-	}
-	
-	/**
-	 * Add an object to the free list.
-	 */
-	public void setFree(FactoryObject obj) {
-		Head head = getHead();
-		obj.next(head.next);
-		head.next = obj;
-	}
-	
-	private Head getHead() {
-		Head head = (Head) free.get();
-		if (head == null) {
-			// head is needed because you can't change
-			// the referent of a SoftReference.
-			// Without head, we would need to create
-			// a new SoftReference each time we remove
-			// a map from the list. With head, getting
-			// a free object only causes memory allocation
-			// when the list has been previously collected.
-			head = new Head();
-			free = new SoftReference(head);
-		}
-		return head;
-	}
-
-	private static class Head {
-		public FactoryObject next;
-	}
-	private SoftReference free = new SoftReference(new Head());
-}
diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/dtd/util/FactoryObject.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/dtd/util/FactoryObject.java
deleted file mode 100644
index a5ed969..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/dtd/util/FactoryObject.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2003 Object Factory Inc.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *		Object Factory Inc. - Initial implementation
- *******************************************************************************/
-package org.eclipse.ant.ui.internal.dtd.util;
-
-/**
- * A FactoryObject must implement a simple linked list.
- * @author Bob Foster
- */
-public interface FactoryObject {
-
-	FactoryObject next();
-	
-	void next(FactoryObject obj);
-}
diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/dtd/util/IKeyHolder.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/dtd/util/IKeyHolder.java
deleted file mode 100644
index 8657076..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/dtd/util/IKeyHolder.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2003 Object Factory Inc.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *		Object Factory Inc. - Initial implementation
- *******************************************************************************/
-package org.eclipse.ant.ui.internal.dtd.util;
-
-/**
- * @author Bob Foster
- */
-public interface IKeyHolder {
-
-	Object[] getKeys();
-	
-	void setKeys(Object[] keys);
-}
diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/dtd/util/IMapHolder.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/dtd/util/IMapHolder.java
deleted file mode 100644
index de6be0f..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/dtd/util/IMapHolder.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2003 Object Factory Inc.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *		Object Factory Inc. - Initial implementation
- *******************************************************************************/
-package org.eclipse.ant.ui.internal.dtd.util;
-
-/**
- * @author Bob Foster
- */
-public interface IMapHolder extends IKeyHolder, IValueHolder {
-
-}
diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/dtd/util/IValueHolder.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/dtd/util/IValueHolder.java
deleted file mode 100644
index 8e008fb..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/dtd/util/IValueHolder.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2003 Object Factory Inc.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *		Object Factory Inc. - Initial implementation
- *******************************************************************************/
-package org.eclipse.ant.ui.internal.dtd.util;
-
-/**
- * @author Bob Foster
- */
-public interface IValueHolder {
-
-	Object[] getValues();
-	
-	void setValues(Object[] values);
-}
diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/dtd/util/MapHolder.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/dtd/util/MapHolder.java
deleted file mode 100644
index da35378..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/dtd/util/MapHolder.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2003 Object Factory Inc.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *		Object Factory Inc. - Initial implementation
- *******************************************************************************/
-package org.eclipse.ant.ui.internal.dtd.util;
-
-/**
- * @author Bob Foster
- */
-public class MapHolder extends SortedMapFactory implements IMapHolder {
-
-	public Object[] keys;
-	public Object[] values;
-	
-	/**
-	 * @see com.objfac.util.IKeyHolder#getKeys()
-	 */
-	public Object[] getKeys() {
-		return keys;
-	}
-
-	/**
-	 * @see com.objfac.util.IKeyHolder#setKeys(Object[])
-	 */
-	public void setKeys(Object[] keys) {
-		this.keys = keys;
-	}
-
-	/**
-	 * @see com.objfac.util.IValueHolder#getValues()
-	 */
-	public Object[] getValues() {
-		return values;
-	}
-
-	/**
-	 * @see com.objfac.util.IValueHolder#setValues(Object[])
-	 */
-	public void setValues(Object[] values) {
-		this.values = values;
-	}
-
-}
diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/dtd/util/SortedMap.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/dtd/util/SortedMap.java
deleted file mode 100644
index 8d48ebf..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/dtd/util/SortedMap.java
+++ /dev/null
@@ -1,268 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2003 Object Factory Inc.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *		Object Factory Inc. - Initial implementation
- *******************************************************************************/
-package org.eclipse.ant.ui.internal.dtd.util;
-
-import java.text.MessageFormat;
-import java.util.Comparator;
-import java.util.Iterator;
-
-/**
- * @author Bob Foster
- */
-public class SortedMap implements FactoryObject {
-
-	private SortedSet fSet;
-	private IMapHolder fHolder;
-	private SortedMap fNext;
-	
-	public SortedMap(IMapHolder holder, Comparator comp) {
-		fHolder = holder;
-		fSet = new SortedSet(holder, comp);
-	}
-	
-	public SortedMap(Comparator comp) {
-		fSet = new SortedSet(comp);
-	}
-	
-	public SortedMap(IMapHolder holder) {
-		fHolder = holder;
-		fSet = new SortedSet(holder);
-	}
-	
-	public SortedMap() {
-		fSet = new SortedSet();
-	}
-	
-	public void setMapHolder(IMapHolder holder) {
-		fHolder = holder;
-		fSet.setKeyHolder(holder);
-	}
-	
-	public void setComparator(Comparator comp) {
-		fSet.setComparator(comp);
-	}
-	
-	public boolean containsKey(Object key) {
-		return fSet.contains(key);
-	}
-	
-	public boolean containsKeyIdentity(Object key) {
-		return fSet.containsIdentity(key);
-	}
-	
-	public Object put(Object key, Object val) {
-		Object[] values = fHolder.getValues();
-		int index = fSet.indexOf(key);
-		Object result = index >= 0 && values != null ? values[index] : null;
-		
-		int i = fSet.internalAdd(key, false);
-		if (i >= 0)
-			internalPut(i, val);
-		return result;
-	}
-	
-	protected void internalPut(int i, Object val) {
-		Object[] values = fHolder.getValues();
-		if (values == null) {
-			values = new Object[1];
-			values[0] = val;
-			return;
-		}
-	
-		Object[] tmp = new Object[values.length+1];
-		System.arraycopy(values,0,tmp,0,i);
-		tmp[i] = val;
-		System.arraycopy(values,i,tmp,i+1,values.length-i);
-		fHolder.setValues(tmp);
-	}
-	
-	public int putAlways(Object key, Object val) {
-		int i = fSet.internalAdd(key, true);
-		internalPut(i, val);
-		return i;
-	}
-	
-	public void append(Object key, Object val) {
-		Object[] values = fHolder.getValues();
-		int len = values != null ? values.length : 0;
-		fSet.internalAdd(len, key);
-		internalPut(len, val);
-	}
-	
-	public Object get(Object key) {
-		Object[] values = fHolder.getValues();
-		if (values == null)
-			return null;
-		int i = fSet.indexOf(key);
-		if (i >= 0)
-			return values[i];
-		return null;
-	}
-	
-	public Object getIdentity(Object key) {
-		Object[] values = fHolder.getValues();
-		if (values == null)
-			return null;
-		int i = fSet.indexOfIdentity(key);
-		if (i >= 0)
-			return values[i];
-		return null;
-	}
-	
-	public Object[] keys() {
-		return fSet.members();
-	}
-	
-	public Object[] values() {
-		Object[] values = fHolder.getValues();
-		if (values == null)
-			return new Object[0];
-		return values;
-	}
-	
-	public Iterator keyIterator() {
-		return new ArrayIterator();
-	}
-
-	public Iterator valueIterator() {
-		return new ArrayIterator();
-	}
-	
-	private class ArrayIterator implements Iterator {
-		private int fIndex;
-		
-		public ArrayIterator() {
-			fIndex = -1;
-		}
-		/**
-		 * @see java.util.Iterator#hasNext()
-		 */
-		public boolean hasNext() {
-			Object[] array = SortedMap.this.fHolder.getKeys();
-			if (array == null)
-				return false;
-			return fIndex + 1 < array.length;
-		}
-
-		/**
-		 * @see java.util.Iterator#next()
-		 */
-		public Object next() {
-			Object[] array = SortedMap.this.fHolder.getKeys();
-			if (array == null)
-				throw new IllegalStateException(AntDTDUtilMessages.getString("SortedMap.next()_called_for_empty_array_1")); //$NON-NLS-1$
-			return array[++fIndex];
-		}
-
-		/**
-		 * @see java.util.Iterator#remove()
-		 */
-		public void remove() {
-			SortedMap.this.remove(fIndex);
-			--fIndex;
-		}
-
-	}
-	
-	public void remove(int i) {
-		Object[] values = fHolder.getValues();
-		if (values == null) {
-			throw new IllegalArgumentException(MessageFormat.format(AntDTDUtilMessages.getString("SortedMap.remove({0})_in_empty_map_2"), new String[]{Integer.toString(i)})); //$NON-NLS-1$
-		}
-		fSet.remove(i);
-		Object[] tmp = new Object[values.length-1];
-		System.arraycopy(values,0,tmp,0,i);
-		System.arraycopy(values,i+1,tmp,i,values.length-i-1);
-		fHolder.setValues(tmp);
-	}
-	
-	public Object remove(Object obj) {
-		Object[] values = fHolder.getValues();
-		if (values == null)
-			return null;
-		int i = fSet.indexOf(obj);
-		if (i >= 0) {
-			Object tmp = values[i];
-			fSet.remove(i);
-			remove(i);
-			return tmp;
-		}
-		return null;
-	}
-	public Object removeIdentity(Object obj) {
-		Object[] values = fHolder.getValues();
-		if (values == null)
-			return null;
-		int i = fSet.indexOfIdentity(obj);
-		if (i >= 0) {
-			Object tmp = values[i];
-			fSet.remove(i);
-			remove(i);
-			return tmp;
-		}
-		return null;
-	}
-
-	public int size() {
-		return fSet.size();
-	}
-	
-	public int keyIndex(Object key) {
-		return fSet.indexOf(key);
-	}
-	
-	public void merge(SortedMap other) {
-		Object[] values = fHolder.getValues();
-		Object[] keys = fHolder.getKeys();
-		Object[] othervalues = other.fHolder.getValues();
-		Object[] otherkeys = other.fHolder.getKeys();
-		if (otherkeys == null)
-			return;
-		if (keys == null) {
-			fHolder.setKeys(otherkeys);
-			fHolder.setValues(othervalues);
-			return;
-		}
-		int ithis = 0, iother = 0, i = 0;
-		int mthis = keys.length, mother = otherkeys.length;
-		Object[] ktmp = new Object[mthis+mother];
-		Object[] vtmp = new Object[mthis+mother];
-		while (ithis < mthis && iother < mother) {
-			int comp = fSet.fComp.compare(keys[ithis], otherkeys[iother]);
-			if (comp <= 0) {
-				vtmp[i] = values[ithis];
-				ktmp[i++] = keys[ithis++];
-			}
-			else {
-				vtmp[i] = othervalues[iother];
-				ktmp[i++] = otherkeys[iother++];
-			}
-		}
-		while (ithis < mthis) {
-			vtmp[i] = values[ithis];
-			ktmp[i++] = keys[ithis++];
-		}
-		while (iother < mother) {
-			vtmp[i] = othervalues[iother];
-			ktmp[i++] = otherkeys[iother++];
-		}
-		fHolder.setKeys(ktmp);
-		fHolder.setValues(vtmp);
-	}
-	
-	public FactoryObject next() {
-		return fNext;
-	}
-	
-	public void next(FactoryObject next) {
-		fNext = (SortedMap) next;
-	}
-}
diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/dtd/util/SortedMapFactory.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/dtd/util/SortedMapFactory.java
deleted file mode 100644
index 28700a1..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/dtd/util/SortedMapFactory.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2003 Object Factory Inc.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *		Object Factory Inc. - Initial implementation
- *******************************************************************************/
-package org.eclipse.ant.ui.internal.dtd.util;
-
-import java.util.Comparator;
-
-/**
- * Can be inherited or used statically.
- * @author Bob Foster
- */
-public class SortedMapFactory {
-	private static class StringComparator implements Comparator {
-		/**
-		 * @see java.util.Comparator#compare(Object, Object)
-		 */
-		public int compare(Object o1, Object o2) {
-			return ((String)o1).compareTo(o2);
-		}
-	}
-	private static class IndirectStringComparator implements Comparator {
-		/**
-		 * @see java.util.Comparator#compare(Object, Object)
-		 */
-		public int compare(Object o1, Object o2) {
-			return o1.toString().compareTo(o2.toString());
-		}
-	}
-	private static final StringComparator fStringComp = new StringComparator();
-	private static final IndirectStringComparator fIndirectStringComp = new IndirectStringComparator();
-	private static final Factory fFactory = new Factory();
-
-	public static SortedMap getMap(IMapHolder holder, Comparator comp) {
-		SortedMap map = (SortedMap) fFactory.getFree();
-		if (map == null)
-			map = new SortedMap();
-		map.setMapHolder(holder);
-		map.setComparator(comp);
-		return map;
-	}
-	
-	public static SortedMap getStringMap(IMapHolder holder) {
-		return getMap(holder, fStringComp);
-	}
-	
-	public static SortedMap getIndirectStringMap(IMapHolder holder) {
-		return getMap(holder, fIndirectStringComp);
-	}
-	
-	public static SortedMap getCaseInsensitiveStringMap(IMapHolder holder) {
-		return getMap(holder, String.CASE_INSENSITIVE_ORDER);
-	}
-	
-	public static void freeMap(SortedMap map) {
-		map.setComparator(null);
-		map.setMapHolder(null);
-		fFactory.setFree(map);
-	}
-}
diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/dtd/util/SortedSet.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/dtd/util/SortedSet.java
deleted file mode 100644
index 586d7b0..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/dtd/util/SortedSet.java
+++ /dev/null
@@ -1,262 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2003 Object Factory Inc.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *		Object Factory Inc. - Initial implementation
- *******************************************************************************/
-package org.eclipse.ant.ui.internal.dtd.util;
-
-import java.util.Comparator;
-
-/**
- * SortedSet is a flyweight set implementation that uses
- * an external array provided by a KeyHolder.
- * SortedSet provides both equality/comparison operations
- * and identity operations.
- * @author Bob Foster
- */
-public class SortedSet {
-	protected Comparator fComp;
-	protected IKeyHolder fKeyHolder;
-	protected SortedSet fNext;
-	
-	public SortedSet(IKeyHolder holder, Comparator comp) {
-		fComp = comp;
-		fKeyHolder = holder;
-	}
-	/**
-	 * Constructor. A keyholder must be
-	 * supplied by <code>setKeyHolder()</code> prior ot
-	 * <i>any</i> operations.
-	 */
-	public SortedSet(Comparator comp) {
-		fComp = comp;
-	}
-	/**
-	 * Constructor, no comparator. Only identity operations
-	 * may be performed in this set.
-	 */
-	public SortedSet(IKeyHolder holder) {
-		fKeyHolder = holder;
-	}
-	/**
-	 * Constructor, no comparator. Only identity operations
-	 * may be performed in this set. A keyholder must be
-	 * supplied by <code>setKeyHolder()</code> prior ot
-	 * <i>any</i> operations.
-	 */
-	public SortedSet() {
-	}
-	public void setKeyHolder(IKeyHolder holder) {
-		fKeyHolder = holder;
-	}
-	public void setComparator(Comparator comp) {
-		fComp = comp;
-	}
-	/**
-	 * Add to set (no duplicates allowed).
-	 * @param obj Object to add
-	 * @return true if object was added; false
-	 * if object was already in the set.
-	 */
-	public boolean add(Object obj) {
-		return internalAdd(obj, false) >= 0;
-	}
-	protected int internalAdd(Object obj, boolean always) {
-		Object[] array = fKeyHolder.getKeys();
-		if (array == null) {
-			array = new Object[1];
-			fKeyHolder.setKeys(array);
-			array[0] = obj;
-			return 0;
-		}
-		else {
-			int i = 0;
-			int comp = -1;
-			
-			for (; i < array.length; i++) {
-				if ((comp = fComp.compare(obj, array[i])) <= 0) {
-					break;
-				}
-			}
-			if (comp == 0 && !always)
-				return -1;
-			internalAdd(i, obj);
-			return i;
-		}
-	}
-	protected void internalAdd(int i, Object obj) {
-		Object[] array = fKeyHolder.getKeys();
-		if (array == null) {
-			array = new Object[1];
-			array[0] = obj;
-			fKeyHolder.setKeys(array);
-		}
-		else {
-			Object[] tmp = new Object[array.length+1];
-			System.arraycopy(array,0,tmp,0,i);
-			tmp[i] = obj;
-			System.arraycopy(array,i,tmp,i+1,array.length-i);
-			fKeyHolder.setKeys(tmp);
-		}
-	}
-	/**
-	 * Add allowing duplicates.
-	 * @param obj Object to add
-	 * @return index where object was added in sorted order.
-	 */
-	public int addAlways(Object obj) {
-		return internalAdd(obj, true);
-	}
-	/**
-	 * Append, a variant of add allowing duplicates that
-	 * always puts the new member at the end of the set.
-	 * Set can be used with identity operations only.
-	 */
-	public void append(Object obj) {
-		Object[] array = fKeyHolder.getKeys();
-		int len = array != null ? array.length : 0;
-		internalAdd(len, obj);
-	}
-	public boolean contains(Object obj) {
-		return indexOf(obj) >= 0;
-	}
-	public int indexOf(Object obj) {
-		Object[] array = fKeyHolder.getKeys();
-		if (array == null)
-			return -1;
-		for (int i = 0; i < array.length; i++) {
-			int comp = fComp.compare(obj, array[i]);
-			if (comp == 0)
-				return i;
-			if (comp < 0)
-				return -1;
-		}
-		return -1;
-	}
-	public boolean containsIdentity(Object obj) {
-		return indexOf(obj) >= 0;
-	}
-	public int indexOfIdentity(Object obj) {
-		Object[] array = fKeyHolder.getKeys();
-		if (array == null)
-			return -1;
-		for (int i = 0; i < array.length; i++) {
-			if (obj == array[i])
-				return i;
-		}
-		return -1;
-	}
-	public boolean equals(Object o) {
-		if (this == o)
-			return true;
-		if (!(o instanceof SortedSet))
-			return false;
-		SortedSet other = (SortedSet) o;
-		Object[] array = fKeyHolder.getKeys();
-		Object[] otherarray = other.fKeyHolder.getKeys();
-		if ((array == null) != (otherarray == null))
-			return false;
-		if (array == null)
-			return true;
-		if (array.length != otherarray.length)
-			return false;
-		for (int i = 0; i < array.length; i++) {
-			if (array[i] != otherarray[i])
-				return false;
-		}
-		return true;
-	}
-	public boolean equalsIdentify(Object o) {
-		if (this == o)
-			return true;
-		if (!(o instanceof SortedSet))
-			return false;
-		SortedSet other = (SortedSet) o;
-		Object[] array = fKeyHolder.getKeys();
-		Object[] otherarray = other.fKeyHolder.getKeys();
-		if ((array == null) != (otherarray == null))
-			return false;
-		if (array == null)
-			return true;
-		if (array.length != otherarray.length)
-			return false;
-		for (int i = 0; i < array.length; i++) {
-			if (fComp.compare(array[i], otherarray[i]) != 0)
-				return false;
-		}
-		return true;
-	}
-	public void merge(SortedSet other) {
-		Object[] array = fKeyHolder.getKeys();
-		Object[] otherarray = other.fKeyHolder.getKeys();
-		if (otherarray == null)
-			return;
-		if (array == null) {
-			array = otherarray;
-			return;
-		}
-		int ithis = 0, iother = 0, i = 0;
-		int mthis = array.length, mother = otherarray.length;
-		Object[] tmp = new Object[mthis+mother];
-		while (ithis < mthis && iother < mother) {
-			int comp = fComp.compare(array[ithis], otherarray[iother]);
-			if (comp <= 0) {
-				tmp[i++] = array[ithis++];
-			}
-			else {
-				tmp[i++] = otherarray[iother++];
-			}
-		}
-		while (ithis < mthis) {
-			tmp[i++] = array[ithis++];
-		}
-		while (iother < mother) {
-			tmp[i++] = otherarray[iother++];
-		}
-	}
-	public Object[] members() {
-		Object[] array = fKeyHolder.getKeys();
-		if (array == null)
-			return new Object[0];
-		return array;
-	}
-	public int size() {
-		Object[] array = fKeyHolder.getKeys();
-		return array == null ? 0 : array.length;
-	}
-	public void remove(int i) {
-		Object[] array = fKeyHolder.getKeys();
-		Object[] tmp = new Object[array.length-1];
-		System.arraycopy(array,0,tmp,0,i);
-		System.arraycopy(array,i+1,tmp,i,array.length-i-1);
-		fKeyHolder.setKeys(tmp);
-	}
-	public boolean remove(Object obj) {
-		int i = indexOf(obj);
-		if (i >= 0) {
-			remove(i);
-			return true;
-		}
-		return false;
-	}
-	public boolean removeIdentity(Object obj) {
-		int i = indexOfIdentity(obj);
-		if (i >= 0) {
-			remove(i);
-			return true;
-		}
-		return false;
-	}
-	public SortedSet getNextSet() {
-		return fNext;
-	}
-	public void setNextSet(SortedSet next) {
-		fNext = next;
-	}
-
-}
diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/AntEditor.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/AntEditor.java
deleted file mode 100644
index efaf64a..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/AntEditor.java
+++ /dev/null
@@ -1,375 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2003 GEBIT Gesellschaft fuer EDV-Beratung
- * und Informatik-Technologien mbH, 
- * Berlin, Duesseldorf, Frankfurt (Germany) and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     GEBIT Gesellschaft fuer EDV-Beratung und Informatik-Technologien mbH - initial API and implementation
- * 	   IBM Corporation - bug fixes
- *******************************************************************************/
-
-package org.eclipse.ant.ui.internal.editor;
-
-import java.util.ResourceBundle;
-
-import org.eclipse.ant.ui.internal.editor.outline.AntEditorContentOutlinePage;
-import org.eclipse.ant.ui.internal.editor.outline.AntModel;
-import org.eclipse.ant.ui.internal.editor.outline.XMLCore;
-import org.eclipse.ant.ui.internal.editor.text.AnnotationAccess;
-import org.eclipse.ant.ui.internal.editor.text.AnnotationType;
-import org.eclipse.ant.ui.internal.editor.text.AntEditorDocumentProvider;
-import org.eclipse.ant.ui.internal.editor.text.IAntEditorColorConstants;
-import org.eclipse.ant.ui.internal.editor.xml.IAntEditorConstants;
-import org.eclipse.ant.ui.internal.editor.xml.XmlAttribute;
-import org.eclipse.ant.ui.internal.editor.xml.XmlElement;
-import org.eclipse.ant.ui.internal.model.AntUIPlugin;
-import org.eclipse.ant.ui.internal.model.ColorManager;
-import org.eclipse.ant.ui.internal.model.IAntUIHelpContextIds;
-import org.eclipse.ant.ui.internal.preferences.AntEditorPreferenceConstants;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.text.source.IAnnotationAccess;
-import org.eclipse.jface.text.source.ISharedTextColors;
-import org.eclipse.jface.text.source.ISourceViewer;
-import org.eclipse.jface.text.source.IVerticalRuler;
-import org.eclipse.jface.text.source.OverviewRuler;
-import org.eclipse.jface.text.source.SourceViewer;
-import org.eclipse.jface.util.PropertyChangeEvent;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.swt.custom.StyledText;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IPartService;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.editors.text.TextEditor;
-import org.eclipse.ui.help.WorkbenchHelp;
-import org.eclipse.ui.texteditor.ContentAssistAction;
-import org.eclipse.ui.texteditor.DefaultRangeIndicator;
-import org.eclipse.ui.texteditor.IDocumentProvider;
-import org.eclipse.ui.texteditor.ITextEditorActionDefinitionIds;
-import org.eclipse.ui.texteditor.SourceViewerDecorationSupport;
-import org.eclipse.ui.views.contentoutline.IContentOutlinePage;
-
-/**
- * The actual editor implementation for Eclipse's Ant integration.
- * 
- * @author Alf Schiefelbein
- */
-public class AntEditor extends TextEditor {
-
-	/**
-	 * The tab width
-	 */
-	public static final int TAB_WIDTH = 4;
-
-	/**
-	 * Selection changed listener for the outline view.
-	 */
-    protected SelectionChangedListener selectionChangedListener = new SelectionChangedListener();
-    class SelectionChangedListener  implements ISelectionChangedListener {
-        public void selectionChanged(SelectionChangedEvent event) {
-            doSelectionChanged(event);
-        }
-    };
-    
-
-    /**
-     * The page that shows the outline.
-     */
-    protected AntEditorContentOutlinePage page;
-
-
-    /**
-     * Constructor for AntEditor.
-     */
-    public AntEditor() {
-        super();
-		setDocumentProvider(new AntEditorDocumentProvider(XMLCore.getDefault()));
-		setPreferenceStore(AntUIPlugin.getDefault().getPreferenceStore());
-    }
-
-
-    /** The <code>AntEditor</code> implementation of this 
-     * <code>AbstractTextEditor</code> method extend the 
-     * actions to add those specific to the receiver
-     */
-    protected void createActions() {
-        super.createActions();
-
-        ContentAssistAction action = new ContentAssistAction(ResourceBundle.getBundle("org.eclipse.ant.ui.internal.editor.AntEditorMessages"), "ContentAssistProposal.", this); //$NON-NLS-1$ //$NON-NLS-2$
-
-        // This action definition is associated with the accelerator Ctrl+Space
-        action.setActionDefinitionId(ITextEditorActionDefinitionIds.CONTENT_ASSIST_PROPOSALS);
-        setAction("ContentAssistProposal", action); //$NON-NLS-1$
-    }
-
-    public void initializeEditor() {
-        // That is where the assistant and its processor is defined
-		setSourceViewerConfiguration(new AntEditorSourceViewerConfiguration(this));
-		setRangeIndicator(new DefaultRangeIndicator());
-		setCompatibilityMode(false);
-    }
-   
-	/* (non-Javadoc)
-     * Method declared on IAdaptable
-     */
-    public Object getAdapter(Class key) {
-        if (key.equals(IContentOutlinePage.class)) {
-			return getOutlinePage();
-        }
-        return super.getAdapter(key);
-    }
-
-	private AntEditorContentOutlinePage getOutlinePage() {
-		if (page == null) {
-			page= new AntEditorContentOutlinePage(XMLCore.getDefault());
-			page.addPostSelectionChangedListener(selectionChangedListener);
-			setOutlinePageInput(getEditorInput());
-		}
-		return page;
-	}
-
-    private void doSelectionChanged(SelectionChangedEvent aSelectionChangedEvent) {
-        IStructuredSelection selection= (IStructuredSelection)aSelectionChangedEvent.getSelection();
-
-        if (!isActivePart() && AntUIPlugin.getActivePage() != null) {
-			AntUIPlugin.getActivePage().bringToTop(this);
-        }
-        
-        /*
-         * Here the according ISourceReference should be determined and
-         * then passed to setSelection.
-         */
-        XmlElement tempSelectedXmlElement = (XmlElement)selection.getFirstElement(); 
-        if(tempSelectedXmlElement != null) {
-			setSelection(tempSelectedXmlElement, !isActivePart());
-        }
-    }
-
-    /**
-     * Returns wether the editor is active.
-     */
-    private boolean isActivePart() {
-        IWorkbenchWindow window= getSite().getWorkbenchWindow();
-        IPartService service= window.getPartService();
-        IWorkbenchPart part= service.getActivePart();
-        return part != null && part.equals(this);
-    }
-    
-    protected void setSelection(XmlElement reference, boolean moveCursor) {
-        if (reference != null) {
-        	if (reference.isExternal()) {
-        		while (!reference.isRootExternal() || (reference.getParentNode() != null && reference.getParentNode().isExternal())) {
-					//no possible selection for this external element
-					//find the root external entity actually in the document
-        			reference= reference.getParentNode();
-        		}
-        	}
-            
-            StyledText  textWidget= null;
-            
-            ISourceViewer sourceViewer= getSourceViewer();
-            if (sourceViewer != null) {
-                textWidget= sourceViewer.getTextWidget();
-            }
-            
-            if (textWidget == null) {
-                return;
-            }
-                
-            try {
-                
-                int offset= reference.getOffset();
-                int length= reference.getLength();
-                
-                if (offset < 0) {
-                    return;
-                }
-                    
-                textWidget.setRedraw(false);
-                
-                if(length > 0) {
-	                setHighlightRange(offset, length, moveCursor);
-                }
-                
-                if (!moveCursor) {
-                    return;
-                }
-
-				XmlAttribute attrType= reference.getAttributeNamed(IAntEditorConstants.ATTR_TYPE);
-				if (!reference.isErrorNode() ||
-					 (attrType != null &&
-					  IAntEditorConstants.TYPE_PROJECT.equalsIgnoreCase(attrType.getValue()))) {
-					//NOTE: type is checked because isErrorNode() is true for an error node *and*
-					// the root node, which - in this case - should be handled as an normal node  
-	                offset= reference.getOffset()+1;
-	                length= reference.getName().length();
-				}
-                                            
-                if (offset > -1 && length > 0) {
-                    sourceViewer.revealRange(offset, length);
-                    // Selected region begins one index after offset
-                    sourceViewer.setSelectedRange(offset, length); 
-                }
-            } catch (IllegalArgumentException x) {
-            	AntUIPlugin.log(x);
-            } finally {
-                if (textWidget != null) {
-                    textWidget.setRedraw(true);
-                }
-            }
-            
-        } else if (moveCursor) {
-            resetHighlightRange();
-        }
-    }
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.texteditor.AbstractTextEditor#affectsTextPresentation(org.eclipse.jface.util.PropertyChangeEvent)
-	 */
-	protected boolean affectsTextPresentation(PropertyChangeEvent event) {
-		String property= event.getProperty();
-		return property.equals(IAntEditorColorConstants.P_DEFAULT) ||
-		property.equals(IAntEditorColorConstants.P_PROC_INSTR) ||
-		property.equals(IAntEditorColorConstants.P_STRING) ||
-		property.equals(IAntEditorColorConstants.P_TAG) ||
-		property.equals(IAntEditorColorConstants.P_XML_COMMENT);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.texteditor.AbstractTextEditor#handlePreferenceStoreChanged(org.eclipse.jface.util.PropertyChangeEvent)
-	 */
-	protected void handlePreferenceStoreChanged(PropertyChangeEvent event) {
-		AntEditorSourceViewerConfiguration sourceViewerConfiguration= (AntEditorSourceViewerConfiguration)getSourceViewerConfiguration();
-		if (affectsTextPresentation(event)) {
-			sourceViewerConfiguration.updateScanners();
-		}
-		
-		sourceViewerConfiguration.changeConfiguration(event);
-							
-		super.handlePreferenceStoreChanged(event);
-	}
-	
-	/*
-	 * @see org.eclipse.ui.editors.text.TextEditor#doSetInput(org.eclipse.ui.IEditorInput)
-	 */
-	protected void doSetInput(IEditorInput input) throws CoreException {
-		super.doSetInput(input);
-		setOutlinePageInput(input);
-	}
-
-	private void setOutlinePageInput(IEditorInput input) {
-		if (page != null) {
-			IDocumentProvider provider= getDocumentProvider();
-			if (provider instanceof AntEditorDocumentProvider) {
-				AntEditorDocumentProvider documentProvider= (AntEditorDocumentProvider) provider;
-				AntModel model= documentProvider.getAntModel(input);
-				page.setPageInput(model);
-			}
-		}
-	}
-	
-	/** Preference key for showing the line number ruler */
-	//private final static String LINE_NUMBER_RULER= AntEditorPreferenceConstants.EDITOR_LINE_NUMBER_RULER;
-	/** Preference key for the foreground color of the line numbers */
-	//private final static String LINE_NUMBER_COLOR= AntEditorPreferenceConstants.EDITOR_LINE_NUMBER_RULER_COLOR;
-	/** Preference key for showing the overview ruler */
-	//private final static String OVERVIEW_RULER= AntEditorPreferenceConstants.EDITOR_OVERVIEW_RULER;
-	/** Preference key for error indication in overview ruler */
-	private final static String ERROR_INDICATION_IN_OVERVIEW_RULER= AntEditorPreferenceConstants.EDITOR_ERROR_INDICATION_IN_OVERVIEW_RULER;
-	/** Preference key for warning indication in overview ruler */
-	private final static String WARNING_INDICATION_IN_OVERVIEW_RULER= AntEditorPreferenceConstants.EDITOR_WARNING_INDICATION_IN_OVERVIEW_RULER;
-	/** Preference key for info indication in overview ruler */
-	private final static String INFO_INDICATION_IN_OVERVIEW_RULER= AntEditorPreferenceConstants.EDITOR_INFO_INDICATION_IN_OVERVIEW_RULER;
-	/** Preference key for task indication in overview ruler */
-	private final static String TASK_INDICATION_IN_OVERVIEW_RULER= AntEditorPreferenceConstants.EDITOR_TASK_INDICATION_IN_OVERVIEW_RULER;
-	/** Preference key for bookmark indication in overview ruler */
-	private final static String BOOKMARK_INDICATION_IN_OVERVIEW_RULER= AntEditorPreferenceConstants.EDITOR_BOOKMARK_INDICATION_IN_OVERVIEW_RULER;
-	/** Preference key for search result indication in overview ruler */
-	private final static String SEARCH_RESULT_INDICATION_IN_OVERVIEW_RULER= AntEditorPreferenceConstants.EDITOR_SEARCH_RESULT_INDICATION_IN_OVERVIEW_RULER;
-	/** Preference key for unknown annotation indication in overview ruler */
-	private final static String UNKNOWN_INDICATION_IN_OVERVIEW_RULER= AntEditorPreferenceConstants.EDITOR_UNKNOWN_INDICATION_IN_OVERVIEW_RULER;
-
-	/** Preference key for error indication */
-	private final static String ERROR_INDICATION= AntEditorPreferenceConstants.EDITOR_PROBLEM_INDICATION;
-	/** Preference key for error color */
-	private final static String ERROR_INDICATION_COLOR= AntEditorPreferenceConstants.EDITOR_PROBLEM_INDICATION_COLOR;
-	/** Preference key for warning indication */
-	private final static String WARNING_INDICATION= AntEditorPreferenceConstants.EDITOR_WARNING_INDICATION;
-	/** Preference key for warning color */
-	private final static String WARNING_INDICATION_COLOR= AntEditorPreferenceConstants.EDITOR_WARNING_INDICATION_COLOR;
-	/** Preference key for info indication */
-	private final static String INFO_INDICATION= AntEditorPreferenceConstants.EDITOR_INFO_INDICATION;
-	/** Preference key for info color */
-	private final static String INFO_INDICATION_COLOR= AntEditorPreferenceConstants.EDITOR_INFO_INDICATION_COLOR;
-	/** Preference key for task indication */
-	private final static String TASK_INDICATION= AntEditorPreferenceConstants.EDITOR_TASK_INDICATION;
-	/** Preference key for task color */
-	private final static String TASK_INDICATION_COLOR= AntEditorPreferenceConstants.EDITOR_TASK_INDICATION_COLOR;
-	/** Preference key for bookmark indication */
-	private final static String BOOKMARK_INDICATION= AntEditorPreferenceConstants.EDITOR_BOOKMARK_INDICATION;
-	/** Preference key for bookmark color */
-	private final static String BOOKMARK_INDICATION_COLOR= AntEditorPreferenceConstants.EDITOR_BOOKMARK_INDICATION_COLOR;
-	/** Preference key for search result indication */
-	private final static String SEARCH_RESULT_INDICATION= AntEditorPreferenceConstants.EDITOR_SEARCH_RESULT_INDICATION;
-	/** Preference key for search result color */
-	private final static String SEARCH_RESULT_INDICATION_COLOR= AntEditorPreferenceConstants.EDITOR_SEARCH_RESULT_INDICATION_COLOR;
-	/** Preference key for unknown annotation indication */
-	private final static String UNKNOWN_INDICATION= AntEditorPreferenceConstants.EDITOR_UNKNOWN_INDICATION;
-	/** Preference key for unknown annotation color */
-	private final static String UNKNOWN_INDICATION_COLOR= AntEditorPreferenceConstants.EDITOR_UNKNOWN_INDICATION_COLOR;
-
-	/** Preference key for highlighting current line */
-	private final static String CURRENT_LINE= AntEditorPreferenceConstants.EDITOR_CURRENT_LINE;
-	/** Preference key for highlight color of current line */
-	private final static String CURRENT_LINE_COLOR= AntEditorPreferenceConstants.EDITOR_CURRENT_LINE_COLOR;
-	/** Preference key for showing print marging ruler */
-	private final static String PRINT_MARGIN= AntEditorPreferenceConstants.EDITOR_PRINT_MARGIN;
-	/** Preference key for print margin ruler color */
-	private final static String PRINT_MARGIN_COLOR= AntEditorPreferenceConstants.EDITOR_PRINT_MARGIN_COLOR;
-	/** Preference key for print margin ruler column */
-	private final static String PRINT_MARGIN_COLUMN= AntEditorPreferenceConstants.EDITOR_PRINT_MARGIN_COLUMN;
-
-	/*
-	 * @see org.eclipse.ui.texteditor.AbstractTextEditor#createSourceViewer(org.eclipse.swt.widgets.Composite, org.eclipse.jface.text.source.IVerticalRuler, int)
-	 */
-	protected ISourceViewer createSourceViewer(Composite parent, IVerticalRuler ruler, int styles) {
-		fAnnotationAccess= createAnnotationAccess();
-		ISharedTextColors sharedColors= ColorManager.getDefault();
-		fOverviewRuler= new OverviewRuler(fAnnotationAccess, VERTICAL_RULER_WIDTH, sharedColors);
-		fOverviewRuler.addHeaderAnnotationType(AnnotationType.WARNING);
-		fOverviewRuler.addHeaderAnnotationType(AnnotationType.ERROR);
-		
-		ISourceViewer sourceViewer= new SourceViewer(parent, ruler, fOverviewRuler, isOverviewRulerVisible(), styles);
-		fSourceViewerDecorationSupport= new SourceViewerDecorationSupport(sourceViewer, fOverviewRuler, fAnnotationAccess, sharedColors);
-		configureSourceViewerDecorationSupport();
-		WorkbenchHelp.setHelp(sourceViewer.getTextWidget(), IAntUIHelpContextIds.ANT_EDITOR);
-		return sourceViewer;
-	}
-
-	protected IAnnotationAccess createAnnotationAccess() {
-		return new AnnotationAccess();
-	}
-
-	protected void configureSourceViewerDecorationSupport() {
-		
-		fSourceViewerDecorationSupport.setAnnotationPainterPreferenceKeys(AnnotationType.UNKNOWN, UNKNOWN_INDICATION_COLOR, UNKNOWN_INDICATION, UNKNOWN_INDICATION_IN_OVERVIEW_RULER, 0);
-		fSourceViewerDecorationSupport.setAnnotationPainterPreferenceKeys(AnnotationType.BOOKMARK, BOOKMARK_INDICATION_COLOR, BOOKMARK_INDICATION, BOOKMARK_INDICATION_IN_OVERVIEW_RULER, 1);
-		fSourceViewerDecorationSupport.setAnnotationPainterPreferenceKeys(AnnotationType.TASK, TASK_INDICATION_COLOR, TASK_INDICATION, TASK_INDICATION_IN_OVERVIEW_RULER, 2);
-		fSourceViewerDecorationSupport.setAnnotationPainterPreferenceKeys(AnnotationType.SEARCH, SEARCH_RESULT_INDICATION_COLOR, SEARCH_RESULT_INDICATION, SEARCH_RESULT_INDICATION_IN_OVERVIEW_RULER, 3);
-		fSourceViewerDecorationSupport.setAnnotationPainterPreferenceKeys(AnnotationType.INFO, INFO_INDICATION_COLOR, INFO_INDICATION, INFO_INDICATION_IN_OVERVIEW_RULER, 4);
-		fSourceViewerDecorationSupport.setAnnotationPainterPreferenceKeys(AnnotationType.WARNING, WARNING_INDICATION_COLOR, WARNING_INDICATION, WARNING_INDICATION_IN_OVERVIEW_RULER, 5);
-		fSourceViewerDecorationSupport.setAnnotationPainterPreferenceKeys(AnnotationType.ERROR, ERROR_INDICATION_COLOR, ERROR_INDICATION, ERROR_INDICATION_IN_OVERVIEW_RULER, 6);
-		
-		fSourceViewerDecorationSupport.setCursorLinePainterPreferenceKeys(CURRENT_LINE, CURRENT_LINE_COLOR);
-		fSourceViewerDecorationSupport.setMarginPainterPreferenceKeys(PRINT_MARGIN, PRINT_MARGIN_COLOR, PRINT_MARGIN_COLUMN);
-		
-		fSourceViewerDecorationSupport.setSymbolicFontName(getFontPropertyPreferenceKey());
-	}
-}
diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/AntEditorActionContributor.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/AntEditorActionContributor.java
deleted file mode 100644
index ea91db0..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/AntEditorActionContributor.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2003 GEBIT Gesellschaft fuer EDV-Beratung
- * und Informatik-Technologien mbH, 
- * Berlin, Duesseldorf, Frankfurt (Germany) and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     GEBIT Gesellschaft fuer EDV-Beratung und Informatik-Technologien mbH - initial API and implementation
- * 	   IBM Corporation - bug 24108
- *******************************************************************************/
-
-package org.eclipse.ant.ui.internal.editor;
-
-import java.util.ResourceBundle;
-
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.ui.IActionBars;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbenchActionConstants;
-import org.eclipse.ui.editors.text.TextEditorActionContributor;
-import org.eclipse.ui.texteditor.ITextEditor;
-import org.eclipse.ui.texteditor.RetargetTextEditorAction;
-
-/**
- * Contributes interesting Java actions to the desktop's Edit menu and the toolbar.
- * 
- * @author Alf Schiefelbein
- */
-public class AntEditorActionContributor extends TextEditorActionContributor {
-
-	protected RetargetTextEditorAction fContentAssistProposal;
-//    protected RetargetTextEditorAction fContentAssistTip;
-
-	/**
-	 * Default constructor.
-	 */
-	public AntEditorActionContributor() {
-		super();
-		fContentAssistProposal= new RetargetTextEditorAction(ResourceBundle.getBundle("org.eclipse.ant.ui.internal.editor.AntEditorMessages"), "ContentAssistProposal."); //$NON-NLS-1$ //$NON-NLS-2$
-//        fContentAssistTip= new RetargetTextEditor(ResourceBundle.getBundle("org.eclipse.ant.ui.internal.editor.AntEditorMessages"), "ContentAssistTip."); //$NON-NLS-1$
-	}
-	
-	private void doSetActiveEditor(IEditorPart part) {
-		super.setActiveEditor(part);
-
-		ITextEditor editor= null;
-		if (part instanceof ITextEditor)
-			editor= (ITextEditor) part;
-
-		fContentAssistProposal.setAction(getAction(editor, "ContentAssistProposal")); //$NON-NLS-1$
-//        fContentAssistTip.setAction(getAction(editor, "ContentAssistTip")); //$NON-NLS-1$
-	}
-	
-    /*
-     * @see IEditorActionBarContributor#init(IActionBars)
-     */
-    public void init(IActionBars bars) {
-        super.init(bars);
-        
-        IMenuManager menuManager= bars.getMenuManager();
-        IMenuManager editMenu= menuManager.findMenuUsingPath(IWorkbenchActionConstants.M_EDIT);
-        if (editMenu != null) {
-            editMenu.add(new org.eclipse.jface.action.Separator());
-            editMenu.add(fContentAssistProposal);
-//            editMenu.add(fContentAssistTip);
-        }   
-        
-    }
-    
-	/*
-	 * @see IEditorActionBarContributor#setActiveEditor(IEditorPart)
-	 */
-	public void setActiveEditor(IEditorPart part) {
-		doSetActiveEditor(part);
-	}
-	
-	/*
-	 * @see IEditorActionBarContributor#dispose()
-	 */
-	public void dispose() {
-		doSetActiveEditor(null);
-		super.dispose();
-	}
-}
diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/AntEditorCompletionProcessor.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/AntEditorCompletionProcessor.java
deleted file mode 100644
index df8fd0e..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/AntEditorCompletionProcessor.java
+++ /dev/null
@@ -1,1175 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2003 GEBIT Gesellschaft fuer EDV-Beratung
- * und Informatik-Technologien mbH, 
- * Berlin, Duesseldorf, Frankfurt (Germany) and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     GEBIT Gesellschaft fuer EDV-Beratung und Informatik-Technologien mbH - initial API and implementation
- * 	   IBM Corporation - bug fixes
- *******************************************************************************/
-
-package org.eclipse.ant.ui.internal.editor;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.StringReader;
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.NoSuchElementException;
-import java.util.Set;
-import java.util.TreeSet;
-
-import javax.xml.parsers.ParserConfigurationException;
-
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.Target;
-import org.apache.tools.ant.Task;
-import org.apache.tools.ant.taskdefs.Available;
-import org.apache.tools.ant.taskdefs.Parallel;
-import org.apache.tools.ant.taskdefs.PathConvert;
-import org.apache.tools.ant.taskdefs.Property;
-import org.apache.tools.ant.taskdefs.Sequential;
-import org.apache.tools.ant.taskdefs.UpToDate;
-import org.apache.tools.ant.taskdefs.condition.Condition;
-import org.apache.xerces.parsers.SAXParser;
-import org.eclipse.ant.ui.internal.dtd.IAttribute;
-import org.eclipse.ant.ui.internal.dtd.IDfm;
-import org.eclipse.ant.ui.internal.dtd.IElement;
-import org.eclipse.ant.ui.internal.dtd.ISchema;
-import org.eclipse.ant.ui.internal.dtd.ParseError;
-import org.eclipse.ant.ui.internal.dtd.Parser;
-import org.eclipse.ant.ui.internal.editor.utils.ProjectHelper;
-import org.eclipse.ant.ui.internal.model.AntUIImages;
-import org.eclipse.ant.ui.internal.model.AntUIPlugin;
-import org.eclipse.ant.ui.internal.model.IAntUIConstants;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.ITextSelection;
-import org.eclipse.jface.text.ITextViewer;
-import org.eclipse.jface.text.contentassist.CompletionProposal;
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.text.contentassist.IContextInformation;
-import org.eclipse.jface.text.contentassist.IContextInformationValidator;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.part.FileEditorInput;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-import org.xml.sax.SAXParseException;
-
-/**
- * The text completion processor for the Ant Editor.
- * 
- * @author Alf Schiefelbein
- */
-public class AntEditorCompletionProcessor implements IContentAssistProcessor {       
- 
-    /**
-     * Helper Set that may only be used to collect 
-     * <code>ICompletionProposal</code> instances.
-     * <P>
-     * This implementation tests the proposal objects by their display string
-     * for equality.
-     */
-    protected class CompletionSet extends TreeSet {
-        
-        private Map displayStringToProposal = new HashMap();
-
-        /**
-         * Creates an instance that compares using the 
-         * <code>CompletionComparator</code>.
-         */
-        public CompletionSet() {
-           super(new Comparator() {
-                public int compare(Object o1, Object o2) {
-                    String tempString1 = ((ICompletionProposal)o1).getDisplayString();
-                    String tempString2 = ((ICompletionProposal)o2).getDisplayString();
-                    return tempString1.compareToIgnoreCase(tempString2);
-                }
-           });           
-        }
-
-
-        /**
-         * Adds the specified <code>ICompletionProposal</code> only if another
-         * proposal with the same display string is not contained already.
-         * 
-         * @param o must be instanceof <code>ICompletionProposal</code>
-         */
-        public boolean add(Object o) {
-            ICompletionProposal tempProposal = (ICompletionProposal)o;
-            if(!displayStringToProposal.containsKey(tempProposal.getDisplayString())) {
-                boolean tempResult = super.add(o);
-                if(tempResult) {
-                    displayStringToProposal.put(tempProposal.getDisplayString(), tempProposal);
-                }
-                return tempResult;
-            }
-            return false;
-        }
-            
-        
-        /**
-         * Returns true if no another proposal with the same display string is 
-         * contained allready.
-         * 
-         * @param o must be instanceof <code>ICompletionProposal</code>
-         */
-        public boolean contains(Object o) {
-            ICompletionProposal tempProposal = (ICompletionProposal)o;
-            if(!displayStringToProposal.containsKey(tempProposal.getDisplayString())) {
-                return true;
-            }
-            return false;
-        }
-
-        /**
-         * Removes the specified proposal.
-         * 
-         * @param o must be instanceof <code>ICompletionProposal</code>
-         */
-        public boolean remove(Object o) {
-            ICompletionProposal tempProposal = (ICompletionProposal)o;
-            boolean tempResult = super.remove(o);
-            if(tempResult) {
-                Object tempObject = displayStringToProposal.remove(tempProposal.getDisplayString());
-                if(tempObject == null) {
-                    throw new NoSuchElementException(AntEditorMessages.getString("AntEditorCompletionProcessor.Serious_Error")); //$NON-NLS-1$
-                }
-            }
-            return tempResult;
-        }
-
-    }
-
-	private final static int PROPOSAL_MODE_NONE = 0;
-	private final static int PROPOSAL_MODE_TASK_PROPOSAL = 1;
-	private final static int PROPOSAL_MODE_ATTRIBUTE_PROPOSAL = 2;
-	private final static int PROPOSAL_MODE_TASK_PROPOSAL_CLOSING = 3;
-	private final static int PROPOSAL_MODE_ATTRIBUTE_VALUE_PROPOSAL = 4;
-	private final static int PROPOSAL_MODE_PROPERTY_PROPOSAL = 5;
-    
-    /**
-     * The line where the cursor sits now.
-     * <P>
-     * The first line has index '1'.
-     */
-	protected int lineNumber = -1;
-
-    /**
-     * The startingColumn where the cursor sits now.
-     * <P>
-     * The first startingColumn has index '1'.
-     */
-	protected int columnNumber = -1;
-    
-	/**
-	 * The additional offset required from a required attribute to
-	 * place the cursor for the current proposal
-	 */
-	private int additionalProposalOffset = -1;
-    
-    private static final String ANT_1_5_DTD_FILENAME = "/ant1.5b.dtd"; //$NON-NLS-1$
-
-    /**
-     * The dtd.
-     */
-	private static ISchema dtd;
-
-    /**
-     * Cursor position, counted from the beginning of the document.
-     * <P>
-     * The first position has index '0'.
-     */
-	protected int cursorPosition = -1;
-	
-    /**
-     * The text viewer.
-     */
-	private ITextViewer viewer;
-	
-	/**
-	 * The set of characters that will trigger the activation of the
-	 * completion proposal computation.
-	 */
-	private char[] autoActivationChars= null;
-	
-    /**
-     * The provider for all task and attribute descriptions.
-     */
-	private TaskDescriptionProvider descriptionProvider = new TaskDescriptionProvider();
-	private AntEditorSaxDefaultHandler lastDefaultHandler;
-	
-	/**
-	 * Constructor for AntEditorCompletionProcessor.
-	 */
-	public AntEditorCompletionProcessor() {
-		super();
-		if(dtd == null) {
-	        try {
-	     	  	dtd = parseDtd();
-	        } catch (IOException e) {
-	        	AntUIPlugin.log(e);
-	        } catch (ParseError e) {
-				AntUIPlugin.log(e);
-			}
-		}
-	}
-
-    /**
-     * Parses the dtd.
-     */
-    private ISchema parseDtd() throws ParseError, IOException {
-        InputStream tempStream = getClass().getResourceAsStream(ANT_1_5_DTD_FILENAME);
-        InputStreamReader tempReader = new InputStreamReader(tempStream, "UTF-8"); //$NON-NLS-1$
-        Parser parser = new Parser();
-        ISchema schema= parser.parseDTD(tempReader, "project"); //$NON-NLS-1$
-        tempReader.close();
-        return schema;
-    }
-    
-	/**
-	 * @see org.eclipse.jface.text.contentassist.IContentAssistProcessor#computeCompletionProposals(ITextViewer, int)
-	 */
-	public ICompletionProposal[] computeCompletionProposals(ITextViewer refViewer, int documentOffset) {
-		this.viewer = refViewer;
-		return determineProposals();
-	}
-	
-	/**
-	 * @see org.eclipse.jface.text.contentassist.IContentAssistProcessor#computeContextInformation(ITextViewer, int)
-	 */
-	public IContextInformation[] computeContextInformation(ITextViewer refViewer, int documentOffset) {
-		return new IContextInformation[0];
-	}
-
-	/**
-	 * @see org.eclipse.jface.text.contentassist.IContentAssistProcessor#getCompletionProposalAutoActivationCharacters()
-	 */
-	public char[] getCompletionProposalAutoActivationCharacters() {
-        return autoActivationChars;
-	}
-
-	/**
-	 * @see org.eclipse.jface.text.contentassist.IContentAssistProcessor#getContextInformationAutoActivationCharacters()
-	 */
-	public char[] getContextInformationAutoActivationCharacters() {
-        return null;
-	}
-
-	/**
-	 * @see org.eclipse.jface.text.contentassist.IContentAssistProcessor#getContextInformationValidator()
-	 */
-	public IContextInformationValidator getContextInformationValidator() {
-		return null;
-	}
-
-	/**
-	 * @see org.eclipse.jface.text.contentassist.IContentAssistProcessor#getErrorMessage()
-	 */
-	public String getErrorMessage() {
-		return AntEditorMessages.getString("AntEditorCompletionProcessor.No_Text_Completions_2"); //$NON-NLS-1$
-	}
-	
-    /**
-     * Returns the new determined proposals.
-     */ 
-	private ICompletionProposal[] determineProposals() {
-		
-		cursorPosition = ((ITextSelection)viewer.getSelectionProvider().getSelection()).getOffset();
-        
-        IDocument doc = viewer.getDocument();
-        try {
-            lineNumber = doc.getLineOfOffset(cursorPosition);
-            columnNumber = cursorPosition - doc.getLineOffset(lineNumber);
-        } catch (BadLocationException e) {
-            AntUIPlugin.log(e);
-        }
-		
-		String prefix = getCurrentPrefix();
-		if (prefix == null || cursorPosition == -1) {
-			AntUIPlugin.getStandardDisplay().beep();
-			return null;
-		}
-	
-		ICompletionProposal[] proposals = getProposalsFromDocument(doc.get(), prefix);
-		return proposals;
-		
-	}
-
-    /**
-     * Returns the proposals for the specified document.
-     * 
-     * @param aDocmuentString the text of the currently edited file as one string.
-     * @param the prefix
-     */
-    private ICompletionProposal[] getProposalsFromDocument(String aDocumentString, String aPrefix) {
-        String taskString = null;
-
-        /*
-         * Completions will be determined depending on the proposal mode.
-         */
-        switch (determineProposalMode(aDocumentString, cursorPosition, aPrefix)) {
-
-            case PROPOSAL_MODE_NONE :
-                break;
-
-            case PROPOSAL_MODE_ATTRIBUTE_PROPOSAL:
-                taskString = getTaskStringFromDocumentStringToPrefix(aDocumentString.substring(0, cursorPosition-aPrefix.length()));
-                return getAttributeProposals(taskString, aPrefix);
-
-            case PROPOSAL_MODE_TASK_PROPOSAL:
-                return getTaskProposals(aDocumentString, findParentElement(aDocumentString, lineNumber, columnNumber), aPrefix);
-
-            case PROPOSAL_MODE_TASK_PROPOSAL_CLOSING:
-                return getClosingTaskProposals(findNotClosedParentElement(aDocumentString, lineNumber, columnNumber), aPrefix);
-
-            case PROPOSAL_MODE_ATTRIBUTE_VALUE_PROPOSAL:
-                taskString = getTaskStringFromDocumentStringToPrefix(aDocumentString.substring(0, cursorPosition-aPrefix.length()));
-                String tempAttributeString = getAttributeStringFromDocumentStringToPrefix(aDocumentString.substring(0, cursorPosition-aPrefix.length()));
-                return getAttributeValueProposals(taskString, tempAttributeString, aPrefix);
-
-            case PROPOSAL_MODE_PROPERTY_PROPOSAL:
-                return getPropertyProposals(aDocumentString, aPrefix, cursorPosition);
-
-            default :
-                break;
-        } 
-        
-         return new ICompletionProposal[0];
-
-    }
-    
-    /**
-     * Returns all possible attributes for the specified task.
-     * 
-     * @param aTaskName the name of the task for that the attribute shall be 
-     * completed
-     * @param aPrefix prefix, that all proposals should start with. The prefix
-     * may be an empty string.
-     */
-    protected ICompletionProposal[] getAttributeProposals(String aTaskName, String aPrefix) {
-        List tempProposals = new ArrayList();
-        IElement tempElement = dtd.getElement(aTaskName);
-        if (tempElement != null) {
-        	Iterator tempKeys = tempElement.getAttributes().keySet().iterator();
-        	while (tempKeys.hasNext()) {
-        		String tempAttrName = (String) tempKeys.next();
-        		if (tempAttrName.toLowerCase().startsWith(aPrefix)) {
-        			IAttribute tempDTDAttribute = (IAttribute) tempElement.getAttributes().get(tempAttrName);
-					String tempReplacementString = tempAttrName+"=\"\""; //$NON-NLS-1$
-					String tempDisplayString = tempAttrName;
-					String[] tempItems = tempDTDAttribute.getEnum();
-					if (tempItems != null) {					        			
-                        if(tempItems.length > 1) {
-                            tempDisplayString += " - ("; //$NON-NLS-1$
-                        }
-                        for (int i = 0; i < tempItems.length; i++) {
-                            tempDisplayString += tempItems[i];
-                            if(i+1 < tempItems.length) {
-                                tempDisplayString += " | "; //$NON-NLS-1$
-                            }
-                            else {
-                                tempDisplayString += ")"; //$NON-NLS-1$
-                            }
-                        }
-                    }
-                    
-                    String tempProposalInfo = null;
-                    String tempRequired = descriptionProvider.getRequiredAttributeForTaskAttribute(aTaskName, tempAttrName);
-                    if(tempRequired != null && tempRequired.length() > 0) {
-                        tempProposalInfo = AntEditorMessages.getString("AntEditorCompletionProcessor.Required___4") + tempRequired; //$NON-NLS-1$
-                        tempProposalInfo += "<BR><BR>"; //$NON-NLS-1$
-                    }
-                    String tempDescription = descriptionProvider.getDescriptionForTaskAttribute(aTaskName, tempAttrName);
-                    if(tempDescription != null) {
-                        tempProposalInfo = (tempProposalInfo == null ? "" : tempProposalInfo); //$NON-NLS-1$
-                        tempProposalInfo += tempDescription;
-                    }
-                    
-                    ICompletionProposal tempProposal = new CompletionProposal(tempReplacementString, cursorPosition - aPrefix.length(), aPrefix.length(), tempAttrName.length()+2, null, tempDisplayString, null, tempProposalInfo);
-                    /*
-                     * This is how we do it, once we have the documentation.
-                     *
-                     * IContextInformation tempContextInfo = new ContextInformation("contextDisplayString", "informationDisplayString");
-                     * ICompletionProposal tempProposal = new CompletionProposal(tempAttrName+"=\"\"", cursorPosition - aPrefix.length(), aPrefix.length(), tempAttrName.length()+2, null, tempAttrName, tempContextInfo, "Pustekuchen ;-) !!!");
-                     */
-                    tempProposals.add(tempProposal);
-                }       
-            }
-        }
-        return (ICompletionProposal[])tempProposals.toArray(new ICompletionProposal[tempProposals.size()]);
-    }
-
-
-    /**
-     * Returns all possible values for the specified attribute of the specified 
-     * task.
-     * 
-     * @param aTaskName the name of the task that the specified attribute 
-     * belongs to.
-     * 
-     * @param anAttributeName the name of the attribute for that the value
-     * shall be completed
-     * 
-     * @param aPrefix prefix, that all proposals should start with. The prefix
-     * may be an empty string.
-     */
-    private ICompletionProposal[] getAttributeValueProposals(String aTaskName, String anAttributeName, String aPrefix) {
-        List proposals = new ArrayList();
-        IElement taskElement = dtd.getElement(aTaskName);
-        if (taskElement != null) {
-        	IAttribute attribute = (IAttribute) taskElement.getAttributes().get(anAttributeName);
-        	if (attribute != null) {
-        		String[] tempItems = attribute.getEnum();
-        		if (tempItems != null) {
-					String item;
-                    for (int i = 0; i < tempItems.length; i++) {
-                        item= tempItems[i];
-                        if(item.toLowerCase().startsWith(aPrefix)) {
-                            ICompletionProposal proposal = new CompletionProposal(item, cursorPosition - aPrefix.length(), aPrefix.length(), item.length(), null, item, null, null);
-                            proposals.add(proposal);
-                        }
-                    }
-        		}
-            }
-        }
-        return (ICompletionProposal[])proposals.toArray(new ICompletionProposal[proposals.size()]);
-    }
-
-    
-    /**
-     * Returns all possible properties for the specified prefix.
-     * <P>
-     * Note that the completion mode must be property mode, otherwise it is not
-     * safe to call this method.
-     */
-    protected ICompletionProposal[] getPropertyProposals(String aDocumentText, String aPrefix, int aCursorPosition) {
-        Set proposals = new CompletionSet();
-        Map properties = findPropertiesFromDocument(aDocumentText);
-		String propertyName;
-		Image image = AntUIImages.getImage(IAntUIConstants.IMG_PROPERTY);
-        for(Iterator i=properties.keySet().iterator(); i.hasNext(); ) {
-            propertyName= (String)i.next();
-            if(propertyName.toLowerCase().startsWith(aPrefix)) {
-                String additionalPropertyInfo = (String)properties.get(propertyName);
-
-                // Determine replacement length and offset
-                // String from beginning to the beginning of the prefix
-                int replacementLength = aPrefix.length();
-                int replacementOffset = 0;
-                String stringToPrefix = aDocumentText.substring(0, aCursorPosition - aPrefix.length());
-                // Property proposal
-                String lastTwoCharacters = stringToPrefix.substring(stringToPrefix.length()-2, stringToPrefix.length());
-                if(lastTwoCharacters.equals("${")) { //$NON-NLS-1$
-                    replacementLength += 2;
-                    replacementOffset = aCursorPosition - aPrefix.length() - 2;
-                }
-                else if(lastTwoCharacters.endsWith("$")) { //$NON-NLS-1$
-                    replacementLength += 1;
-                    replacementOffset = aCursorPosition - aPrefix.length() - 1;                
-                } else {
-                    throw new AntEditorException(AntEditorMessages.getString("AntEditorCompletionProcessor.Error")); //$NON-NLS-1$
-                }
-                if(aDocumentText.length() > aCursorPosition && aDocumentText.charAt(aCursorPosition) == '}') {
-                    replacementLength += 1;
-                }
-                 
-                String replacementString = new StringBuffer("${").append(propertyName).append('}').toString();  //$NON-NLS-1$
-                
-                ICompletionProposal proposal = 
-                    new CompletionProposal(
-                        replacementString, 
-                        replacementOffset, 
-                        replacementLength, 
-                        replacementString.length(), 
-						image,
-                        propertyName, null, 
-                        additionalPropertyInfo);
-                proposals.add(proposal);
-            }
-        }                
-        return (ICompletionProposal[])proposals.toArray(new ICompletionProposal[proposals.size()]);
-    }
-
-
-    /**
-     * Returns all possible attributes for the specified parent task element.
-     * <P>
-     * No completions will be returned if <code>aParentTaskElement</code> is 
-     * not known.
-     * 
-     * @param aParentTaskName name of the parent(surrounding) task or 
-     * <code>null</code> if completion should be done for the root element.
-     * 
-     * @param aPrefix prefix, that all proposals should start with. The prefix
-     * may be an empty string.
-     */
-    protected ICompletionProposal[] getTaskProposals(String aWholeDocumentString, Element aParentTaskElement, String aPrefix) {
-		// The code this replaced assumed that child elements
-		// are unordered; there was no provision for walking
-		// through a child sequence. This works for the Ant
-		// 1.5 DTD but not in general. I kept the assumption. bf
-        List proposals = new ArrayList();
-     
-        if (aParentTaskElement == null) {
-        	// DTDs do not designate a root element.
-        	// The previous code must have looked for an element that
-        	// was not in the content model of any other element.
-        	// This test doesn't work with a DTD used to validate
-        	// document partitions, a DTD with multiple candidate
-        	// roots, etc. The right answer is to get
-        	// the root element from the document. If there isn't
-        	// one, we assume "project". bf
-            String rootElementName = null;
-	       	if (lastDefaultHandler != null) {
-                rootElementName = lastDefaultHandler.rootElementName;
-        	}
-			if (rootElementName == null) {
-				rootElementName = "project"; //$NON-NLS-1$
-			}
-			IElement rootElement = dtd.getElement(rootElementName);
-			if(rootElement != null && rootElementName.toLowerCase().startsWith(aPrefix)) {
-				additionalProposalOffset= 0;
-				ICompletionProposal proposal = newCompletionProposal(aWholeDocumentString, aPrefix, rootElementName);
-				proposals.add(proposal);
-			}
-        } else {
-			IElement parent = dtd.getElement(aParentTaskElement.getTagName());
-			if (parent != null) {
-				IDfm dfm = parent.getDfm();
-				String[] accepts = dfm.getAccepts();
-				String elementName;
-				ICompletionProposal proposal;
-				for (int i = 0; i < accepts.length; i++) {
-					additionalProposalOffset= 0;
-					elementName = accepts[i];
-					if(elementName.toLowerCase().startsWith(aPrefix)) {
-						proposal = newCompletionProposal(aWholeDocumentString, aPrefix, elementName);
-						proposals.add(proposal);
-					}
-				}
-			}
-        }
-        
-       return (ICompletionProposal[])proposals.toArray(new ICompletionProposal[proposals.size()]);
-   }
-
-    private ICompletionProposal newCompletionProposal(String aWholeDocumentString, String aPrefix, String elementName) {
-		Image proposalImage = AntUIImages.getImage(IAntUIConstants.IMG_TASK_PROPOSAL);
-		String proposalInfo = descriptionProvider.getDescriptionForTask(elementName);
-		String replacementString = getTaskProposalReplacementString(elementName);
-		int replacementOffset = cursorPosition - aPrefix.length();
-		int replacementLength = aPrefix.length();
-		if(replacementOffset > 0 && aWholeDocumentString.charAt(replacementOffset-1) == '<') {
-			replacementOffset--;
-			replacementLength++;
-		}
-		return new CompletionProposal(replacementString, replacementOffset, 
-			replacementLength, elementName.length() + 2 + additionalProposalOffset, 
-			proposalImage, elementName, 
-			null, proposalInfo);
-	}
-
-	/**
-     * Returns the one possible completion for the specified unclosed task 
-     * element.
-     * 
-     * @param unclosedTaskElement the task element that hasn't been closed 
-     * last
-     * 
-     * @param aPrefix prefix, that the one possible proposals should start 
-     * with. The prefix may be an empty string.
-     * 
-     * @return array which may contain either one or none proposals
-     */
-    private ICompletionProposal[] getClosingTaskProposals(Element unclosedTaskElement, String aPrefix) {
-        Set tempProposals = new CompletionSet();
-        if(unclosedTaskElement != null) {
-            if(unclosedTaskElement.getTagName().toLowerCase().startsWith(aPrefix)) {
-                String tempReplaceString = unclosedTaskElement.getTagName();
-                tempProposals.add(new CompletionProposal(tempReplaceString + '>', cursorPosition - aPrefix.length(), aPrefix.length(), tempReplaceString.length()+1, null, tempReplaceString, null, null));
-            }
-        }
-        return (ICompletionProposal[])tempProposals.toArray(new ICompletionProposal[tempProposals.size()]);
-    }
-
-    /**
-     * Returns the replacement string for the specified task name.
-     */
-    private String getTaskProposalReplacementString(String aTaskName) {
-        StringBuffer replacement = new StringBuffer("<"); //$NON-NLS-1$
-        replacement.append(aTaskName); 
-        Node attributeNode= descriptionProvider.getAttributesNode(aTaskName);
-		
-        if (attributeNode != null) {
-			appendRequiredAttributes(replacement, attributeNode);
-        } else if ("project".equals(aTaskName)){ //$NON-NLS-1$
-        	replacement.append(" default=\"\""); //$NON-NLS-1$
-			additionalProposalOffset= 9;
-        }
-        
-        if (isEmpty(aTaskName)) {
-            replacement.append("/>"); //$NON-NLS-1$
-        } else {
-            replacement.append("></"); //$NON-NLS-1$
-            replacement.append(aTaskName);
-            replacement.append('>');
-        }
-        return replacement.toString();               
-    }
-
-    private void appendRequiredAttributes(StringBuffer replacement, Node attributeNode) {
-		boolean requiredAdded= false;
-		NodeList attributes= attributeNode.getChildNodes();
-		String required;
-		Node attribute;
-		for (int i = 0; i < attributes.getLength(); i++) {
-			attribute = attributes.item(i);
-			required= descriptionProvider.getRequiredOfNode(attribute);
-			if (required.equalsIgnoreCase("yes")) { //$NON-NLS-1$
-				String attributeName= descriptionProvider.getTaskAttributeName(attribute);
-				replacement.append(' ');
-				replacement.append(attributeName);
-				replacement.append("=\"\""); //$NON-NLS-1$
-				if (!requiredAdded){
-					additionalProposalOffset= attributeName.length() + 2;
-					requiredAdded= true;
-				}	
-			}
-		}
-	}
-
-	/**
-     * Returns whether the named element is empty, thus may not have any child
-     * elements.
-     */
-    private boolean isEmpty(String aDTDElementName) {
-        IElement element = dtd.getElement(aDTDElementName);
-        return element.isEmpty();
-    }
-    
-    
-    /**
-     * Finds a direct child element with <code>aChildElementName</code> of 
-     * <code>anElement</code>.
-     * <P>
-     * The child will not be searched for in the whole hierarchy but only in
-     * the hierarchy step below.
-     * 
-     * @return the found child or <code>null</code> if not found.
-     */
-    protected Element findChildElementNamedOf(Element anElement, String aChildElementName) {
-        NodeList tempNodeList = anElement.getChildNodes();
-        for (int i = 0; i < tempNodeList.getLength(); i++) {
-            Node tempChildNode = (Node)tempNodeList.item(i);
-            if(tempChildNode.getNodeType() == Node.ELEMENT_NODE) {
-                if(tempChildNode.getNodeName().equals(aChildElementName)) {
-                    return (Element)tempChildNode;
-                }
-            }   
-        }
-        return null;
-    }
-
-	/**
-     * Determines the current prefix, that should be used for completion.
-     */
-	private String getCurrentPrefix() {
-
-		ITextSelection selection = (ITextSelection)viewer.getSelectionProvider().getSelection();
-		
-		if (selection.getLength() > 0) {
-			return null;
-		}
-		
-		IDocument doc = viewer.getDocument();
-
-        return getPrefixFromDocument(doc.get(), selection.getOffset()).toLowerCase();
-	}
-
-
-    /**
-     * Returns the prefix in the specified document text with respect to the 
-     * specified offset.
-     * 
-     * @param aDocumentString the whole content of the edited file as String
-     * @param anOffset the cursor position
-     */
-    protected String getPrefixFromDocument(String aDocumentText, int anOffset) {
-        
-        int startOfWordToken = anOffset;
-        
-        while (startOfWordToken > 0 
-                && (Character.isJavaIdentifierPart(aDocumentText.charAt(startOfWordToken - 1)) 
-                    || '.' == aDocumentText.charAt(startOfWordToken - 1)
-					|| '-' == aDocumentText.charAt(startOfWordToken - 1))
-                && !('$' == aDocumentText.charAt(startOfWordToken - 1))) {
-            startOfWordToken--;
-        }
-        
-        if (startOfWordToken != anOffset) {
-            return aDocumentText.substring(startOfWordToken, anOffset);
-        } else {
-            return ""; //$NON-NLS-1$
-        }
-    }
- 
- 
-    /**
-     * Returns the current proposal mode.
-     */
-    protected int determineProposalMode(String aWholeDocumentString, int aCursorPosition, String aPrefix) {
-
-        // String from beginning of document to the beginning of the prefix
-        String stringToPrefix = aWholeDocumentString.substring(0, aCursorPosition - aPrefix.length());
-
-        // Is trimmable from behind
-        String trimmedString = stringToPrefix.trim();
-        char lastChar = 0;
-        if(trimmedString.length() > 0) {
-	        lastChar = trimmedString.charAt(trimmedString.length()-1);
-        } else {
-        	return PROPOSAL_MODE_TASK_PROPOSAL;
-        }
-        if(stringToPrefix.charAt(stringToPrefix.length()-1) != lastChar && lastChar != '>') {
-            /*
-             * Substring must be trimmable from behind in case of attribute 
-             * proposal because a space or a new line must be used as delimiter 
-             * between task name and attribute or attribute and attribute.
-             * Example: '<property id="bla" name="hups"'
-             */
-             
-            // Attribute proposal
-            if(lastChar != '>' && lastChar != '<') {
-                String taskString =
-                    getTaskStringFromDocumentStringToPrefix(
-                        trimmedString);
-                if(taskString != null && isNamedTaskKnown(taskString)) {
-                    return PROPOSAL_MODE_ATTRIBUTE_PROPOSAL;
-                }
-            }                
-        } else if(stringToPrefix.charAt(stringToPrefix.length()-1) == '"') {
-			// Attribute value proposal
-            String taskString =
-                getTaskStringFromDocumentStringToPrefix(
-                    trimmedString);
-            if(taskString != null && isNamedTaskKnown(taskString)) {
-                return PROPOSAL_MODE_ATTRIBUTE_VALUE_PROPOSAL;
-            }
-        } else {  // Task proposal
-            int tempSpaceIndex = stringToPrefix.lastIndexOf(' ');
-            int tempLessThanIndex = stringToPrefix.lastIndexOf('<');
-            int tempGreaterThanIndex = stringToPrefix.lastIndexOf('>');
-            
-            // Task proposal
-            if(tempLessThanIndex > tempSpaceIndex && tempGreaterThanIndex < tempLessThanIndex) {
-                int tempSlashIndex = stringToPrefix.lastIndexOf('/');
-                if(tempSlashIndex == tempLessThanIndex +1) {
-                    return PROPOSAL_MODE_TASK_PROPOSAL_CLOSING; // ... </
-                }
-                return PROPOSAL_MODE_TASK_PROPOSAL;
-            }
-            if(tempLessThanIndex < tempGreaterThanIndex && "".equals(aPrefix)) { //$NON-NLS-1$
-                
-                // no other regular character may be between '>' and cursor position
-                int tempActIndex = aCursorPosition;
-                do {
-                    char tempChar = stringToPrefix.charAt(--tempActIndex);
-                    if(tempChar != ' ' && tempChar != '\t' && tempChar != '\n' && tempChar != '\r') {
-                        break; // found a character -> no task proposal mode
-                    }
-                } while(tempActIndex > tempGreaterThanIndex);  
-
-                // no character found in between                  
-                if(tempActIndex == tempGreaterThanIndex) {           
-                    return PROPOSAL_MODE_TASK_PROPOSAL;
-                }
-            }
-        }
-
-        // Property proposal
-        if(stringToPrefix.length() >= 2) {
-	        String tempLastTwoCharacters = stringToPrefix.substring(stringToPrefix.length()-2, stringToPrefix.length());
-	        if(tempLastTwoCharacters.equals("${") || //$NON-NLS-1$
-	            stringToPrefix.charAt(stringToPrefix.length()-1) == '$') {
-	                return PROPOSAL_MODE_PROPERTY_PROPOSAL;
-	        }
-        }
-        	            
-        return PROPOSAL_MODE_NONE;
-    }
-
-
-    /**
-     * Returns the last occuring task string in the specified string.
-     * <P>
-     * The returned string must not necessarily be a valid Ant task string.
-     * This can be tested with the method <code>inNamedTaskKnown(String)</code>
-     * after invoking this method.
-     * 
-     * @param aDocumentStringToPrefix the String that contains the whole string
-     * of the currently edited file from the beginning up to the prefix for code
-     * completion. Example: '<project default="name"><property '.
-     * 
-     * @return the extracted task string or <code>null</code> if no string could
-     * be extracted.
-     */
-    private String getTaskStringFromDocumentStringToPrefix(String aDocumentStringToPrefix) {
-            
-        int lessThanIndex = aDocumentStringToPrefix.lastIndexOf('<');
-
-        if(lessThanIndex > -1) {
-            String taskString = aDocumentStringToPrefix.trim();
-            taskString = taskString.substring(lessThanIndex+1, taskString.length());
-            int tempIndex = taskString.indexOf(' ');
-            if(tempIndex > 0) {
-                taskString = taskString.substring(0, tempIndex);
-            }
-            tempIndex = taskString.indexOf('\n');
-            if(tempIndex > 0) {
-                taskString = taskString.substring(0, tempIndex);
-            }
-            tempIndex = taskString.indexOf('\r');
-            if(tempIndex > 0) {
-                taskString = taskString.substring(0, tempIndex);
-            }
-            return taskString;
-        }
-        
-        return null;
-    }
-    
-
-    /**
-     * Returns the last occuring attribute string in the specified string.
-     * <P>
-     * Calling this method is only safe if the current proposal mode is really
-     * <code>PROPOSAL_MODE_ATTRIBUTE_VALUE_PROPOSAL</code>.
-     */
-    private String getAttributeStringFromDocumentStringToPrefix(String aDocumentStringToPrefix) {
-        int tempIndex = aDocumentStringToPrefix.lastIndexOf('=');
-        String tempSubString = aDocumentStringToPrefix.substring(0, tempIndex);
-        tempSubString = tempSubString.trim();
-        
-        tempIndex = tempSubString.lastIndexOf(' ');
-        if(tempIndex > 0) {
-            tempSubString = tempSubString.substring(tempIndex+1, tempSubString.length());
-        }
-        tempIndex = tempSubString.lastIndexOf('\n');
-        if(tempIndex > 0) {
-            tempSubString = tempSubString.substring(tempIndex+1, tempSubString.length());
-        }
-        tempIndex = tempSubString.lastIndexOf('\r');
-        if(tempIndex > 0) {
-            tempSubString = tempSubString.substring(tempIndex+1, tempSubString.length());
-        }
-        return tempSubString;
-    }
-
-
-    /**
-     * Returns whether the specified task name is known according to the DTD.
-     */
-    private boolean isNamedTaskKnown(String aTaskName) {
-        return dtd.getElement(aTaskName) != null;
-    }
-
-
-    /**
-     * Finds the parent task element in respect to the cursor position.
-     * 
-     * @return the parent task element or <code>null</code> if not found.
-     */
-    protected Element findParentElement(String aWholeDocumentString, int aLineNumber, int aColumnNumber) {
-
-        // Return the parent
-        return parseEditedFileSearchingForParent(aWholeDocumentString, aLineNumber, aColumnNumber).getParentElement(true);      
-    }
-    
-
-    /**
-     * Parses the actually edited file as far as possible.
-     * <P>
-     * The returned handler can be asked about what happened while parsing
-     * the document.
-     * 
-     * @return the handler that has been used for parsing or <code>null</code>
-     * if parsing couldn't be done because of some error.
-     */
-    private AntEditorSaxDefaultHandler parseEditedFileSearchingForParent(String aWholeDocumentString, int aLineNumber, int aColumnNumber) {
-        SAXParser parser = getSAXParser();
-        if(parser == null){
-        	return null;
-        }
-        
-        // Set the handler
-        AntEditorSaxDefaultHandler handler = null;
-        File editedFile= getEditedFile();
-        try {
-			File parent = null;
-			if(editedFile != null) {
-				parent = editedFile.getParentFile();
-			}
-        	handler = new AntEditorSaxDefaultHandler(parent, aLineNumber, aColumnNumber);
-        } catch (ParserConfigurationException e) {
-			AntUIPlugin.log(e);
-        }
-        
-       	parse(aWholeDocumentString, parser, handler, editedFile);
-        lastDefaultHandler = handler; // bf
-        return handler;
-    }
-
-	private void parse(String aWholeDocumentString, SAXParser parser, AntEditorSaxDefaultHandler handler, File editedFile) {
-		InputSource inputSource = new InputSource(new StringReader(aWholeDocumentString));
-		if (editedFile != null) {
-			//needed for resolving relative external entities
-			inputSource.setSystemId(editedFile.getAbsolutePath());
-		}
-		
-		parser.setContentHandler(handler);
-		parser.setDTDHandler(handler);
-		parser.setEntityResolver(handler);
-		parser.setErrorHandler(handler);
-	    try {
-	        parser.parse(inputSource);
-	    } catch(SAXParseException e) {
-	        // Ignore since that happens always if the edited file is not valid. We try to handle that.
-	    } catch (SAXException e) {
-	        AntUIPlugin.log(e);
-	    } catch (IOException e) {
-	        //ignore since can happen when user has incorrect paths / protocols for external entities
-	    }
-	}
-
-	private SAXParser getSAXParser() {
-		SAXParser parser = null;
-		try {
-			parser = new SAXParser();
-			parser.setFeature("http://xml.org/sax/features/namespaces", false); //$NON-NLS-1$
-		} catch (SAXException e) {
-			AntUIPlugin.log(e);
-		}
-		return parser;
-	}
-
-
-    /**
-     * Parses the actually edited file as far as possible.
-     * <P>
-     * We use the parsing facilities of the ant plug-in here.
-     * 
-     * @return a map with all the found properties
-     */
-    private Map findPropertiesFromDocument(String aWholeDocumentString) {
-		/*
-		 * What is implemented here:
-		 * - We first use the ant plug-in to create a Project instance.
-		 * - We determine the enclosing parent task element
-		 * - We determine the dependency Vector for the parent task element
-		 * - We work our way through the dependency Vector and execute the
-		 *   Property relevant tasks.
-		 */
-
-        // Create an initialized project
-        Project tempProject = new Project();
-        tempProject.init();
-
-        /* 
-         * Ant's parsing facilities always works on a file, therefore we need
-         * to determine the actual location of the file. Though the file 
-         * contents will not be parsed. We parse the passed document string 
-         * that is passed.
-         */
-        File tempFile = getEditedFile();
-        String filePath= ""; //$NON-NLS-1$
-        if (tempFile != null) {
-			filePath= tempFile.getAbsolutePath();
-        }
-        tempProject.setUserProperty("ant.file", filePath); //$NON-NLS-1$
-
-        try {
-            ProjectHelper.configureProject(tempProject, tempFile, aWholeDocumentString);  // File will be parsed here
-        }
-        catch(BuildException e) {
-            // ignore a build exception on purpose, since we also parse invalid
-            // build files.
-        }    
-        Map properties = tempProject.getProperties();
-        
-        // Determine the parent
-        Element tempElement = findEnclosingTargetElement(aWholeDocumentString, lineNumber, columnNumber);
-        String tempTargetName = null;
-        if(tempElement == null 
-        		|| (tempTargetName = tempElement.getAttribute("name")) == null //$NON-NLS-1$
-        		|| tempTargetName.length() == 0) {
-        	return properties;
-        }
-        List tempSortedTargets = null;
-        try {
-        	tempSortedTargets= tempProject.topoSort(tempTargetName, tempProject.getTargets());
-        } catch (BuildException be) {
-			return tempProject.getProperties();
-        }
-
-        int curidx = 0;
-        Target curtarget;
-
-        do {
-            curtarget = (Target) tempSortedTargets.get(curidx++);
-			Task[] tempTasks = curtarget.getTasks();
-			
-			for (int i = 0; i < tempTasks.length; i++) {
-				Task tempTask = tempTasks[i];                
-
-				// sequential
-				if(tempTask instanceof Sequential) {
-					// (T)
-				}
-				
-				// parallel
-				if(tempTask instanceof Parallel) {
-					// (T)
-				}
-				
-				// waitfor (@since Ant 1.5)
-	//			if(tempTask instanceof WaitFor) { 
-	//				// (T)
-	//			}
-				
-				if(tempTask instanceof Property 
-					|| tempTask instanceof PathConvert
-					|| tempTask instanceof Available
-					|| tempTask instanceof UpToDate
-					|| tempTask instanceof Condition) {
-					((Task)tempTask).perform();					
-				}
-			
-			
-				// Ant 1.5
-//				if(tempTask instanceof LoadFile) {
-//				
-//				}
-			
-				// Ant 1.5
-//				if(tempTask instanceof XmlProperty) {
-//				
-//				}
-			
-				// Ant 1.5
-//				if(tempTask instanceof Basename) {
-//				
-//				}
-			
-				
-				// Ant 1.5
-//				if(tempTask instanceof Dirname) {
-//				
-//				}
-			
-				// Ant 1.5
-//				if(tempTask instanceof LoadProperties) {
-//				
-//				}
-            }
-        } while (!curtarget.getName().equals(tempTargetName));
-
-        
-        // Need to reget it since tempTable hasn't been updated with Ant 1.5
-        return tempProject.getProperties();
-    }
-
-    protected File getEditedFile() {
-    	IWorkbenchPage page= AntUIPlugin.getActivePage();
-    	if (page == null) {
-    		return null;
-    	}
-		IEditorPart editor= page.getActiveEditor();
-		if (editor == null) {
-			return null;
-		}
-        FileEditorInput tempInput = (FileEditorInput) editor.getEditorInput();
-        String tempProjectPath = tempInput.getFile().getProject().getLocation().toFile().getAbsolutePath();
-        String tempProjectRelativeFilePath = tempInput.getFile().getFullPath().removeFirstSegments(1).makeRelative().toString();
-        File tempFile = new File(tempProjectPath + File.separator +tempProjectRelativeFilePath);
-        return tempFile;
-    }
-
-    /**
-     * Finds the parent task element in respect to the cursor position which
-     * that has not been closed yet.
-     * 
-     * @return the not closed parent task element or <code>null</code> if not 
-     * found.
-     */
-    private Element findNotClosedParentElement(String aWholeDocumentString, int aLineNumber, int aColumnNumber) {
-        AntEditorSaxDefaultHandler handler = parseEditedFileSearchingForParent(aWholeDocumentString, aLineNumber, aColumnNumber);
-        if(handler != null) {
-            
-            // A not closed parent element can only be found by guessing.
-            if(handler.getParentElement(false) == null) {
-                return handler.getParentElement(true);
-            }
-        }
-        return null;
-    }
- 
-
-    /**
-     * Finds the enclosing target element in respect to the cursor position. 
-     * 
-     * @return the enclosing target element or <code>null</code> if not found.
-     */
- 	private Element findEnclosingTargetElement(String aWholeDocumentString, int aLineNumber, int aColumnNumber) {
-
-        // Get a new SAX Parser
-        SAXParser parser = getSAXParser();
-        if (parser == null) {
-        	return null;
-        }
-        
-        // Set the handler
-        EnclosingTargetSearchingHandler handler = null;
-		File editedFile= getEditedFile();
-        try {
-		   File parent = null;
-		   if(editedFile != null) {
-			   parent = editedFile.getParentFile();
-		   }
-            handler = new EnclosingTargetSearchingHandler(parent, aLineNumber, aColumnNumber);
-        } catch (ParserConfigurationException e) {
-            AntUIPlugin.log(e);
-        }
-        
-		parse(aWholeDocumentString, parser, handler, editedFile);
-
-		return handler.getParentElement(true);
- 	}
-	
-	/**
-	 * Sets this processor's set of characters triggering the activation of the
-	 * completion proposal computation.
-	 * 
-	 * @param activationSet the activation set
-	 */
-	public void setCompletionProposalAutoActivationCharacters(char[] activationSet) {
-		autoActivationChars= activationSet;
-	}
-}
\ No newline at end of file
diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/AntEditorException.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/AntEditorException.java
deleted file mode 100644
index ad9fb76..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/AntEditorException.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2003 GEBIT Gesellschaft fuer EDV-Beratung
- * und Informatik-Technologien mbH, 
- * Berlin, Duesseldorf, Frankfurt (Germany).
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     GEBIT Gesellschaft fuer EDV-Beratung und Informatik-Technologien mbH - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ant.ui.internal.editor;
-
-/**
- * Exception that might be thrown in the Ant Editor context.
- * 
- * @author Alf Schiefelbein
- */
-public class AntEditorException extends RuntimeException {
-
-    /**
-     * Constructor for AntEditorException.
-     */
-    public AntEditorException() {
-        super();
-    }
-
-    /**
-     * Constructor for AntEditorException.
-     * @param s
-     */
-    public AntEditorException(String s) {
-        super(s);
-    }
-}
\ No newline at end of file
diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/AntEditorMessages.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/AntEditorMessages.java
deleted file mode 100644
index 6a78419..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/AntEditorMessages.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.ui.internal.editor;
-
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-public class AntEditorMessages {
-
-	private static final String BUNDLE_NAME = "org.eclipse.ant.ui.internal.editor.AntEditorMessages"; //$NON-NLS-1$
-
-	private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME);
-
-	private AntEditorMessages() {
-	}
-
-	public static String getString(String key) {
-		try {
-			return RESOURCE_BUNDLE.getString(key);
-		} catch (MissingResourceException e) {
-			return '!' + key + '!';
-		}
-	}
-}
diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/AntEditorMessages.properties b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/AntEditorMessages.properties
deleted file mode 100644
index 933dcde..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/AntEditorMessages.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2003 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Common Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/cpl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-ContentAssistProposal.label=Content Assist@Ctrl+Space
-ContentAssistProposal.tooltip=Content Assist
-ContentAssistProposal.image=
-ContentAssistProposal.description=Content Assist
-
-EnclosingTargetSearchingHandler.Error_parsing=Error when parsing document: Neither a local name nor qualified of an element specified
-
-AntEditorCompletionProcessor.Serious_Error=Serious error in AntEditorCompletionProcessor.CompletionSet: Object was removed which should not actually exist.
-AntEditorCompletionProcessor.No_Text_Completions_2=No Text Completions
-AntEditorCompletionProcessor.Required___4=Required: 
-AntEditorCompletionProcessor.Error=Error in AntEditorCompletionProcessor.getPropertyProposals
-AntEditorSaxDefaultHandler.Invalid_cursor_position=The cursor position of {0}, {1} (startingRow, startingColumn) is not valid
-AntEditorSaxDefaultHandler.Error_parsing=Error when parsing document: Neither a local name nor qualified of an element specified
-
-AntAnnotationHover.multipleMarkersAtThisLine=Multiple markers at this line
diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/AntEditorSaxDefaultHandler.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/AntEditorSaxDefaultHandler.java
deleted file mode 100644
index b6736fd..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/AntEditorSaxDefaultHandler.java
+++ /dev/null
@@ -1,342 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2003 GEBIT Gesellschaft fuer EDV-Beratung
- * und Informatik-Technologien mbH, 
- * Berlin, Duesseldorf, Frankfurt (Germany) and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     GEBIT Gesellschaft fuer EDV-Beratung und Informatik-Technologien mbH - initial API and implementation
- * 	   IBM Corporation - bug fixes
- *******************************************************************************/
-
-package org.eclipse.ant.ui.internal.editor;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.text.MessageFormat;
-import java.util.Stack;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.util.FileUtils;
-import org.eclipse.ant.ui.internal.model.AntUIPlugin;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.xml.sax.Attributes;
-import org.xml.sax.InputSource;
-import org.xml.sax.Locator;
-import org.xml.sax.SAXException;
-import org.xml.sax.SAXParseException;
-import org.xml.sax.helpers.DefaultHandler;
-
-
-/**
- * The <code>DefaultHandler</code> for the parsing of the currently edited file.
- * 
- * @version 19.09.2002
- * @author Alf Schiefelbein
- */
-public class AntEditorSaxDefaultHandler extends DefaultHandler {
-
-    /**
-     * The locator that tells us the location of the currently parsed element 
-     * in the parsed document.
-     */
-    protected Locator locator;
-
-
-    /**
-     * Stack of still open elements.
-     * <P>
-     * On top of the stack is the innermost element.
-     */
-    protected Stack stillOpenElements = new Stack();
-
-
-    /**
-     * The parent element that we search for.
-     * <P>
-     * This variable will be set during the parsing process, when we first
-     * passed the cursor location.
-     */
-    protected Element parentElement;
-
-
-    /**
-     * Flag that determines whether we are finished with parsing.
-     * <P>
-     * This is usually the case when the parent element was found and closed.
-     */
-    protected boolean parsingFinished;
-
-
-    /**
-     * Document that is used to create the elements.
-     */
-    protected Document document;
-
-
-    /**
-     * The startingRow where the cursor is located in the document.
-     * <P>
-     * The first startingRow is refered to with an index of '0'.
-     */
-    protected int rowOfCursorPosition = -1;
-    
-    
-    /**
-     * The startingColumn where the cursor is located in the document.
-     * <P>
-     * The first startingColumn is refered to with an index of '0'.
-     */
-    protected int columnOfCursorPosition = -1;
-    
-    /**
-     * The name of the document root element or null if none seen.
-     */
-	public String rootElementName;
-	
-	/**
-	 * Used as a helper for resolving external relative entries.
-	 */
-	private File mainFileContainer;
-
-
-    /**
-     * Creates an AntEditorSaxDefaultHandler, with the specified parameters.
-     * 
-     * @param aRowOfCursorPosition the startingRow where the cursor is located in the
-     * document. The first startingRow is refered to with an index of '0'.
-     * @param aColumnOfCursorPosition the startingColumn where the cursor is located in
-     * the document. The first startingColumn is refered to with an index of '0'.
-     */
-    public AntEditorSaxDefaultHandler(File fileContainer, int aRowOfCursorPosition, int aColumnOfCursorPosition) throws ParserConfigurationException {
-        super();
-		if (AntUIPlugin.getDefault() != null && AntUIPlugin.getDefault().isDebugging()) {
-			AntUIPlugin.log("AntEditorSaxDefaultHandler(" +aRowOfCursorPosition+ ", "+aColumnOfCursorPosition+ ")", null); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-        }
-        if (aRowOfCursorPosition < 0 || aColumnOfCursorPosition < 0) {
-            throw new IllegalArgumentException(MessageFormat.format(AntEditorMessages.getString("AntEditorSaxDefaultHandler.Invalid_cursor_position"), new String[]{Integer.toString(aRowOfCursorPosition), Integer.toString(aColumnOfCursorPosition)})); //$NON-NLS-1$
-        }
-        rowOfCursorPosition = aRowOfCursorPosition;
-        columnOfCursorPosition = aColumnOfCursorPosition;
-        this.mainFileContainer= fileContainer;
-        initialize();
-    }
-
-    /**
-     * Initializes the handler.
-     */
-    protected void initialize() throws ParserConfigurationException {
-        DocumentBuilder documentBuilder = DocumentBuilderFactory.newInstance().newDocumentBuilder();
-        document = documentBuilder.newDocument();
-    }
-
-    /**
-     * Checks whether the parent element, that we are searching for can be or
-     * has already been determined.
-     * <P>
-     * This will be done by comparing the current parsing position with the
-     * cursor position. If we just passed the cursor position and the parent
-     * element has not been set yet, it will be set.
-     * 
-     * @return <code>true</code> if the parent element is known otherwise
-     * <code>false</code>
-     */
-    protected boolean checkForParentElement() {
-        if(parentElement == null) {
-            if(locator != null) {
-
-                /*
-                 * The locator's numbers are 1-based though, we do everything
-                 * 0-based.
-                 */
-
-                int lineNum = locator.getLineNumber() -1;
-                int columnNum = locator.getColumnNumber() -1;
-                if(lineNum> rowOfCursorPosition ||
-                    (lineNum == rowOfCursorPosition && columnNum > columnOfCursorPosition) && !stillOpenElements.isEmpty()) {
-                        parentElement = (Element)stillOpenElements.peek();
-                        if (AntUIPlugin.getDefault() != null && AntUIPlugin.getDefault().isDebugging()) {
-							AntUIPlugin.log("AntEditorSaxDefaultHandler.checkForParentElement(): Parent element found: " +parentElement, null); //$NON-NLS-1$
-                        }
-                        return true;
-                    }
-            }
-            return false;
-        }
-        
-        // Parent element has been set already before
-        return true;
-    }
-    
-    /* (non-Javadoc)
-     * @see org.xml.sax.ContentHandler#startElement(String, String, String, Attributes)
-     */
-    public void startElement(String uri, String localName, String qualifiedName, Attributes attributes)
-        throws SAXException {
-        /*
-         * While the crimson parser passes the tag name as local name, apache's
-         * xerces parser, passes the tag name as qualilfied name and an empty 
-         * string as local name.
-         */
-        
-		 if (AntUIPlugin.getDefault() != null && AntUIPlugin.getDefault().isDebugging()) {
-			AntUIPlugin.log("AntEditorSaxDefaultHandler.startElement(" +uri+ ", " +localName+ ", "+qualifiedName+ ", "+attributes+ ")", null); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
-        }
-        if(parsingFinished) {
-            return;
-        }        
-
-        // Checks whether we know the parent for sure
-        checkForParentElement();
-
-        // Create a Dom Element
-        String tagName = localName.length() > 0 ? localName : qualifiedName;
-        if(tagName == null || tagName.length() == 0) {
-            throw new AntEditorException(AntEditorMessages.getString("AntEditorSaxDefaultHandler.Error_parsing")); //$NON-NLS-1$
-        }
-        // This code added to determine root element in a rational way bf
-        if (rootElementName == null) {
-        	rootElementName = tagName;
-        }
-        
-        Element element = document.createElement(tagName);
-        
-        stillOpenElements.push(element);
-        
-        super.startElement(uri, localName, qualifiedName, attributes);
-    }
-
-    /* (non-Javadoc)
-     * @see org.xml.sax.ContentHandler#endElement(String, String, String)
-     */
-    public void endElement(String aUri, String aLocalName, String aQualifiedName)
-        throws SAXException {
-
-		if (AntUIPlugin.getDefault() != null && AntUIPlugin.getDefault().isDebugging()) {
-			AntUIPlugin.log("AntEditorSaxDefaultHandler.endElement(" +aUri+ ", " +aLocalName+ ", "+aQualifiedName+ ")", null); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-		}
-
-        if(parsingFinished) {
-            return;
-        }        
-        
-        // Checks whether we know the parent for sure
-        boolean parentKnown = checkForParentElement();
-        
-        String tagName = aLocalName.length() > 0 ? aLocalName : aQualifiedName;
-
-		if(!stillOpenElements.isEmpty()) {        
-	        Element lastStillOpenElement = (Element)stillOpenElements.peek(); 
-	        if(lastStillOpenElement != null && lastStillOpenElement.getTagName().equals(tagName)) {
-	            stillOpenElements.pop();
-	            
-	            if(!stillOpenElements.empty()) {
-	                Element secondLastStillOpenElement = (Element)stillOpenElements.peek();
-	                secondLastStillOpenElement.appendChild(lastStillOpenElement);
-	            }
-	            if(parentKnown && parentElement != null && parentElement.getTagName().equals(tagName)) {
-	                parsingFinished = true;
-	            }
-	        }
-		}
-    }
-
-    /* (non-Javadoc)
-     * @see org.xml.sax.ContentHandler#setDocumentLocator(Locator)
-     */
-    public void setDocumentLocator(Locator aLocator) {
-        locator = aLocator;
-        super.setDocumentLocator(aLocator);
-    }
-
-    /**
-     * Returns the parent element that has been determined during a prior 
-     * parsing.
-     * <P>
-     * It is quite common that parsing stopped before the current cursor 
-     * position. That happens when the parser finds an error within the parsed 
-     * document before. In that case the parent element might be guessed to be
-     * the one that opened last. To tell the handler whether the parent should
-     * be guessed, <code>guessParent</code> may be specified.
-     * 
-     * @param aGuessParentFlag whether the parent should be guessed
-     * @return the parent element or <code>null</code> if not known.
-     */
-    public Element getParentElement(boolean guessParent) {
-        if(parentElement != null) {
-            return parentElement;
-        }
-        if(guessParent) {
-            if(!stillOpenElements.empty()) {
-                return (Element)stillOpenElements.peek();
-            }
-        }
-        return null;
-    }
-
-    /**
-     * We have to handle fatal errors.
-     * <P>
-     * They come up whenever we parse a not valid file, what we do all the time.
-     * Therefore a fatal error is nothing special for us.
-     * <P>
-     * Actually, we ignore all fatal errors for now.
-     * 
-     * @see org.xml.sax.ErrorHandler#fatalError(SAXParseException)
-     */
-    public void fatalError(SAXParseException anException) throws SAXException {
-        if(locator != null) {
-          //  int tempLineNr = locator.getLineNumber() -1;
-          //  int tempColumnNr = locator.getColumnNumber() -1;
-          //  super.fatalError(anException);
-        }
-    }
-    
-	/**
-	 * @see org.xml.sax.EntityResolver#resolveEntity(java.lang.String, java.lang.String)
-	 */
-	public InputSource resolveEntity(String publicId, String systemId) throws SAXException {
-		int index= systemId.indexOf(':');
-		if (index > 0) {
-			//remove file:
-			systemId= systemId.substring(index+1, systemId.length());
-		}
-		File resolvedFile= null;
-		IPath filePath= new Path(systemId);
-		IFile file = ResourcesPlugin.getWorkspace().getRoot().getFileForLocation(filePath);
-		if (file == null || !file.exists()) {
-			//relative path
-			try {
-				//this call is ok if mainFileContainer is null
-				resolvedFile= FileUtils.newFileUtils().resolveFile(mainFileContainer, systemId);
-			} catch (BuildException be) {
-				return null;
-			}
-		} else {
-			resolvedFile= file.getLocation().toFile();
-		}
-		
-		if (resolvedFile != null && resolvedFile.exists()) {
-			try {
-				return new InputSource(new FileReader(resolvedFile));
-			} catch (FileNotFoundException e) {
-				return null;
-			}
-		}
-			
-		return super.resolveEntity(publicId, systemId);
-	}
-}
\ No newline at end of file
diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/AntEditorSourceViewerConfiguration.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/AntEditorSourceViewerConfiguration.java
deleted file mode 100644
index 5acc2d9..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/AntEditorSourceViewerConfiguration.java
+++ /dev/null
@@ -1,271 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2003 GEBIT Gesellschaft fuer EDV-Beratung
- * und Informatik-Technologien mbH, 
- * Berlin, Duesseldorf, Frankfurt (Germany) and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     GEBIT Gesellschaft fuer EDV-Beratung und Informatik-Technologien mbH - initial API and implementation
- * 	   IBM Corporation - bug 24108
- *******************************************************************************/
-
-package org.eclipse.ant.ui.internal.editor;
-
-import org.eclipse.ant.ui.internal.editor.derived.HTMLTextPresenter;
-import org.eclipse.ant.ui.internal.editor.text.AntEditorPartitionScanner;
-import org.eclipse.ant.ui.internal.editor.text.AntEditorProcInstrScanner;
-import org.eclipse.ant.ui.internal.editor.text.AntEditorTagScanner;
-import org.eclipse.ant.ui.internal.editor.text.IAntEditorColorConstants;
-import org.eclipse.ant.ui.internal.editor.text.NonRuleBasedDamagerRepairer;
-import org.eclipse.ant.ui.internal.editor.text.NotifyingReconciler;
-import org.eclipse.ant.ui.internal.editor.text.XMLAnnotationHover;
-import org.eclipse.ant.ui.internal.editor.text.XMLReconcilingStrategy;
-import org.eclipse.ant.ui.internal.editor.text.XMLTextHover;
-import org.eclipse.ant.ui.internal.model.AntUIPlugin;
-import org.eclipse.ant.ui.internal.model.ColorManager;
-import org.eclipse.ant.ui.internal.preferences.AntEditorPreferenceConstants;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.preference.PreferenceConverter;
-import org.eclipse.jface.text.DefaultInformationControl;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.IInformationControl;
-import org.eclipse.jface.text.IInformationControlCreator;
-import org.eclipse.jface.text.ITextHover;
-import org.eclipse.jface.text.TextAttribute;
-import org.eclipse.jface.text.contentassist.ContentAssistant;
-import org.eclipse.jface.text.contentassist.IContentAssistant;
-import org.eclipse.jface.text.presentation.IPresentationReconciler;
-import org.eclipse.jface.text.presentation.PresentationReconciler;
-import org.eclipse.jface.text.reconciler.IReconciler;
-import org.eclipse.jface.text.rules.DefaultDamagerRepairer;
-import org.eclipse.jface.text.rules.Token;
-import org.eclipse.jface.text.source.IAnnotationHover;
-import org.eclipse.jface.text.source.ISourceViewer;
-import org.eclipse.jface.text.source.SourceViewerConfiguration;
-import org.eclipse.jface.util.PropertyChangeEvent;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.RGB;
-import org.eclipse.swt.widgets.Shell;
-
-/**
- * The source viewer configuration for the Ant Editor.
- */
-public class AntEditorSourceViewerConfiguration extends SourceViewerConfiguration {
-
-    private AntEditorTagScanner tagScanner;
-    private AntEditorProcInstrScanner instructionScanner;
-	private NonRuleBasedDamagerRepairer damageRepairer;
-        
-    private AntEditor fEditor;
-
-    private XMLTextHover fTextHover;
-    
-    private ContentAssistant contentAssistant;
-    
-    /**
-     * Creates an instance with the specified color manager.
-     */
-    public AntEditorSourceViewerConfiguration(AntEditor editor) {
-	    super();
-	    fEditor= editor;
-    }    
-
-    /* (non-Javadoc)
-     * @see org.eclipse.jface.text.source.SourceViewerConfiguration#getContentAssistant(ISourceViewer)
-     */
-    public IContentAssistant getContentAssistant(ISourceViewer sourceViewer) {
-        contentAssistant= new ContentAssistant();
-        AntEditorCompletionProcessor processor = new AntEditorCompletionProcessor(); 
-		contentAssistant.setContentAssistProcessor(processor, IDocument.DEFAULT_CONTENT_TYPE);
-		contentAssistant.setContentAssistProcessor(processor, AntEditorPartitionScanner.XML_TAG);
-        
-		IPreferenceStore store= AntUIPlugin.getDefault().getPreferenceStore();
-		
-		String triggers= store.getString(AntEditorPreferenceConstants.CODEASSIST_AUTOACTIVATION_TRIGGERS);
-		if (triggers != null) {
-			processor.setCompletionProposalAutoActivationCharacters(triggers.toCharArray());
-		}
-				
-		contentAssistant.enableAutoInsert(store.getBoolean(AntEditorPreferenceConstants.CODEASSIST_AUTOINSERT));
-		contentAssistant.enableAutoActivation(store.getBoolean(AntEditorPreferenceConstants.CODEASSIST_AUTOACTIVATION));
-		contentAssistant.setAutoActivationDelay(store.getInt(AntEditorPreferenceConstants.CODEASSIST_AUTOACTIVATION_DELAY));
-		contentAssistant.setProposalPopupOrientation(ContentAssistant.PROPOSAL_OVERLAY);
-		contentAssistant.setContextInformationPopupOrientation(ContentAssistant.CONTEXT_INFO_ABOVE);
-		contentAssistant.setInformationControlCreator(getInformationControlCreator(sourceViewer));
-
-		ColorManager manager= ColorManager.getDefault();	
-		Color background= getColor(store, AntEditorPreferenceConstants.CODEASSIST_PROPOSALS_BACKGROUND, manager);			
-		contentAssistant.setContextInformationPopupBackground(background);
-		contentAssistant.setContextSelectorBackground(background);
-		contentAssistant.setProposalSelectorBackground(background);
-
-		Color foreground= getColor(store, AntEditorPreferenceConstants.CODEASSIST_PROPOSALS_FOREGROUND, manager);
-		contentAssistant.setContextInformationPopupForeground(foreground);
-		contentAssistant.setContextSelectorForeground(foreground);
-		contentAssistant.setProposalSelectorForeground(foreground);
-			
-        IInformationControlCreator creator = getInformationControlCreator(true);
-		contentAssistant.setInformationControlCreator(creator);
-
-        return contentAssistant;
-    }
-
-    protected IInformationControlCreator getInformationControlCreator(final boolean cutDown) {
-        return new IInformationControlCreator() {
-            public IInformationControl createInformationControl(Shell parent) {
-                int style= cutDown ? SWT.NONE : (SWT.V_SCROLL | SWT.H_SCROLL);
-                return new DefaultInformationControl(parent, style, new HTMLTextPresenter(cutDown));
-            }
-        };
-    }
-
-    /* (non-Javadoc)
-     * Method declared on SourceViewerConfiguration
-     */
-    public String[] getConfiguredContentTypes(ISourceViewer sourceViewer) {
-        return new String[] {
-            IDocument.DEFAULT_CONTENT_TYPE,
-            AntEditorPartitionScanner.XML_COMMENT,
-            AntEditorPartitionScanner.XML_TAG };
-    }
-    
-    /**
-     * @return TAB_WIDTH
-     * @see SourceViewerConfiguration#getTabWidth(org.eclipse.jface.text.source.ISourceViewer)
-     */
-    public int getTabWidth(ISourceViewer sourceViewer) {
-        return AntEditor.TAB_WIDTH;
-    }
-    
-    private AntEditorProcInstrScanner getDefaultScanner() {
-        if (instructionScanner == null) {
-            instructionScanner = new AntEditorProcInstrScanner();
-            instructionScanner.setDefaultReturnToken(
-                new Token(
-                    new TextAttribute(AntUIPlugin.getPreferenceColor(IAntEditorColorConstants.P_DEFAULT))));
-        }
-        return instructionScanner;
-    }
-    
-	private AntEditorTagScanner getTagScanner() {
-        if (tagScanner == null) {
-            tagScanner = new AntEditorTagScanner();
-            tagScanner.setDefaultReturnToken(
-                new Token(new TextAttribute(AntUIPlugin.getPreferenceColor(IAntEditorColorConstants.P_TAG))));
-        }
-        return tagScanner;
-    }
-    
-    
-    public IPresentationReconciler getPresentationReconciler(ISourceViewer sourceViewer) {
-        PresentationReconciler reconciler = new PresentationReconciler();
-
-        DefaultDamagerRepairer dr = new DefaultDamagerRepairer(getDefaultScanner());
-        reconciler.setDamager(dr, IDocument.DEFAULT_CONTENT_TYPE);
-        reconciler.setRepairer(dr, IDocument.DEFAULT_CONTENT_TYPE);
-
-        dr = new DefaultDamagerRepairer(getTagScanner());
-        reconciler.setDamager(dr, AntEditorPartitionScanner.XML_TAG);
-        reconciler.setRepairer(dr, AntEditorPartitionScanner.XML_TAG);
-
-		damageRepairer= new NonRuleBasedDamagerRepairer(
-                new TextAttribute(AntUIPlugin.getPreferenceColor(IAntEditorColorConstants.P_XML_COMMENT)));
-        reconciler.setDamager(damageRepairer, AntEditorPartitionScanner.XML_COMMENT);
-        reconciler.setRepairer(damageRepairer, AntEditorPartitionScanner.XML_COMMENT);
-
-        return reconciler;
-    }
-
-
-	/**
-	 * Preference colors have changed.  
-	 * Update the default tokens of the scanners.
-	 */
-	public void updateScanners() {
-		tagScanner.setDefaultReturnToken(
-				new Token(new TextAttribute(AntUIPlugin.getPreferenceColor(IAntEditorColorConstants.P_TAG))));
-				
-		instructionScanner.setDefaultReturnToken(
-			   new Token(
-				   new TextAttribute(AntUIPlugin.getPreferenceColor(IAntEditorColorConstants.P_DEFAULT))));
-				   
-		damageRepairer.setDefaultTextAttribute(new TextAttribute(AntUIPlugin.getPreferenceColor(IAntEditorColorConstants.P_XML_COMMENT)));				  
-	}
-
-    /*
-     * @see SourceViewerConfiguration#getReconciler(ISourceViewer)
-     */
-    public IReconciler getReconciler(ISourceViewer sourceViewer) {
-	    NotifyingReconciler reconciler= new NotifyingReconciler(new XMLReconcilingStrategy(fEditor), false);
-	    reconciler.setDelay(500);
-	    return reconciler;
-    }
-
-	/*
-	 * @see org.eclipse.jface.text.source.SourceViewerConfiguration#getAnnotationHover(org.eclipse.jface.text.source.ISourceViewer)
-	 */
-	public IAnnotationHover getAnnotationHover(ISourceViewer sourceViewer) {
-		return new XMLAnnotationHover();
-	}
-
-	/*
-	 * @see org.eclipse.jface.text.source.SourceViewerConfiguration#getInformationControlCreator(org.eclipse.jface.text.source.ISourceViewer)
-	 */
-	public IInformationControlCreator getInformationControlCreator(ISourceViewer sourceViewer) {
-		return getInformationControlCreator(true);
-	}
-
-	/*
-	 * @see org.eclipse.jface.text.source.SourceViewerConfiguration#getTextHover(org.eclipse.jface.text.source.ISourceViewer, java.lang.String)
-	 */
-	public ITextHover getTextHover(ISourceViewer sourceViewer, String contentType) {
-		if (fTextHover == null) {
-			fTextHover= new XMLTextHover();
-		}
-		return fTextHover;
-	}
-
-	private Color getColor(IPreferenceStore store, String key, ColorManager manager) {
-		RGB rgb= PreferenceConverter.getColor(store, key);
-		return manager.getColor(rgb);
-	}
-	
-	protected void changeConfiguration(PropertyChangeEvent event) {
-		IPreferenceStore store= AntUIPlugin.getDefault().getPreferenceStore();
-		String p= event.getProperty();
-
-		ColorManager manager= ColorManager.getDefault();
-		if (AntEditorPreferenceConstants.CODEASSIST_AUTOACTIVATION.equals(p)) {
-			boolean enabled= store.getBoolean(AntEditorPreferenceConstants.CODEASSIST_AUTOACTIVATION);
-			contentAssistant.enableAutoActivation(enabled);
-		} else if (AntEditorPreferenceConstants.CODEASSIST_AUTOACTIVATION_DELAY.equals(p)) {
-			int delay= store.getInt(AntEditorPreferenceConstants.CODEASSIST_AUTOACTIVATION_DELAY);
-			contentAssistant.setAutoActivationDelay(delay);
-		} else if (AntEditorPreferenceConstants.CODEASSIST_PROPOSALS_FOREGROUND.equals(p)) {
-			Color c= getColor(store, AntEditorPreferenceConstants.CODEASSIST_PROPOSALS_FOREGROUND, manager);
-			contentAssistant.setProposalSelectorForeground(c);
-		} else if (AntEditorPreferenceConstants.CODEASSIST_PROPOSALS_BACKGROUND.equals(p)) {
-			Color c= getColor(store, AntEditorPreferenceConstants.CODEASSIST_PROPOSALS_BACKGROUND, manager);
-			contentAssistant.setProposalSelectorBackground(c);
-		} else if (AntEditorPreferenceConstants.CODEASSIST_AUTOINSERT.equals(p)) {
-			boolean enabled= store.getBoolean(AntEditorPreferenceConstants.CODEASSIST_AUTOINSERT);
-			contentAssistant.enableAutoInsert(enabled);
-		} else if (AntEditorPreferenceConstants.CODEASSIST_AUTOACTIVATION_TRIGGERS.equals(p)) {
-			changeContentAssistProcessor(store);
-		}
-	}
-	
-	private void changeContentAssistProcessor(IPreferenceStore store) {
-		String triggers= store.getString(AntEditorPreferenceConstants.CODEASSIST_AUTOACTIVATION_TRIGGERS);
-		if (triggers != null) {
-			AntEditorCompletionProcessor cp= (AntEditorCompletionProcessor)contentAssistant.getContentAssistProcessor(IDocument.DEFAULT_CONTENT_TYPE);
-			if (cp != null) {
-				cp.setCompletionProposalAutoActivationCharacters(triggers.toCharArray());
-			}
-		}		
-	}
-}
diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/EnclosingTargetSearchingHandler.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/EnclosingTargetSearchingHandler.java
deleted file mode 100644
index f337037..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/EnclosingTargetSearchingHandler.java
+++ /dev/null
@@ -1,212 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2003 GEBIT Gesellschaft fuer EDV-Beratung
- * und Informatik-Technologien mbH, 
- * Berlin, Duesseldorf, Frankfurt (Germany) and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     GEBIT Gesellschaft fuer EDV-Beratung und Informatik-Technologien mbH - initial API and implementation
- * 	   IBM Corporation - bug 24108
- *******************************************************************************/
-
-package org.eclipse.ant.ui.internal.editor;
-
-import java.io.File;
-
-import javax.xml.parsers.ParserConfigurationException;
-
-import org.eclipse.ant.ui.internal.model.AntUIPlugin;
-import org.w3c.dom.Element;
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXException;
-
-/**
- * SAX Parsing Handler that determines the enclosing target task element in
- * respect to a specified cursor position.
- * 
- * @author Alf Schiefelbein
- */
-public class EnclosingTargetSearchingHandler extends AntEditorSaxDefaultHandler {
-
-	/**
-	 * Whether the enclosing target element has been determined.
-	 * <P>
-	 * This is the case if the method 
-	 * <code>determineEnclosingTargetTaskElement</code> has been called once.
-	 */
-	protected boolean enclosingTargetElementDetermined;
-
-    /**
-     * Creates an EnclosingTargetSearchingHandler, with the specified parameters.
-     * 
-     * @param aRowOfCursorPosition the startingRow where the cursor is located in the
-     * document. The first startingRow is refered to with an index of '0'.
-     * @param aColumnOfCursorPosition the startingColumn where the cursor is located in
-     * the document. The first startingColumn is refered to with an index of '0'.
-     */
-    public EnclosingTargetSearchingHandler(File mainFileContainer, int aRowOfCursorPosition, int aColumnOfCursorPosition) throws ParserConfigurationException {
-    	super(mainFileContainer, aRowOfCursorPosition, aColumnOfCursorPosition);
-    }
-
-    /* (non-Javadoc)
-     * @see org.xml.sax.ContentHandler#endElement(String, String, String)
-     */
-    public void endElement(String aUri, String aLocalName, String aQualifiedName)
-        throws SAXException {
-
-		if (AntUIPlugin.getDefault() != null && AntUIPlugin.getDefault().isDebugging()) {
-        	AntUIPlugin.log("AntEditorSaxDefaultHandler.endElement(" +aUri+ ", " +aLocalName+ ", "+aQualifiedName+ ")", null); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-		}
-
-        if(parsingFinished) {
-            return;
-        }        
-        
-        // Checks wether we know the parent for sure
-        boolean tempParentKnown = checkForParentElement();
-        
-        String tempTagName = aLocalName.length() > 0 ? aLocalName : aQualifiedName;
-
-		if(tempTagName.equals("target")) { //$NON-NLS-1$
-			if(!stillOpenElements.isEmpty()) {        
-		        Element tempLastStillOpenElement = (Element)stillOpenElements.peek(); 
-		        if(tempLastStillOpenElement != null && tempLastStillOpenElement.getTagName().equals(tempTagName)) {
-		            stillOpenElements.pop();
-		            
-		            if(!stillOpenElements.empty()) {
-		                Element tempSecondLastStillOpenElement = (Element)stillOpenElements.peek();
-		                tempSecondLastStillOpenElement.appendChild(tempLastStillOpenElement);
-		            }
-		            if(tempParentKnown && parentElement != null && parentElement.getTagName().equals(tempTagName)) {
-		                parsingFinished = true;
-		            }
-		        }
-			}
-		}
-    }
-
-    /* (non-Javadoc)
-     * @see org.xml.sax.ContentHandler#startElement(String, String, String, Attributes)
-     */
-    public void startElement(
-        String aUri,
-        String aLocalName,
-        String aQualifiedName,
-        Attributes anAttributes)
-        throws SAXException {
-        /*
-         * While the crimson parser passes the tag name as local name, apache's
-         * xerces parser, passes the tag name as qualilfied name and an empty 
-         * string as local name.
-         */
-        
-		 if (AntUIPlugin.getDefault() != null && AntUIPlugin.getDefault().isDebugging()) {
-			AntUIPlugin.log("AntEditorSaxDefaultHandler.startElement(" +aUri+ ", " +aLocalName+ ", "+aQualifiedName+ ", "+anAttributes+ ")", null); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
-        }
-        if(parsingFinished) {
-            return;
-        }        
-
-        // Checks wether we know the parent for sure
-        checkForParentElement();
-
-        // Create a Dom Element
-        String tempTagName = aLocalName.length() > 0 ? aLocalName : aQualifiedName;
-        if(tempTagName == null || tempTagName.length() == 0) {
-            throw new AntEditorException(AntEditorMessages.getString("EnclosingTargetSearchingHandler.Error_parsing")); //$NON-NLS-1$
-        }
-		
-		if(tempTagName.equals("target")) { //$NON-NLS-1$
-	        Element tempElement = document.createElement(tempTagName);
-	        String tempTargetName = anAttributes.getValue("name"); //$NON-NLS-1$
-	        if(tempTargetName != null && tempTargetName.length() > 0) {
-		        tempElement.setAttribute("name", tempTargetName); //$NON-NLS-1$
-	        }
-	        stillOpenElements.push(tempElement);
-		}
-    }
-
-    /**
-     * Checks whether the enclosing task element, that we are searching for can
-     * be or has already been determined.
-     * <P>
-     * This will be done by comparing the current parsing position with the
-     * cursor position. If we just passed the cursor position and the enclosing
-     * task element has not been set yet, it will be set.
-     * 
-     * @return <code>true</code> if the enclosing task element is known 
-     * otherwise <code>false</code>
-     */
-    protected boolean checkForParentElement() {
-        if(parentElement == null && !enclosingTargetElementDetermined) {
-            if(locator != null) {
-
-                /*
-                 * The locator's numbers are 1-based though, we do everything
-                 * 0-based.
-                 */
-
-                int tempLineNr = locator.getLineNumber() -1;
-                int tempColumnNr = locator.getColumnNumber() -1;
-                if(tempLineNr> rowOfCursorPosition ||
-                    (tempLineNr == rowOfCursorPosition && tempColumnNr > columnOfCursorPosition)) {
-                        determineEnclosingTargetTaskElement();
-	                    return true;
-                    }
-            }
-            return false;
-        }
-        
-        // Parent element has been set already before
-        return true;
-    }
-
-	
-	/**
-	 * Determines the enclosing target task element.
-	 * <P>
-	 * This Method shall only be called if the parser has passed the cursor 
-	 * position allready.
-	 */
-    protected void determineEnclosingTargetTaskElement() {
-        while(parentElement == null && !stillOpenElements.empty()) {
-            Element tempElement = (Element)stillOpenElements.pop();
-            if(tempElement.getTagName().equals("target")) { //$NON-NLS-1$
-                parentElement = tempElement;
-				if (AntUIPlugin.getDefault() != null && AntUIPlugin.getDefault().isDebugging()) {
-					AntUIPlugin.log("EnclosingTargetSearchingHandler.checkForParentElement(): Enclosing target element found: " +parentElement, null); //$NON-NLS-1$
-                }
-            }
-        }
-    	enclosingTargetElementDetermined = true;
-    }
-    
-    /**
-     * Returns the enclosing target task element that has been determined 
-     * during a prior parsing.
-     * <P>
-     * It is quite common that parsing stopped before the current cursor 
-     * position. That happens when the parser finds an error within the parsed 
-     * document before. In that case the parent element might be guessed to be
-     * the one that opened last. To tell the handler wether the parent should
-     * be guessed, <code>aGuessParentFlag</code> may be specified.
-     * 
-     * @param aGuessParentFlag wether the parent should be guessed
-     * @return the parent element or <code>null</code> if not known.
-     */
-    public Element getParentElement(boolean aGuessParentFlag) {
-        if(enclosingTargetElementDetermined) {
-            return parentElement;
-        }
-        if(aGuessParentFlag) {
-            if(!stillOpenElements.empty()) {
-            	determineEnclosingTargetTaskElement();
-                return parentElement;
-            }
-        }
-        return null;
-    }
-}
diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/TaskDescriptionProvider.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/TaskDescriptionProvider.java
deleted file mode 100644
index 0f832f3..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/TaskDescriptionProvider.java
+++ /dev/null
@@ -1,413 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2003 GEBIT Gesellschaft fuer EDV-Beratung
- * und Informatik-Technologien mbH, 
- * Berlin, Duesseldorf, Frankfurt (Germany) and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     GEBIT Gesellschaft fuer EDV-Beratung und Informatik-Technologien mbH - initial API and implementation
- * 	   IBM Corporation - bug 24108
- *******************************************************************************/
-
-package org.eclipse.ant.ui.internal.editor;
-
-import java.io.IOException;
-import java.net.URL;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-
-import org.eclipse.ant.ui.internal.model.AntUIPlugin;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.Text;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-
-/**
- * The <code>TaskDescriptionProvider</code> provides the additional descriptions
- * for tasks and attributes for the code assist.
- * <P>
- * Descriptions for task are originally provided with the XML file
- * <code>TASKS_DESCRIPTION_XML_FILE_NAME</code>. This file is parsed by the
- * provider and requested descriptions are returned.
- * <P>
- * Check out the documentation for the public methods of this class. 
- * 
- * @author Alf Schiefelbein
- * @author HJ
- */
-public class TaskDescriptionProvider {
-
-    /**
-     * The file that contains all task descriptions.
-     * <P>
-     * The value is "/anttasks_1.5b.xml".
-     */
-    public static String TASKS_DESCRIPTION_XML_FILE_NAME = "/anttasks_1.5b.xml"; //$NON-NLS-1$
-
-    public static String XML_TAG_TASKS = "tasks"; //$NON-NLS-1$
-    public static String XML_TAG_TASK = "task"; //$NON-NLS-1$
-    public static String XML_TAG_ELEMENTS = "elements"; //$NON-NLS-1$
-    public static String XML_TAG_ATTRIBUTE = "attribute"; //$NON-NLS-1$
-    public static String XML_TAG_ATTRIBUTES = "attributes"; //$NON-NLS-1$
-    public static String XML_TAG_ELEMENT = "element"; //$NON-NLS-1$
-    public static String XML_TAG_STRUCTURE = "structure"; //$NON-NLS-1$
-    public static String XML_TAG_DESCRIPTION = "short-description"; //$NON-NLS-1$
-    public static String XML_ATTRIBUTE_NAME = "name"; //$NON-NLS-1$
-    public static String XML_ATTRIBUTE_REQUIRED = "required"; //$NON-NLS-1$
-    
-
-    protected Map taskNodes = new HashMap();
-    
-
-    /**
-     * Creates an initialized instance.
-     */
-    public TaskDescriptionProvider() {
-        initialize();
-    }
-
-    
-    /**
-     * Parses the task description xml file and stores the information.
-     */
-    protected void initialize() {
-        Document tempDocument = parseFile(TASKS_DESCRIPTION_XML_FILE_NAME);
-        Node tempRootNode = tempDocument.getDocumentElement();
-        NodeList tempChildNodes = tempRootNode.getChildNodes();
-        for(int i=0; i<tempChildNodes.getLength(); i++) {
-            Node tempNode = tempChildNodes.item(i);
-            if(tempNode.getNodeType() == Node.ELEMENT_NODE) {
-                String tempTagName = tempNode.getNodeName();
-                if(tempTagName.equals(XML_TAG_TASK)) {
-                    NamedNodeMap tempAttributes = tempNode.getAttributes();
-                    Node tempAttributeNode = tempAttributes.getNamedItem(XML_ATTRIBUTE_NAME);
-                    if(tempAttributeNode != null) {
-                        String tempTaskName = tempAttributeNode.getNodeValue();
-                        if(tempTaskName != null) {
-                            taskNodes.put(tempTaskName, tempNode);
-                        }
-                    }
-                }
-            }
-        }
-    }
-    
-
-    /**
-     * Returns the (DOM) document as a result of parsing the file with the 
-     * specified file name.
-     * <P>
-     * The file will be loaded as resource, thus must begin with '/' and must
-     * be relative to the classpath.
-     */
-    protected Document parseFile(String aFileName) {
-        Document tempDocument = null;
-
-        DocumentBuilderFactory tempFactory = DocumentBuilderFactory.newInstance();
-        tempFactory.setIgnoringComments(true);
-        tempFactory.setIgnoringElementContentWhitespace(true);
-        tempFactory.setCoalescing(true);
-
-        try {
-            DocumentBuilder tempDocBuilder = tempFactory.newDocumentBuilder();
-            URL tempURL = getClass().getResource(aFileName);
-            InputSource tempInputSource = new InputSource(tempURL.toExternalForm());
-            tempDocument = tempDocBuilder.parse(tempInputSource);
-        } catch (ParserConfigurationException e) {
-			AntUIPlugin.log(e);
-        }
-        catch (IOException ioException) {
-			AntUIPlugin.log(ioException);
-        }
-        catch (SAXException saxException) {
-			AntUIPlugin.log(saxException);
-        }
-
-        return tempDocument;
-    }
-
-    /**
-     * Returns the description string for the specified task.
-     * 
-     * @return description string or <code>null</code> if task not known or
-     * no description available.
-     */
-    public String getDescriptionForTask(String aTaskName) {
-        Element tempTaskElement = (Element)taskNodes.get(aTaskName);
-        if(tempTaskElement != null) {
-            return getDescriptionOfNode(tempTaskElement);
-        }
-        return null;
-    }
-
-
-    /**
-     * Returns the description of the specified node.
-     * <P>
-     * The node must be either one of task node or attribute node.
-     */
-    protected String getDescriptionOfNode(Node aNode) {
-        NodeList tempChildNodes = aNode.getChildNodes();
-        for (int i=0; i<tempChildNodes.getLength(); i++) {
-            Node tempNode = (Node) tempChildNodes.item(i);
-            if(tempNode instanceof Element && XML_TAG_DESCRIPTION.equals(tempNode.getNodeName())) {
-                Element tempDescriptionElement = (Element)tempNode;
-                Node tempChildNode = tempDescriptionElement.getFirstChild();
-                if(tempChildNode instanceof Text) {
-                    return ((Text)tempChildNode).getData();
-                }
-                break; 
-            }
-        }
-        return null;
-    }
-    
-    /**
-     * Returns the Required value of the specified node.
-     * <P>
-     * Currently the XML file has Required defined as NOTDEFINED in
-     * some cases. If so the value returned is an empty string
-     */
-    protected String getRequiredOfNode(Node aNode) {
-    	
-    	String tmpNodeName = aNode.getNodeName();
-    	String tmpRequiredValue = null;
-    	
-   		if(aNode.getNodeType() == Node.ELEMENT_NODE && 
-   			(XML_TAG_ATTRIBUTE.equals(tmpNodeName) || XML_TAG_ELEMENT.equals(tmpNodeName)) ) {
-        	  
-        	  tmpRequiredValue = aNode.getAttributes().getNamedItem(XML_ATTRIBUTE_REQUIRED).getNodeValue();
-   		}
-   		
-   		if(tmpRequiredValue == null || tmpRequiredValue.equals("NOTDEFINED")) { //$NON-NLS-1$
-   			return ""; //$NON-NLS-1$
-   		}
-   		
-   		return tmpRequiredValue;
-                   
-    }
-
-    
-    /**
-     * Returns the description string for the specified attribute of the the 
-     * specified task.
-     * 
-     * @return description string or <code>null</code> if task or attribute 
-     * not known or no description available.
-     */
-    public String getDescriptionForTaskAttribute(String aTaskName, String anAttributeName) {
-        
-        String tmpDescription = null;	
-        	
-        Node tmpAttributesNode = getAttributesNode(aTaskName);
-        	
-        if(tmpAttributesNode != null) {
-        	
-        	tmpDescription = getDescriptionForNodeNamedWithNameInNodeList( XML_TAG_ATTRIBUTE, anAttributeName,
-        																tmpAttributesNode.getChildNodes());															
-    		//If Description is null we try the elements section else we're satisfied.
-    		if( tmpDescription != null ) {
-    			return tmpDescription;
-    		}
-        }
-        //Not yet found. Try the elements Node
-    	tmpAttributesNode = getElementsNode(aTaskName);
-    	if(tmpAttributesNode != null) {
-    		tmpDescription = getDescriptionForNodeNamedWithNameInNodeList( XML_TAG_ELEMENT, anAttributeName,
-            														   tmpAttributesNode.getChildNodes());
-            
-            return tmpDescription;  
-            
-        }
-        return null;
-    }
-    
-	/**
-     * Returns the required string value for the specified attribute of the
-     * specified task.
-     * 
-     * @return required string or <code>null</code> if task or attribute not 
-     * known or no description available.
-     */
-    public String getRequiredAttributeForTaskAttribute(String aTaskName, String anAttributeName) {
- 
-        String tmpRequired = null;	
-        	
-        Node tmpAttributesNode = getAttributesNode(aTaskName);
-        	
-        if(tmpAttributesNode != null) {
-        	
-        	tmpRequired = getRequiredForNodeNamedWithNameInNodeList( XML_TAG_ATTRIBUTE, anAttributeName,
-        																tmpAttributesNode.getChildNodes());															
-    		
-    		//If Required is null we try the elements section else we're satisfied.
-    		if( tmpRequired != null ) {
-    			return tmpRequired;
-    		}
-        }
-        
-        //Not yet found. Try the elements Node
-    	tmpAttributesNode = getElementsNode(aTaskName);
-    	if(tmpAttributesNode != null) {
-    		tmpRequired = getDescriptionForNodeNamedWithNameInNodeList( XML_TAG_ELEMENT, anAttributeName,
-            														   tmpAttributesNode.getChildNodes());
-            //Return it even if its null
-            return tmpRequired;  
-            
-        }
-        
-        //Not found return null
-        return null;
-    }
-    
-    /**
-     * Returns the Elements Node of the specified TaskName
-     * 
-     * @param aTaskName The name of the task
-     * @param return The Elements Node of the Task.
-     */
-    protected Node getElementsNode(String aTaskName) {
-    	
-    	Node tmpStructureNode = getStructureNode(aTaskName);
-    	if(tmpStructureNode != null) {
-    		return getChildNodeNamedOfTypeFromNode(XML_TAG_ELEMENTS, Node.ELEMENT_NODE,
-    												tmpStructureNode);
-    	}
-    	else {
-    		return null;
-    	}
-    }
-    
-    /**
-     * Returns the Attributes Node of the specified TaskName
-     * 
-     * @param aTaskName The name of the task
-     * @param return The Attributes Node of the Task or <code>null</code> if one
-     * does not exist.
-     */    
-    protected Node getAttributesNode(String aTaskName) {
-    	
-        Node tmpStructureNode = getStructureNode(aTaskName);
-        if(tmpStructureNode != null){
-        	return getChildNodeNamedOfTypeFromNode(XML_TAG_ATTRIBUTES, Node.ELEMENT_NODE,
-                                                             tmpStructureNode);
-    	} else {
-    		return null;
-    	}
-    }
-
-    /**
-     * Returns the Structure Node of the specified TaskName
-     * 
-     * @param aTaskName The name of the task
-     * @param return The Structure Node of the Task.
-     */        
-    protected Node getStructureNode(String aTaskName) {	
-    	Element tempTaskElement = (Element)taskNodes.get(aTaskName);
-        if(tempTaskElement != null) {
-        	//Dig us down to the Structure node
-        	Node tmpStructureNode = getChildNodeNamedOfTypeFromNode(XML_TAG_STRUCTURE, Node.ELEMENT_NODE,
-        	                                                     tempTaskElement);
-        	return tmpStructureNode;
-        }
-        else {
-        	return null;
-        }
-    }
-    
-    /**
-     * Returns the Description for a Node satisfying the criterias in the
-     * NodeList given as Argument.
-     * 
-     * @param aNodeName The Name of the Node
-     * @param anAttributeName The string of the Name value
-     * @param anAttributesNodeList The NodeList to search in.
-     * @return The Description found or null if none is found
-     */
-    protected String getDescriptionForNodeNamedWithNameInNodeList( String aNodeName, String anAttributeName,
-    																 NodeList anAttributesNodeList) {
-    	for (int i=0; i<anAttributesNodeList.getLength(); i++) {
-                Node tempNode = (Node) anAttributesNodeList.item(i);
-                if(tempNode.getNodeType() == Node.ELEMENT_NODE && aNodeName.equals(tempNode.getNodeName())) {
-                	if( anAttributeName.equals(getTaskAttributeName(tempNode)) ) {
-                    	return getDescriptionOfNode(tempNode);
-                	}
-                }
-        }
-        
-        //Not found
-        return null;																 	
-	}
-	
-	
-    /**
-     * Returns the Name of Task Attribute.
-     * 
-     * @return The Name of the Attribute.
-     */
-    public String getTaskAttributeName(Node aTaskAttributeNode) {
-    	NamedNodeMap tmpNamedNodeMap = aTaskAttributeNode.getAttributes();	
-    	return tmpNamedNodeMap.getNamedItem(XML_ATTRIBUTE_NAME).getNodeValue();
-    }
-    
-    /**
-     * Returns the ChildNode of the node defined by the Arguments. The
-     * first child found matching the criterias is returned.
-     * 
-     * @param aNodeName The Name of the Node to return.
-     * @param aType The Type of the node @see Node
-     * @param aParentNode The Node to get the child from
-     * 
-     * @return The First Child Node found matching the criterias,
-     * or null if none is found.
-     */
-    protected Node getChildNodeNamedOfTypeFromNode(String aNodeName, short aNodeType, Node aParentNode) {
-    
-    	NodeList tmpNodeList = aParentNode.getChildNodes();
-		for(int i=0; i<tmpNodeList.getLength(); ++i ) {
-			Node tmpNode = tmpNodeList.item(i);
-			if( (tmpNode.getNodeType() == aNodeType) && aNodeName.equals(tmpNode.getNodeName()) ) {
-				return tmpNode;
-			}
-		}
-		//Not found
-		return null;    	
-    }
-    
-     /**
-     * Returns the Required Field for a Node satisfying the criterias in the
-     * NodeList given as Argument.
-     * 
-     * @param aNodeName The Name of the Node
-     * @param anAttributeName The string of the Name value
-     * @param anAttributesNodeList The NodeList to search in.
-     * @return The Description found or null if none is found
-     */
-    protected String getRequiredForNodeNamedWithNameInNodeList( String aNodeName, String anAttributeName,
-    																 NodeList anAttributesNodeList) {
-    	for (int i=0; i<anAttributesNodeList.getLength(); i++) {
-                Node tempNode = (Node) anAttributesNodeList.item(i);
-                if(tempNode.getNodeType() == Node.ELEMENT_NODE && aNodeName.equals(tempNode.getNodeName())) {
-                	if( anAttributeName.equals(getTaskAttributeName(tempNode)) ) {
-                    	return getRequiredOfNode(tempNode);
-                	}
-                }
-        }
-        
-        //Not found
-        return null;																 	
-	}
-
-
-}
diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/derived/HTML2TextReader.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/derived/HTML2TextReader.java
deleted file mode 100644
index 2dddec8..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/derived/HTML2TextReader.java
+++ /dev/null
@@ -1,295 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.ui.internal.editor.derived;
-
-
-import java.io.IOException;
-import java.io.PushbackReader;
-import java.io.Reader;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.jface.text.TextPresentation;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.StyleRange;
-
-/**
- * Reads the text contents from a reader of HTML contents and translates 
- * the tags or cut them out.
- * 
- * @see org.eclipse.jdt.internal.ui.text.HTML2TextReader
- */
-public class HTML2TextReader extends SubstitutionTextReader {
-	
-	private static final String EMPTY_STRING= ""; //$NON-NLS-1$
-	private static final Map fgEntityLookup;
-	private static final Set fgTags;
-	
-	static {
-		
-		fgTags= new HashSet();
-		fgTags.add("b"); //$NON-NLS-1$
-		fgTags.add("br"); //$NON-NLS-1$
-		fgTags.add("h5"); //$NON-NLS-1$
-		fgTags.add("p"); //$NON-NLS-1$
-		fgTags.add("dl"); //$NON-NLS-1$
-		fgTags.add("dt"); //$NON-NLS-1$
-		fgTags.add("dd"); //$NON-NLS-1$
-		fgTags.add("li"); //$NON-NLS-1$
-		fgTags.add("ul"); //$NON-NLS-1$
-		fgTags.add("pre"); //$NON-NLS-1$
-		
-		fgEntityLookup= new HashMap(7);
-		fgEntityLookup.put("lt", "<"); //$NON-NLS-1$ //$NON-NLS-2$
-		fgEntityLookup.put("gt", ">"); //$NON-NLS-1$ //$NON-NLS-2$
-		fgEntityLookup.put("nbsp", " "); //$NON-NLS-1$ //$NON-NLS-2$
-		fgEntityLookup.put("amp", "&"); //$NON-NLS-1$ //$NON-NLS-2$
-		fgEntityLookup.put("circ", "^"); //$NON-NLS-1$ //$NON-NLS-2$
-		fgEntityLookup.put("tilde", "~"); //$NON-NLS-2$ //$NON-NLS-1$
-		fgEntityLookup.put("quot", "\"");		 //$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	private int fCounter= 0;
-	private TextPresentation fTextPresentation;
-	private int fBold= 0;
-	private int fStartOffset= -1;
-	private boolean fInParagraph= false;
-	private boolean fIsPreformattedText= false;
-	
-	/**
-	 * Transforms the html text from the reader to formatted text.
-	 * @param presentation If not <code>null</code>, formattings will be applied to 
-	 * the presentation.
-	*/
-	public HTML2TextReader(Reader reader, TextPresentation presentation) {
-		super(new PushbackReader(reader));
-		fTextPresentation= presentation;
-	}
-	
-	public int read() throws IOException {
-		int c= super.read();
-		if (c != -1)
-			++ fCounter;
-		return c;
-	}
-	
-	protected void startBold() {
-		if (fBold == 0)
-			fStartOffset= fCounter;
-		++ fBold;
-	}
-
-	protected void startPreformattedText() {
-		fIsPreformattedText= true;
-		setSkipWhitespace(false);
-	}
-
-	protected void stopPreformattedText() {
-		fIsPreformattedText= false;
-		setSkipWhitespace(true);
-	}
-	
-	protected void stopBold() {
-		-- fBold;
-		if (fBold == 0) {
-			if (fTextPresentation != null) {
-				fTextPresentation.addStyleRange(new StyleRange(fStartOffset, fCounter - fStartOffset, null, null, SWT.BOLD));
-			}
-			fStartOffset= -1;
-		}
-	}
-	
-	/**
-	 * @see SubstitutionTextReader#computeSubstitution(char)
-	 */
-	protected String computeSubstitution(int c) throws IOException {
-		
-		if (c == '<')
-			return  processHTMLTag();
-		else if (c == '&')
-			return processEntity();
-		else if (fIsPreformattedText)
-			return processPreformattedText(c);
-		
-		return null;
-	}
-
-	private String html2Text(String html) {
-		
-		String tag= html;
-		if ('/' == tag.charAt(0))
-			tag= tag.substring(1);
-			
-		if (!fgTags.contains(tag))
-			return EMPTY_STRING;
-
-
-		if ("pre".equals(html)) { //$NON-NLS-1$
-			startPreformattedText();
-			return EMPTY_STRING;
-		}
-
-		if ("/pre".equals(html)) { //$NON-NLS-1$
-			stopPreformattedText();
-			return EMPTY_STRING;
-		}
-
-		if (fIsPreformattedText)
-			return EMPTY_STRING;
-
-		if ("b".equals(html)) { //$NON-NLS-1$
-			startBold();
-			return EMPTY_STRING;
-		}
-				
-		if ("h5".equals(html) || "dt".equals(html)) { //$NON-NLS-1$ //$NON-NLS-2$
-			startBold();
-			return EMPTY_STRING;
-		}
-		
-		if ("dl".equals(html)) //$NON-NLS-1$
-			return LINE_DELIM;
-		
-		if ("dd".equals(html)) //$NON-NLS-1$
-			return "\t"; //$NON-NLS-1$
-		
-		if ("li".equals(html)) //$NON-NLS-1$
-			return LINE_DELIM + "\t-"; //$NON-NLS-1$
-					
-		if ("/b".equals(html)) { //$NON-NLS-1$
-			stopBold();
-			return EMPTY_STRING;
-		}
-
-		if ("p".equals(html))  { //$NON-NLS-1$
-			fInParagraph= true;
-			return LINE_DELIM;
-		}
-
-		if ("br".equals(html)) //$NON-NLS-1$
-			return LINE_DELIM;
-		
-		if ("/p".equals(html))  { //$NON-NLS-1$
-			boolean inParagraph= fInParagraph;
-			fInParagraph= false;
-			return inParagraph ? EMPTY_STRING : LINE_DELIM;
-		}
-			
-		if ("/h5".equals(html) || "/dt".equals(html)) { //$NON-NLS-1$ //$NON-NLS-2$
-			stopBold();
-			return LINE_DELIM;
-		}
-		
-		if ("/dd".equals(html)) //$NON-NLS-1$
-			return LINE_DELIM;
-				
-		return EMPTY_STRING;
-	}
-	
-	/*
-	 * A '<' has been read. Process a html tag
-	 */ 
-	private String processHTMLTag() throws IOException {
-		
-		StringBuffer buf= new StringBuffer();
-		int ch;
-		do {		
-			
-			ch= nextChar();
-			
-			while (ch != -1 && ch != '>') {
-				buf.append(Character.toLowerCase((char) ch));
-				ch= nextChar();
-				if (ch == '"'){
-					buf.append(Character.toLowerCase((char) ch));
-					ch= nextChar();
-					while (ch != -1 && ch != '"'){
-						buf.append(Character.toLowerCase((char) ch));
-						ch= nextChar();
-					}	
-				}
-				if (ch == '<'){
-					unread(ch);
-					return '<' + buf.toString();
-				}	
-			}
-			
-			if (ch == -1)
-				return null;
-			
-			int tagLen= buf.length();
-			// needs special treatment for comments 
-			if ((tagLen >= 3 && "!--".equals(buf.substring(0, 3))) //$NON-NLS-1$
-				&& !(tagLen >= 5 && "--!".equals(buf.substring(tagLen - 3)))) { //$NON-NLS-1$
-				// unfinished comment
-				buf.append(ch);
-			} else {
-				break;
-			}
-		} while (true);
-		 
-		return html2Text(buf.toString());
-	}
-
-	private String processPreformattedText(int c) {
-		if  (c == '\r' || c == '\n')
-			fCounter++;
-		return null;
-	}
-
-	
-	private void unread(int ch) throws IOException {
-		((PushbackReader) getReader()).unread(ch);
-	}
-	
-	protected String entity2Text(String symbol) {
-		if (symbol.length() > 1 && symbol.charAt(0) == '#') {
-			int ch;
-			try {
-				if (symbol.charAt(1) == 'x') {
-					ch= Integer.parseInt(symbol.substring(2), 16);
-				} else {
-					ch= Integer.parseInt(symbol.substring(1), 10);
-				}
-				return EMPTY_STRING + (char)ch;
-			} catch (NumberFormatException e) {
-			}
-		} else {
-			String str= (String) fgEntityLookup.get(symbol);
-			if (str != null) {
-				return str;
-			}
-		}
-		return "&" + symbol; // not found //$NON-NLS-1$
-	}
-	
-	/*
-	 * A '&' has been read. Process a entity
-	 */ 	
-	private String processEntity() throws IOException {
-		StringBuffer buf= new StringBuffer();
-		int ch= nextChar();
-		while (Character.isLetterOrDigit((char)ch) || ch == '#') {
-			buf.append((char) ch);
-			ch= nextChar();
-		}
-		
-		if (ch == ';') 
-			return entity2Text(buf.toString());
-		
-		buf.insert(0, '&');
-		if (ch != -1)
-			buf.append((char) ch);
-		return buf.toString();
-	}
-}
diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/derived/HTMLPrinter.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/derived/HTMLPrinter.java
deleted file mode 100644
index 272e01e..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/derived/HTMLPrinter.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.ui.internal.editor.derived;
-
-
-import java.io.IOException;
-import java.io.Reader;
-
-
-/**
- * Provides a set of convenience methods for creating HTML pages.
- * 
- * @see org.eclipse.jdt.internal.ui.text.HTMLPrinter
- */
-public class HTMLPrinter {
-			
-	private HTMLPrinter() {
-	}
-	
-	private static String replace(String text, char c, String s) {
-				
-		int previous= 0;
-		int current= text.indexOf(c, previous);
-		
-		if (current == -1)
-			return text;
-		
-		StringBuffer buffer= new StringBuffer();	
-		while (current > -1) {
-			buffer.append(text.substring(previous, current));
-			buffer.append(s);
-			previous= current + 1;
-			current= text.indexOf(c, previous);
-		}
-		buffer.append(text.substring(previous));
-		
-		return buffer.toString();
-	}
-	
-	public static String convertToHTMLContent(String content) {
-		content= replace(content, '<', "&lt;"); //$NON-NLS-1$
-		return replace(content, '>', "&gt;"); //$NON-NLS-1$
-	}
-	
-	public static String read(Reader rd) {
-		
-		StringBuffer buffer= new StringBuffer();
-		char[] readBuffer= new char[2048];
-		
-		try {
-			int n= rd.read(readBuffer);
-			while (n > 0) {
-				buffer.append(readBuffer, 0, n);
-				n= rd.read(readBuffer);
-			}
-			return buffer.toString();
-		} catch (IOException x) {
-		}
-		
-		return null;
-	}
-
-	public static void insertPageProlog(StringBuffer buffer, int position) {
-		buffer.insert(position, "<html><body text=\"#000000\" bgcolor=\"#FFFF88\"><font size=-1>"); //$NON-NLS-1$
-	}
-	
-	public static void addPageProlog(StringBuffer buffer) {
-		insertPageProlog(buffer, buffer.length());
-	}
-	
-	public static void addPageEpilog(StringBuffer buffer) {
-		buffer.append("</font></body></html>"); //$NON-NLS-1$
-	}
-	
-	public static void startBulletList(StringBuffer buffer) {
-		buffer.append("<ul>"); //$NON-NLS-1$
-	}
-	
-	public static void endBulletList(StringBuffer buffer) {
-		buffer.append("</ul>"); //$NON-NLS-1$
-	}
-	
-	public static void addBullet(StringBuffer buffer, String bullet) {
-		if (bullet != null) {
-			buffer.append("<li>"); //$NON-NLS-1$
-			buffer.append(bullet);
-			buffer.append("</li>"); //$NON-NLS-1$
-		}
-	}
-	
-	public static void addSmallHeader(StringBuffer buffer, String header) {
-		if (header != null) {
-			buffer.append("<h5>"); //$NON-NLS-1$
-			buffer.append(header);
-			buffer.append("</h5>"); //$NON-NLS-1$
-		}
-	}
-	
-	public static void addParagraph(StringBuffer buffer, String paragraph) {
-		if (paragraph != null) {
-			buffer.append("<p>"); //$NON-NLS-1$
-			buffer.append(paragraph);
-		}
-	}
-	
-	public static void addParagraph(StringBuffer buffer, Reader paragraphReader) {
-		if (paragraphReader != null)
-			addParagraph(buffer, read(paragraphReader));
-	}
-}
diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/derived/HTMLTextPresenter.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/derived/HTMLTextPresenter.java
deleted file mode 100644
index 1ae777a..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/derived/HTMLTextPresenter.java
+++ /dev/null
@@ -1,189 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.ui.internal.editor.derived;
-
-
-import java.io.IOException;
-import java.io.Reader;
-import java.io.StringReader;
-import java.util.Iterator;
-
-import org.eclipse.ant.ui.internal.model.AntUIPlugin;
-import org.eclipse.jface.text.DefaultInformationControl;
-import org.eclipse.jface.text.Region;
-import org.eclipse.jface.text.TextPresentation;
-import org.eclipse.swt.custom.StyleRange;
-import org.eclipse.swt.graphics.GC;
-import org.eclipse.swt.widgets.Display;
-
-/**
- * * @see org.eclipse.jdt.internal.ui.text.HTMLPresenter
- */
-public class HTMLTextPresenter implements DefaultInformationControl.IInformationPresenter {
-	
-	private static final String LINE_DELIM= System.getProperty("line.separator", "\n"); //$NON-NLS-1$ //$NON-NLS-2$
-	
-	private int fCounter;
-	private boolean fEnforceUpperLineLimit;
-	
-	public HTMLTextPresenter(boolean enforceUpperLineLimit) {
-		super();
-		fEnforceUpperLineLimit= enforceUpperLineLimit;
-	}
-	
-	public HTMLTextPresenter() {
-		this(true);
-	}
-	
-	protected Reader createReader(String hoverInfo, TextPresentation presentation) {
-		return new HTML2TextReader(new StringReader(hoverInfo), presentation);
-	}
-	
-	protected void adaptTextPresentation(TextPresentation presentation, int offset, int insertLength) {
-				
-		int yoursStart= offset;
-		int yoursEnd=   offset + insertLength -1;
-		yoursEnd= Math.max(yoursStart, yoursEnd);
-		
-		Iterator e= presentation.getAllStyleRangeIterator();
-		while (e.hasNext()) {
-			
-			StyleRange range= (StyleRange) e.next();
-		
-			int myStart= range.start;
-			int myEnd=   range.start + range.length -1;
-			myEnd= Math.max(myStart, myEnd);
-			
-			if (myEnd < yoursStart)
-				continue;
-			
-			if (myStart < yoursStart)
-				range.length += insertLength;
-			else
-				range.start += insertLength;
-		}
-	}
-	
-	private void append(StringBuffer buffer, String string, TextPresentation presentation) {
-		
-		int length= string.length();
-		buffer.append(string);
-		
-		if (presentation != null)
-			adaptTextPresentation(presentation, fCounter, length);
-			
-		fCounter += length;
-	}
-	
-	private String getIndent(String line) {
-		int length= line.length();
-		
-		int i= 0;
-		while (i < length && Character.isWhitespace(line.charAt(i))) ++i;
-		
-		return (i == length ? line : line.substring(0, i)) + " "; //$NON-NLS-1$
-	}
-	
-	/*
-	 * @see IHoverInformationPresenter#updatePresentation(Display display, String, TextPresentation, int, int)
-	 */
-	public String updatePresentation(Display display, String hoverInfo, TextPresentation presentation, int maxWidth, int maxHeight) {
-		
-		if (hoverInfo == null)
-			return null;
-			
-		GC gc= new GC(display);
-		try {
-			
-			StringBuffer buffer= new StringBuffer();
-			int maxNumberOfLines= Math.round(maxHeight / gc.getFontMetrics().getHeight());
-			
-			fCounter= 0;
-			LineBreakingReader reader= new LineBreakingReader(createReader(hoverInfo, presentation), gc, maxWidth);
-			
-			boolean lastLineFormatted= false;
-			String lastLineIndent= null;
-			
-			String line=reader.readLine();
-			boolean lineFormatted= reader.isFormattedLine();
-			boolean firstLineProcessed= false;
-			
-			while (line != null) {
-				
-				if (fEnforceUpperLineLimit && maxNumberOfLines <= 0)
-					break;
-				
-				if (firstLineProcessed) {
-					if (!lastLineFormatted)
-						append(buffer, LINE_DELIM, null);
-					else {
-						append(buffer, LINE_DELIM, presentation);
-						if (lastLineIndent != null)
-							append(buffer, lastLineIndent, presentation);
-					}
-				}
-				
-				append(buffer, line, null);
-				firstLineProcessed= true;
-				
-				lastLineFormatted= lineFormatted;
-				if (!lineFormatted)
-					lastLineIndent= null;
-				else if (lastLineIndent == null)
-					lastLineIndent= getIndent(line);
-					
-				line= reader.readLine();
-				lineFormatted= reader.isFormattedLine();
-				
-				maxNumberOfLines--;
-			}
-			
-			if (line != null) {
-				append(buffer, LINE_DELIM, lineFormatted ? presentation : null);
-				append(buffer, "...", presentation); //$NON-NLS-1$
-			}
-			
-			return trim(buffer, presentation);
-			
-		} catch (IOException e) {
-			AntUIPlugin.log(e);
-			return null;
-		} finally {
-			gc.dispose();
-		}
-	}
-	
-	private String trim(StringBuffer buffer, TextPresentation presentation) {
-		
-		int length= buffer.length();
-				
-		int end= length -1;
-		while (end >= 0 && Character.isWhitespace(buffer.charAt(end)))
-			-- end;
-		
-		if (end == -1)
-			return ""; //$NON-NLS-1$
-			
-		if (end < length -1)
-			buffer.delete(end + 1, length);
-		else
-			end= length;
-			
-		int start= 0;
-		while (start < end && Character.isWhitespace(buffer.charAt(start)))
-			++ start;
-			
-		buffer.delete(0, start);
-		presentation.setResultWindow(new Region(start, buffer.length()));
-		return buffer.toString();
-	}
-}
-
diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/derived/LineBreakingReader.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/derived/LineBreakingReader.java
deleted file mode 100644
index e5360f9..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/derived/LineBreakingReader.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.ui.internal.editor.derived;
-
- 
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.Reader;
-import java.text.BreakIterator;
-
-import org.eclipse.swt.graphics.GC;
-
-/**
- * Not a real reader. Could change if requested
- * @see   org.eclipse.jdt.internal.ui.text.LineBreakingReader
- */
-public class LineBreakingReader {
-	
-	private BufferedReader fReader;
-	private GC fGC;
-	private int fMaxWidth;
-	
-	private String fLine;
-	private int fOffset;
-	
-	private BreakIterator fLineBreakIterator;
-
-	/**
-	 * Creates a reader that breaks an input text to fit in a given width.
-	 * @param reader Reader of the input text
-	 * @param gc The graphic context that defines the currently used font sizes
-	 * @param maxLineWidth The max width (pixes) where the text has to fit in 
-	 */
-	public LineBreakingReader(Reader reader, GC gc, int maxLineWidth) {
-		fReader= new BufferedReader(reader);
-		fGC= gc;
-		fMaxWidth= maxLineWidth;
-		fOffset= 0;
-		fLine= null;
-		fLineBreakIterator= BreakIterator.getLineInstance();
-	}
-	
-	public boolean isFormattedLine() {
-		return fLine != null;
-	}
-	
-	/**
-	 * Reads the next line. The lengths of the line will not exceed the gived maximum
-	 * width.
-	 */
-	public String readLine() throws IOException {
-		if (fLine == null) {
-			String line= fReader.readLine();
-			if (line == null)
-				return null;
-								
-			int lineLen= fGC.textExtent(line).x;
-			if (lineLen < fMaxWidth) {
-				return line;
-			}
-			fLine= line;
-			fLineBreakIterator.setText(line);
-			fOffset= 0;
-		}
-		int breakOffset= findNextBreakOffset(fOffset);
-		String res;
-		if (breakOffset != BreakIterator.DONE) {
-			res= fLine.substring(fOffset, breakOffset);
-			fOffset= findWordBegin(breakOffset);
-			if (fOffset == fLine.length()) {
-				fLine= null;
-			}
-		} else {
-			res= fLine.substring(fOffset);
-			fLine= null;
-		}
-		return res;
-	}
-	
-	private int findNextBreakOffset(int currOffset) {
-		int currWidth= 0;
-		int nextOffset= fLineBreakIterator.following(currOffset);
-		while (nextOffset != BreakIterator.DONE) {
-			String word= fLine.substring(currOffset, nextOffset);
-			int wordWidth= fGC.textExtent(word).x;
-			int nextWidth= wordWidth + currWidth;
-			if (nextWidth > fMaxWidth) {
-				if (currWidth > 0) {
-					return currOffset;
-				} else {
-					return nextOffset;
-				}
-			}
-			currWidth= nextWidth;
-			currOffset= nextOffset;
-			nextOffset= fLineBreakIterator.next();
-		}
-		return nextOffset;
-	}
-	
-	private int findWordBegin(int idx) {
-		while (idx < fLine.length() && Character.isWhitespace(fLine.charAt(idx))) {
-			idx++;
-		}
-		return idx;
-	}	
-}
diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/derived/SingleCharReader.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/derived/SingleCharReader.java
deleted file mode 100644
index 086a1ed..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/derived/SingleCharReader.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.ui.internal.editor.derived;
-
-
-import java.io.IOException;
-import java.io.Reader;
-
-/**
- * @see org.eclipse.jdt.internal.corext.javadoc.SingleCharReader
- */
-public abstract class SingleCharReader extends Reader {
-	
-	/**
-	 * @see Reader#read()
-	 */
-	public abstract int read() throws IOException;
-
-	/**
-	 * @see Reader#read(char[],int,int)
-	 */
-	public int read(char cbuf[], int off, int len) throws IOException {
-		int end= off + len;
-		for (int i= off; i < end; i++) {
-			int ch= read();
-			if (ch == -1) {
-				if (i == off) {
-					return -1;
-				} else {
-					return i - off;
-				}
-			}
-			cbuf[i]= (char)ch;
-		}
-		return len;
-	}		
-	
-	/**
-	 * @see Reader#ready()
-	 */		
-	public boolean ready() throws IOException {
-		return true;
-	}
-	
-	/**
-	 * Gets the content as a String
-	 */
-	public String getString() throws IOException {
-		StringBuffer buf= new StringBuffer();
-		int ch;
-		while ((ch= read()) != -1) {
-			buf.append((char)ch);
-		}
-		return buf.toString();
-	}
-}
diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/derived/SubstitutionTextReader.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/derived/SubstitutionTextReader.java
deleted file mode 100644
index f022c75..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/derived/SubstitutionTextReader.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.ui.internal.editor.derived;
-
-
-
-import java.io.IOException;
-import java.io.Reader;
-
-
-/**
- * Reads the text contents from a reader and computes for each character
- * a potential substitution. The substitution may eat more characters than 
- * only the one passed into the computation routine.
- * 
- * @see   org.eclipse.jdt.internal.ui.text.SubstitutionTextReader
- */
-public abstract class SubstitutionTextReader extends SingleCharReader {
-	
-	protected static final String LINE_DELIM= System.getProperty("line.separator", "\n"); //$NON-NLS-1$ //$NON-NLS-2$
-	
-	private Reader fReader;
-	private boolean fWasWhiteSpace;
-	private int fCharAfterWhiteSpace;
-
-	/**
-	 * Tells whether white space characters are skipped.
-	 */
-	private boolean fSkipWhiteSpace= true;
-	
-	private boolean fReadFromBuffer;
-	private StringBuffer fBuffer;
-	private int fIndex;
-
-
-	protected SubstitutionTextReader(Reader reader) {
-		fReader= reader;
-		fBuffer= new StringBuffer();
-		fIndex= 0;
-		fReadFromBuffer= false;
-		fCharAfterWhiteSpace= -1;
-		fWasWhiteSpace= true;
-	}
-	
-	/**
-	 * Implement to compute the substitution for the given character and 
-	 * if necessary subsequent characters. Use <code>nextChar</code>
-	 * to read subsequent characters.
-	 */
-	protected abstract String computeSubstitution(int c) throws IOException;
-	
-	/**
-	 * Returns the internal reader.
-	 */
-	protected Reader getReader() {
-		return fReader;
-	}
-	 
-	/**
-	 * Returns the next character.
-	 */
-	protected int nextChar() throws IOException {
-		fReadFromBuffer= (fBuffer.length() > 0);
-		if (fReadFromBuffer) {
-			char ch= fBuffer.charAt(fIndex++);
-			if (fIndex >= fBuffer.length()) {
-				fBuffer.setLength(0);
-				fIndex= 0;
-			}
-			return ch;
-		} else {
-			int ch= fCharAfterWhiteSpace;
-			if (ch == -1) {
-				ch= fReader.read();
-			}
-			if (fSkipWhiteSpace && Character.isWhitespace((char)ch)) {
-				do {
-					ch= fReader.read();
-				} while (Character.isWhitespace((char)ch));
-				if (ch != -1) {
-					fCharAfterWhiteSpace= ch;
-					return ' ';
-				}
-			} else {
-				fCharAfterWhiteSpace= -1;
-			}
-			return ch;
-		}
-	}
-	
-	/**
-	 * @see Reader#read()
-	 */
-	public int read() throws IOException {
-		int c;
-		do {
-			
-			c= nextChar();
-			while (!fReadFromBuffer) {
-				String s= computeSubstitution(c);
-				if (s == null)
-					break;
-				if (s.length() > 0)
-					fBuffer.insert(0, s);
-				c= nextChar();
-			}
-			
-		} while (fSkipWhiteSpace && fWasWhiteSpace && (c == ' '));
-		fWasWhiteSpace= (c == ' ' || c == '\r' || c == '\n');
-		return c;
-	}
-		
-	/**
-	 * @see Reader#ready()
-	 */		
-	public boolean ready() throws IOException {
-		return fReader.ready();
-	}
-		
-	/**
-	 * @see Reader#close()
-	 */		
-	public void close() throws IOException {
-		fReader.close();
-	}
-	
-	/**
-	 * @see Reader#reset()
-	 */		
-	public void reset() throws IOException {
-		fReader.reset();
-		fWasWhiteSpace= true;
-		fCharAfterWhiteSpace= -1;
-		fBuffer.setLength(0);
-		fIndex= 0;		
-	}
-
-	protected final void setSkipWhitespace(boolean state) {
-		fSkipWhiteSpace= state;
-	}
-
-	protected final boolean isSkippingWhitespace() {
-		return fSkipWhiteSpace;
-	}
-}
diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/outline/AntEditorContentOutlinePage.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/outline/AntEditorContentOutlinePage.java
deleted file mode 100644
index 7b927a1..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/outline/AntEditorContentOutlinePage.java
+++ /dev/null
@@ -1,516 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2003 GEBIT Gesellschaft fuer EDV-Beratung
- * und Informatik-Technologien mbH, 
- * Berlin, Duesseldorf, Frankfurt (Germany) and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     GEBIT Gesellschaft fuer EDV-Beratung und Informatik-Technologien mbH - initial API and implementation
- * 	   IBM Corporation - bug fixes
- *******************************************************************************/
-
-package org.eclipse.ant.ui.internal.editor.outline;
-
-import java.util.List;
-
-import org.eclipse.ant.ui.internal.editor.xml.IAntEditorConstants;
-import org.eclipse.ant.ui.internal.editor.xml.XmlAttribute;
-import org.eclipse.ant.ui.internal.editor.xml.XmlElement;
-import org.eclipse.ant.ui.internal.model.AntImageDescriptor;
-import org.eclipse.ant.ui.internal.model.AntUIImages;
-import org.eclipse.ant.ui.internal.model.AntUtil;
-import org.eclipse.ant.ui.internal.model.IAntUIConstants;
-import org.eclipse.ant.ui.internal.views.actions.AntOpenWithMenu;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jface.action.IMenuListener;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.MenuManager;
-import org.eclipse.jface.action.Separator;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.util.ListenerList;
-import org.eclipse.jface.viewers.IColorProvider;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Menu;
-import org.eclipse.ui.IWorkbenchActionConstants;
-import org.eclipse.ui.part.IPageSite;
-import org.eclipse.ui.part.IShowInSource;
-import org.eclipse.ui.part.ShowInContext;
-import org.eclipse.ui.views.contentoutline.ContentOutlinePage;
-
-/**
- * Content outline page for the Ant Editor.
- */
-public class AntEditorContentOutlinePage extends ContentOutlinePage implements IShowInSource, IAdaptable {
-	
-	private static final int EXPAND_TO_LEVEL= 2;
-
-	private Menu menu;
-	private AntOpenWithMenu openWithMenu;
-	
-	private IDocumentModelListener fListener;
-	private AntModel fModel;
-	private XMLCore fCore;
-	private ListenerList fPostSelectionChangedListeners= new ListenerList();
-	private boolean fIsModelEmpty= true;
-
-	/**
-	 * The content provider for the objects shown in the outline view.
-	 */
-	private class ContentProvider implements ITreeContentProvider {
-
-		/**
-		 * @see org.eclipse.jface.viewers.IContentProvider#dispose()
-		 */
-		public void dispose() {
-		}
-
-        
-		/**
-		 * do nothing
-		 * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(Viewer, Object, Object)
-		 */
-		public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
-		}
-        
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.jface.viewers.ITreeContentProvider#getChildren(Object)
-		 */
-		public Object[] getChildren(Object parentNode) {
-			XmlElement tempParentElement = (XmlElement)parentNode;
-			List tempChilds = tempParentElement.getChildNodes();
-			Object[] tempChildObjects = new Object[tempChilds.size()];
-			for(int i=0; i<tempChilds.size(); i++) {
-				tempChildObjects[i] = (Object)tempChilds.get(i);
-			}
-			return tempChildObjects;
-		}
-
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.jface.viewers.ITreeContentProvider#getParent(Object)
-		 */
-		public Object getParent(Object aNode) {
-			XmlElement tempElement = (XmlElement)aNode;
-			return tempElement.getParentNode();
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.jface.viewers.ITreeContentProvider#hasChildren(Object)
-		 */
-		public boolean hasChildren(Object aNode) {
-			return ((XmlElement)aNode).getChildNodes().size() > 0;
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(Object)
-		 */
-		public Object[] getElements(Object anInputElement) {
-			return ((AntModel) anInputElement).getRootElements();
-		}
-
-	}
-    
-	/**
-	 * The label provider for the objects shown in the outline view.
-	 */
-	private class LabelProvider implements ILabelProvider, IColorProvider {
-		/* (non-Javadoc)
-		 * @see org.eclipse.jface.viewers.IBaseLabelProvider#addListener(ILabelProviderListener)
-		 */
-		public void addListener(ILabelProviderListener listener) {
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.jface.viewers.IBaseLabelProvider#dispose()
-		 */
-		public void dispose() {
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.jface.viewers.IBaseLabelProvider#isLabelProperty(Object, String)
-		 */
-		public boolean isLabelProperty(Object element, String property) {
-			return false;
-		}
-
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.jface.viewers.IBaseLabelProvider#removeListener(ILabelProviderListener)
-		 */
-		public void removeListener(ILabelProviderListener listener) {
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.jface.viewers.ILabelProvider#getImage(Object)
-		 */
-		public Image getImage(Object anElement) {
-			XmlElement tempElement = (XmlElement)anElement;
-			if("target".equals(tempElement.getName())) { //$NON-NLS-1$
-				ImageDescriptor base = null;
-				int flags = 0;
-				
-				if (tempElement.isErrorNode()) {
-					flags = flags | AntImageDescriptor.HAS_ERRORS;
-				}
-				if (isDefaultTargetNode(tempElement)) {
-					flags = flags | AntImageDescriptor.DEFAULT_TARGET;
-					base = AntUIImages.getImageDescriptor(IAntUIConstants.IMG_ANT_DEFAULT_TARGET);
-				} else if (tempElement.getAttributeNamed(IAntEditorConstants.ATTR_DESCRIPTION) == null) {
-					base = AntUIImages.getImageDescriptor(IAntUIConstants.IMG_ANT_TARGET_PRIVATE);
-				} else {
-					base = AntUIImages.getImageDescriptor(IAntUIConstants.IMG_ANT_TARGET);
-				}
-				return AntUIImages.getImage(new AntImageDescriptor(base, flags));				
-			}
-			if("project".equals(tempElement.getName())) { //$NON-NLS-1$
-				return getProjectImage(tempElement);
-			}
-			
-			if("property".equals(tempElement.getName())) { //$NON-NLS-1$
-				return AntUIImages.getImage(IAntUIConstants.IMG_PROPERTY);
-			}
-			
-			XmlAttribute attribute= tempElement.getAttributeNamed(IAntEditorConstants.ATTR_TYPE);
-			if (attribute != null && IAntEditorConstants.TYPE_EXTERNAL.equals(attribute.getValue())) {
-				return getProjectImage(tempElement);
-			}
-
-			if (attribute != null && IAntEditorConstants.TYPE_UNKNOWN.equals(attribute.getValue())) {
-				int flags= 0;
-				ImageDescriptor base= AntUIImages.getImageDescriptor(IAntUIConstants.IMG_TASK_PROPOSAL);
-				if (tempElement.isErrorNode()) {
-					flags |= AntImageDescriptor.HAS_ERRORS;
-				}
-				return AntUIImages.getImage(new AntImageDescriptor(base, flags));
-			}
-
-			if (tempElement.isErrorNode()) {
-				return AntUIImages.getImage(IAntUIConstants.IMG_ANT_TARGET_ERROR);
-			}
-			return AntUIImages.getImage(IAntUIConstants.IMG_TASK_PROPOSAL);
-		}
-		
-		private Image getProjectImage(XmlElement tempElement) {
-			int flags = 0;
-			ImageDescriptor base = AntUIImages.getImageDescriptor(IAntUIConstants.IMG_ANT_PROJECT);
-			if (tempElement.isErrorNode()) {
-				flags = flags | AntImageDescriptor.HAS_ERRORS;
-			}
-			return AntUIImages.getImage(new AntImageDescriptor(base, flags));
-		}
-        
-		/* (non-Javadoc)
-		 * @see org.eclipse.jface.viewers.ILabelProvider#getText(Object)
-		 */
-		public String getText(Object aNode) {
-			XmlElement element= (XmlElement) aNode;
-			StringBuffer displayName= new StringBuffer(element.getDisplayName());
-			if (element.isExternal() && (!element.isRootExternal() || (element.getParentNode() != null && element.getParentNode().isExternal()))) {
-				displayName.append(AntOutlineMessages.getString("AntEditorContentOutlinePage._[external]_1")); //$NON-NLS-1$
-			}
-			return displayName.toString();
-		}
-
-		public Color getForeground(Object element) {
-			if (isDefaultTargetNode((XmlElement) element)) {
-				return Display.getDefault().getSystemColor(SWT.COLOR_BLUE);
-			}
-			return null;
-		}
-
-		public Color getBackground(Object element) {
-			return null;
-		}
-	}
-	
-	private boolean isDefaultTargetNode(XmlElement node) {
-		XmlAttribute type= node.getAttributeNamed(IAntEditorConstants.ATTR_TYPE);
-		if (type == null || !type.getValue().equals(IAntEditorConstants.TYPE_TARGET)) {
-			return false;
-		}
-		XmlElement parent= node.getParentNode();
-		if (parent != null) {
-			type= parent.getAttributeNamed(IAntEditorConstants.ATTR_TYPE);
-			while (parent != null && (type == null || !type.getValue().equals(IAntEditorConstants.TYPE_PROJECT))) {
-				parent= parent.getParentNode();
-				if (parent != null) {
-					type= parent.getAttributeNamed(IAntEditorConstants.ATTR_TYPE);
-				}
-			}
-		} 
-		if (parent == null) {
-			return false;
-		}
-		
-		XmlAttribute defaultTarget= parent.getAttributeNamed(IAntEditorConstants.ATTR_DEFAULT);
-		XmlAttribute nameAttribute= node.getAttributeNamed(IAntEditorConstants.ATTR_NAME);
-		return defaultTarget != null && nameAttribute != null && defaultTarget.getValue().equals(nameAttribute.getValue());
-	}
-   
-	/**
-	 * Creates a new AntEditorContentOutlinePage.
-	 */
-	public AntEditorContentOutlinePage(XMLCore core) {
-		super();
-		fCore= core;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.part.IPage#dispose()
-	 */
-	public void dispose() {
-		if (menu != null) {
-			menu.dispose();
-		}
-		if (openWithMenu != null) {
-			openWithMenu.dispose();
-		}
-		if (fListener != null) {
-			fCore.removeDocumentModelListener(fListener);
-			fListener= null;
-		}
-	}
-	
-	/**  
-	 * Creates the control (outline view) for this page
-	 */
-	public void createControl(Composite parent) {
-		super.createControl(parent);
-    
-		TreeViewer viewer = getTreeViewer();
-        
-		/*
-		 * We might want to implement our own content provider.
-		 * This content provider should be able to work on a dom like tree
-		 * structure that resembles the file contents.
-		 */
-		viewer.setContentProvider(new ContentProvider());
-
-		/*
-		 * We probably also need our own label provider.
-		 */ 
-		viewer.setLabelProvider(new LabelProvider());
-		if (fModel != null) {
-			setViewerInput(fModel);
-		}
-		
-		MenuManager manager= new MenuManager("#PopUp"); //$NON-NLS-1$
-		manager.setRemoveAllWhenShown(true);
-		manager.addMenuListener(new IMenuListener() {
-			public void menuAboutToShow(IMenuManager menuManager) {
-				contextMenuAboutToShow(menuManager);
-			}
-		});
-		menu= manager.createContextMenu(viewer.getTree());
-		viewer.getTree().setMenu(menu);
-
-		IPageSite site= getSite();
-		site.registerContextMenu(IAntUIConstants.PLUGIN_ID + ".antEditorOutline", manager, viewer); //$NON-NLS-1$
-		
-		openWithMenu= new AntOpenWithMenu(this.getSite().getPage());
-		
-		viewer.addPostSelectionChangedListener(new ISelectionChangedListener() {
-			public void selectionChanged(SelectionChangedEvent event) {
-				postSelectionChanged(event);
-			}
-		});
-	}
-	
-	private void setViewerInput(Object newInput) {
-		TreeViewer tree= getTreeViewer();
-		Object oldInput= tree.getInput();
-		
-		boolean isAntModel= (newInput instanceof AntModel);
-		boolean wasAntModel= (oldInput instanceof AntModel);
-		
-		if (isAntModel && !wasAntModel) {
-			if (fListener == null) {
-				fListener= createAntModelChangeListener();
-			}
-			fCore.addDocumentModelListener(fListener);
-		} else if (!isAntModel && wasAntModel && fListener != null) {
-			fCore.removeDocumentModelListener(fListener);
-			fListener= null;
-		}
-
-		
-		tree.setInput(newInput);
-		
-		if (isAntModel) {
-			updateTreeExpansion();
-		}
-	}
-	
-	public void setPageInput(AntModel xmlModel) {
-		fModel= xmlModel;
-		if (getTreeViewer() != null) {
-			setViewerInput(fModel);
-		}
-	}
-		
-	private IDocumentModelListener createAntModelChangeListener() {
-		return new IDocumentModelListener() {
-			public void documentModelChanged(final DocumentModelChangeEvent event) {
-				if (event.getModel() == fModel && !getControl().isDisposed()) {
-					getControl().getDisplay().asyncExec(new Runnable() {
-						public void run() {
-							Control ctrl= getControl();
-							if (ctrl != null && !ctrl.isDisposed()) {
-								getTreeViewer().refresh();
-								updateTreeExpansion();
-							}
-						}
-					});
-				}
-			}
-		};
-	}
-	
-	public void addPostSelectionChangedListener(ISelectionChangedListener listener) {
-		fPostSelectionChangedListeners.add(listener);
-	}
-	
-	public void removePostSelectionChangedListener(ISelectionChangedListener listener) {
-		fPostSelectionChangedListeners.remove(listener);
-	}
-	
-	private void updateTreeExpansion() {
-		boolean wasModelEmpty= fIsModelEmpty;
-		fIsModelEmpty= fModel == null || fModel.getRootElements() == null || fModel.getRootElements().length == 0;
-		if (wasModelEmpty && !fIsModelEmpty) {
-			getTreeViewer().expandToLevel(EXPAND_TO_LEVEL);
-		}
-	}
-	
-	public void postSelectionChanged(SelectionChangedEvent event) {
-		firePostSelectionChanged(event.getSelection());
-	}
- 	
-	
-	private void firePostSelectionChanged(ISelection selection) {
-		// create an event
-		SelectionChangedEvent event= new SelectionChangedEvent(this, selection);
- 
-		// fire the event
-		Object[] listeners= fPostSelectionChangedListeners.getListeners();
-		for (int i= 0; i < listeners.length; ++i) {
-			((ISelectionChangedListener) listeners[i]).selectionChanged(event);
-		}
-	}
-	
-	private void contextMenuAboutToShow(IMenuManager menuManager) {	
-		if (shouldAddOpenWithMenu()) {
-			addOpenWithMenu(menuManager);
-		}
-		menuManager.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS));
-	}
-	
-	private void addOpenWithMenu(IMenuManager menuManager) {
-		IStructuredSelection selection= (IStructuredSelection)getSelection();
-		XmlElement element= (XmlElement)selection.getFirstElement();
-		String path = getElementPath(element);
-		
-		if (path != null) {
-			IPath resourcePath= new Path(path);
-			IWorkspaceRoot root= ResourcesPlugin.getWorkspace().getRoot();
-			IResource resource= root.getFileForLocation(resourcePath);
-			if (resource != null && resource.getType() == IResource.FILE && resource.exists()) {
-				menuManager.add(new Separator("group.open")); //$NON-NLS-1$
-				IMenuManager submenu= new MenuManager(AntOutlineMessages.getString("AntEditorContentOutlinePage.Open_With_1"));  //$NON-NLS-1$
-				openWithMenu.setFile((IFile)resource);
-				submenu.add(openWithMenu);
-				menuManager.appendToGroup("group.open", submenu); //$NON-NLS-1$
-				
-			}
-		}
-	}
-
-	private String getElementPath(XmlElement element) {
-		String path= element.getFilePath();
-		if (element.isRootExternal()){
-			List children= element.getChildNodes();
-			if (!children.isEmpty()) {
-				XmlElement child= (XmlElement)children.get(0);
-				path= child.getFilePath();
-			}
-		}
-		return path;
-	}
-	
-	private boolean shouldAddOpenWithMenu() {
-		ISelection iselection= getSelection();
-		if (iselection instanceof IStructuredSelection) {
-			IStructuredSelection selection= (IStructuredSelection)iselection;
-			if (selection.size() == 1) {
-				Object selected= selection.getFirstElement();
-				if (selected instanceof XmlElement) {
-					XmlElement element= (XmlElement)selected;
-					if (element.isExternal()) {
-						String path = getElementPath(element);
-						if (path.length() == 0) {
-							return false;
-						}
-						
-						XmlElement parent= element.getParentNode();
-						while (parent != null) {
-							String parentPath= getElementPath(parent);
-							if (path != null && !path.equals(parentPath)) {
-								return true;
-							}
-							parent= parent.getParentNode();
-						}
-					}	
-				}
-			}
-		}
-		return false;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
-	 */
-	public Object getAdapter(Class key) {
-		if (key == IShowInSource.class) {
-			return this;
-		}
-		return null;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.part.IShowInSource#getShowInContext()
-	 */
-	public ShowInContext getShowInContext() {
-		if (fModel != null) {
-			ILocationProvider locationProvider= fModel.getLocationProvider();
-			IFile file= AntUtil.getFile(locationProvider.getLocation().toOSString());
-			ISelection selection= new StructuredSelection(file);
-			return new ShowInContext(null, selection);
-		}
-		return null;
-	}
-}
diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/outline/AntModel.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/outline/AntModel.java
deleted file mode 100644
index 8f0f6cf..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/outline/AntModel.java
+++ /dev/null
@@ -1,198 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ant.ui.internal.editor.outline;
-
-import java.io.IOException;
-import java.io.StringReader;
-
-import org.apache.xerces.parsers.SAXParser;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jface.text.DocumentEvent;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.IDocumentListener;
-import org.eclipse.ant.ui.internal.editor.xml.XmlElement;
-import org.eclipse.ant.ui.internal.model.AntUIPlugin;
-
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-import org.xml.sax.SAXParseException;
-
-/**
- * AntModel.java
- */
-public class AntModel {
-
-	private XMLCore fCore;
-	private IDocument fDocument;
-	private IProblemRequestor fProblemRequestor;
-	private ILocationProvider fLocationProvider;
-
-	private XmlElement[] fRootElements= new XmlElement[0];
-	private Object fRootElementLock= new Object();
-
-	private final Object fDirtyLock= new Object();
-	private boolean fIsDirty= true;
-	private IDocumentListener fListener;
-
-	public AntModel(XMLCore core, IDocument document, IProblemRequestor problemRequestor, ILocationProvider locationProvider) {
-		fCore= core;
-		fDocument= document;
-		fProblemRequestor= problemRequestor;
-		fLocationProvider= locationProvider;
-	}
-
-	public void install() {
-		fListener= new IDocumentListener() {
-			public void documentAboutToBeChanged(DocumentEvent event) {
-				synchronized (fDirtyLock) {
-					fIsDirty= true;
-				}
-			}
-			public void documentChanged(DocumentEvent event) {}
-		};
-		fDocument.addDocumentListener(fListener);
-		
-		reconcile();
-	}
-	
-	public void dispose() {		
-
-		if (fDocument != null) {
-			fDocument.removeDocumentListener(fListener);
-		}
-
-		synchronized (this) {
-			fDocument= null;
-			fCore= null;
-		}
-	}
-	
-	public void reconcile() {
-		
-		synchronized (fDirtyLock) {
-			if (!fIsDirty) {
-				return;
-			}
-			fIsDirty= false;
-		}
-
-		synchronized (this) {
-			if (fCore == null) {
-				// disposed
-				return;
-			}
-			
-			XmlElement[] rootElements;
-			if (fDocument == null) {
-				rootElements= new XmlElement[0];
-			} else {
-				XmlElement rootElement= parseDocument(fDocument);
-				if (rootElement == null) {
-					rootElements= new XmlElement[0];
-				} else {
-					rootElements= new XmlElement[] { rootElement };
-				}
-			} 
-
-			setRootElements(rootElements);
-	
-			fCore.notifyDocumentModelListeners(new DocumentModelChangeEvent(this));
-		}
-	}
-
-	private void setRootElements(XmlElement[] rootElements) {
-		synchronized (fRootElementLock) {
-			fRootElements= rootElements;
-		}
-	}
-
-	public XmlElement[] getRootElements() {
-		synchronized (fRootElementLock) {
-			return fRootElements;
-		}
-	}
-
-	/**
-	 * Gets the content outline for a given input element.
-	 * Returns the root XmlElement, or null if the
-	 * outline could not be generated.
-	 */
-	private XmlElement parseDocument(IDocument input) {
-		/*
-		 * What happens here:
-		 * The file is parsed by the SAX Parser.
-		 * The Parser then creates the DOM Tree of the file.
-		 * The root element is returned here.
-		 */
-         
-		// Create the parser
-		SAXParser parser;
-		try {
-			parser = new SAXParser();
-			parser.setFeature("http://xml.org/sax/features/namespaces", false); //$NON-NLS-1$
-		} catch (SAXException e) {
-			AntUIPlugin.log(e);
-			return null;
-		}
-
-		// Create the handler
-		OutlinePreparingHandler handler = new OutlinePreparingHandler(fLocationProvider);
-		handler.setProblemRequestor(fProblemRequestor);
-		handler.setDocument(input);
-		
-		parser.setContentHandler(handler);
-		parser.setDTDHandler(handler);
-		parser.setEntityResolver(handler);
-		parser.setErrorHandler(handler);
-//		parser.setLocale(...);
-        
-		// Parse!
-		try {
-			handler.begin();
-			String wholeDocString= input.get();
-			InputSource inputSource = new InputSource(new StringReader(wholeDocString));
-			IPath location= fLocationProvider.getLocation();
-			if (location != null) {
-				//needed for resolving relative external entities
-				inputSource.setSystemId(location.toOSString());
-			}
-			parser.setProperty("http://xml.org/sax/properties/lexical-handler", handler); //$NON-NLS-1$
-			parser.parse(inputSource);
-		} catch(SAXParseException e) {
-			handler.fixEndLocations(e);
-		} catch (SAXException e) {
-			AntUIPlugin.log(e);
-			return null;
-		} catch (IOException e) {
-			handler.fixEndLocations();
-			generateExceptionOutline(handler.getLastOpenElement());
-		} finally {
-			handler.end();			
-		}
-        
-		return handler.getRootElement();
-	}
-
-	private void generateExceptionOutline(XmlElement openElement) {
-		while (openElement != null) {
-			openElement.setIsErrorNode(true);
-			openElement= openElement.getParentNode();
-		}
-	}
-	
-	/**
-	 * @return ILocationProvider
-	 */
-	public ILocationProvider getLocationProvider() {
-		return fLocationProvider;
-	}
-}
\ No newline at end of file
diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/outline/AntOutlineMessages.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/outline/AntOutlineMessages.java
deleted file mode 100644
index 1d06c55..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/outline/AntOutlineMessages.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.ui.internal.editor.outline;
-
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-public class AntOutlineMessages {
-
-	private static final String BUNDLE_NAME = "org.eclipse.ant.ui.internal.editor.outline.AntOutlineMessages"; //$NON-NLS-1$
-
-	private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME);
-
-	private AntOutlineMessages() {
-	}
-
-	public static String getString(String key) {
-		try {
-			return RESOURCE_BUNDLE.getString(key);
-		} catch (MissingResourceException e) {
-			return '!' + key + '!';
-		}
-	}
-}
diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/outline/AntOutlineMessages.properties b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/outline/AntOutlineMessages.properties
deleted file mode 100644
index 42f45d2..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/outline/AntOutlineMessages.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2003 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Common Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/cpl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-OutlinePreparingHandler.Error_Name=Error when parsing document: Neither a local name nor qualified of an element specified
-OutlinePreparingHandler._line___2=\ line: 
-OutlinePreparingHandler._[default]_2=\ [default]
-
-AntEditorContentOutlinePage._[external]_1=\ [external]
-AntEditorContentOutlinePage.Open_With_1=Open With
diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/outline/DocumentModelChangeEvent.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/outline/DocumentModelChangeEvent.java
deleted file mode 100644
index 21c933c..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/outline/DocumentModelChangeEvent.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ant.ui.internal.editor.outline;
-
-/**
- * DocumentModelChangeEvent.java
- */
-public class DocumentModelChangeEvent {
-	
-	private AntModel fModel;
-	
-	DocumentModelChangeEvent(AntModel model) {
-		fModel= model;
-	}
-	
-	public AntModel getModel() {
-		return fModel;
-	}
-	
-}
diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/outline/IDocumentModelListener.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/outline/IDocumentModelListener.java
deleted file mode 100644
index c600334..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/outline/IDocumentModelListener.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ant.ui.internal.editor.outline;
-
-
-public interface IDocumentModelListener {
-	
-	public void documentModelChanged(DocumentModelChangeEvent event);
-}
diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/outline/ILocationProvider.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/outline/ILocationProvider.java
deleted file mode 100644
index 0e790ac..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/outline/ILocationProvider.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ant.ui.internal.editor.outline;
-
-import org.eclipse.core.runtime.IPath;
-
-
-public interface ILocationProvider {
-
-	public IPath getLocation();	
-}
diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/outline/IProblem.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/outline/IProblem.java
deleted file mode 100644
index 7034ccb..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/outline/IProblem.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.ui.internal.editor.outline;
-
-import org.eclipse.jface.text.IRegion;
-
-
-public interface IProblem extends IRegion {
-
-	/**
-	 * Returns the problem code
-	 *
-	 * @return the problem code
-	 */
-	String getCode();
-
-	/**
-	 * Answer a localized, human-readable message string which describes the problem.
-	 *
-	 * @return a localized, human-readable message string which describes the problem
-	 */
-	String getMessage();
-
-	/**
-	 * Checks the severity to see if the Error bit is set.
-	 *
-	 * @return true if the Error bit is set for the severity, false otherwise
-	 */
-	boolean isError();
-
-	/**
-	 * Checks the severity to see if the Error bit is not set.
-	 *
-	 * @return true if the Error bit is not set for the severity, false otherwise
-	 */
-	boolean isWarning();
-
-}
diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/outline/IProblemRequestor.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/outline/IProblemRequestor.java
deleted file mode 100644
index d901e76..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/outline/IProblemRequestor.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.ui.internal.editor.outline;
-
-public interface IProblemRequestor {
-
-	/**
-	 * Notification of a XML problem.
-	 *
-	 * @param problem IProblem - The discovered Java problem.
-	 */
-	void acceptProblem(IProblem problem);
-
-	/**
-	 * Notification sent before starting the problem detection process.
-	 * Typically, this would tell a problem collector to clear previously recorded problems.
-	 */
-	void beginReporting();
-
-	/**
-	 * Notification sent after having completed problem detection process.
-	 * Typically, this would tell a problem collector that no more problems should be expected in this
-	 * iteration.
-	 */
-	void endReporting();
-
-}
diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/outline/LocationProvider.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/outline/LocationProvider.java
deleted file mode 100644
index 78e3a17..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/outline/LocationProvider.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.ui.internal.editor.outline;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.IPath;
-
-/**
- * LocationProvider.java
- */
-public class LocationProvider implements ILocationProvider {
-	private IPath fPath;
-	
-	public LocationProvider() {
-	}
-	
-	public LocationProvider(IFile file) {
-		setLocationFromFile(file);
-	}
-
-	public void setLocationFromFile(IFile file) {
-		fPath= file != null ? file.getLocation() : null;
-	}
-
-	public IPath getLocation() {
-		return fPath;
-	}
-}
diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/outline/OutlinePreparingHandler.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/outline/OutlinePreparingHandler.java
deleted file mode 100644
index 9ebce93..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/outline/OutlinePreparingHandler.java
+++ /dev/null
@@ -1,846 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2003 GEBIT Gesellschaft fuer EDV-Beratung
- * und Informatik-Technologien mbH, 
- * Berlin, Duesseldorf, Frankfurt (Germany) and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     GEBIT Gesellschaft fuer EDV-Beratung und Informatik-Technologien mbH - initial API and implementation
- * 	   IBM Corporation - bug fixes
- *******************************************************************************/
-
-package org.eclipse.ant.ui.internal.editor.outline;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.util.Stack;
-
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.util.FileUtils;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.ant.ui.internal.editor.AntEditorException;
-import org.eclipse.ant.ui.internal.editor.xml.IAntEditorConstants;
-import org.eclipse.ant.ui.internal.editor.xml.XmlAttribute;
-import org.eclipse.ant.ui.internal.editor.xml.XmlElement;
-import org.eclipse.ant.ui.internal.model.AntUIPlugin;
-import org.xml.sax.Attributes;
-import org.xml.sax.InputSource;
-import org.xml.sax.Locator;
-import org.xml.sax.SAXException;
-import org.xml.sax.SAXParseException;
-import org.xml.sax.ext.LexicalHandler;
-import org.xml.sax.helpers.DefaultHandler;
-
-/**
- * Used when parsing the content of the editor to create a tree model that is
- * used as model for the outline view.
- * <P>
- * The handler makes use of the xml parser's locator to pre-determine  
- * positions of tags. The locations as they can be determined at this point
- * are set for the <code>XmlElement</code> instances.  The locations that are
- * set are not the correct ones yet, after parsing. They have to be corrected
- * afterwards. This actually happens in the OutlineView. The locations that are
- * set at this point are only the ones that the locator gives us in 
- * <code>startElement()</code> and <code>endElement()</code>.
- * 
- */
-public class OutlinePreparingHandler extends DefaultHandler implements LexicalHandler {
-
-    /**
-     * The locator that tells us the location of the currently parsed element 
-     * in the parsed document.
-     */
-	private Locator locator;
-
-
-    /**
-     * Stack of still open elements.
-     * <P>
-     * On top of the stack is the innermost element.
-     */
-	private Stack stillOpenElements = new Stack();
-
-
-    /**
-     * The root element of the DOM Tree that we create while parsing.
-     */
-	private XmlElement rootElement;
-    
-	/**
-	 * Used as a helper for resolving external relative entries
-	 * and paths for error elements.
-	 */
-    private File mainFile;
-
-    /**
-     * Helper for generating <code>IProblem</code>s
-     */
-    private XEErrorHandler errorHandler;
-
-    /**
-     * The parsed document
-     */
-    private IDocument document;
-    
-    /**
-     * Whether the current element is the root of the external entity tree
-     */
-    private boolean isTopLevelRootExternal;
-
-    /**
-     * Whether the current callbacks are from elements in the DTD.
-     */
-    private boolean isInDTD;
-   
-     /**
-     * Start offset of the last seen external entity.
-     */
-    private int lastExternalEntityOffset= -1;
-
-    /**
-     * Creates an instance.
-     */
-    public OutlinePreparingHandler(ILocationProvider locationProvider) {
-		super();
-		IPath location= locationProvider.getLocation();
-		if(location != null) {
-			this.mainFile= location.toFile();
-		}
-    }
-
-
-    /* (non-Javadoc)
-     * @see org.xml.sax.ContentHandler#startElement(String, String, String, Attributes)
-     */
-    public void startElement(String aUri, String aLocalName, String aQualifiedName, Attributes anAttributes)
-        throws SAXException {
-        /*
-         * While the crimson parser passes the tag name as local name, apache's
-         * xerces parser, passes the tag name as qualilfied name and an empty 
-         * string as local name.
-         */
-         
-        // Create a Dom Element
-        XmlElement tempElement = createXmlElement(aLocalName, aQualifiedName, anAttributes);
-
-        // Is it our root
-        if(rootElement == null) {
-            rootElement = tempElement;
-        } else {  // Add it as child to parent
-            XmlElement tempLastOpenedElement = (XmlElement)stillOpenElements.peek();
-            tempLastOpenedElement.addChildNode(tempElement);
-            tempElement.setExternal(isExternal());
-        }
-    
-		// set starting the location
-		computeStartLocation(tempElement);
-        
-        stillOpenElements.push(tempElement);
-        
-        super.startElement(aUri, aLocalName, aQualifiedName, anAttributes);
-    }
-    
-    
-    /**
-     * Creates an <code>XmlElement</code> instance from the specified parameters.
-     */
-    private XmlElement createXmlElement(String aLocalName, String aQualifiedName, Attributes attributes) {
-		String tempElementName = null;
-
-        XmlElement tempElement = null;
-        if(aLocalName.length() > 0) {
-            tempElementName = aLocalName;
-        }
-        else if(aQualifiedName.length() > 0) {
-            tempElementName = aQualifiedName;
-        }   
-        else {
-            throw new AntEditorException(AntOutlineMessages.getString("OutlinePreparingHandler.Error_Name")); //$NON-NLS-1$
-        }
-        String elementType= null;
-        if(tempElementName.equalsIgnoreCase("target")) { //$NON-NLS-1$
-        	elementType= IAntEditorConstants.TYPE_TARGET;
-        	tempElement = new XmlElement(tempElementName) {
-                public String getDisplayName() {
-                    XmlAttribute tempXmlAttr = getAttributeNamed(IAntEditorConstants.ATTR_NAME);
-                    if(tempXmlAttr != null) {
-                    	StringBuffer nodeName= new StringBuffer(tempXmlAttr.getValue());
-						XmlElement parentNode= getParentNode();
-						XmlAttribute type= parentNode != null ? parentNode.getAttributeNamed(IAntEditorConstants.ATTR_TYPE) : null;
-						while (parentNode != null && (type == null || !type.getValue().equals(IAntEditorConstants.TYPE_PROJECT))){
-							parentNode= parentNode.getParentNode();
-							if (parentNode != null) {
-								type= parentNode.getAttributeNamed(IAntEditorConstants.ATTR_TYPE);
-							}
-						}
-						if (parentNode != null) {
-                    		XmlAttribute defaultTarget= parentNode.getAttributeNamed(IAntEditorConstants.ATTR_DEFAULT);
-                    		if (defaultTarget != null && defaultTarget.getValue().equals(tempXmlAttr.getValue())) {
-                    			nodeName.append(AntOutlineMessages.getString("OutlinePreparingHandler._[default]_2")); //$NON-NLS-1$
-                    		}
-						}
-                    	return nodeName.toString();
-                    }
-                    return super.getDisplayName();
-                }
-        	};
-        } else if (tempElementName.equalsIgnoreCase("project")) { //$NON-NLS-1$
-			elementType= IAntEditorConstants.TYPE_PROJECT;
-			tempElement = new XmlElement(tempElementName) {
-				public String getDisplayName() {
-					XmlAttribute tempXmlAttr = getAttributeNamed(IAntEditorConstants.ATTR_NAME);
-					if(tempXmlAttr != null) {
-						return tempXmlAttr.getValue();
-					}
-					return super.getDisplayName();
-				}
-			};
-        } else if(tempElementName.equalsIgnoreCase("property")) { //$NON-NLS-1$
-			elementType= IAntEditorConstants.TYPE_PROPERTY;
-        	tempElement = new XmlElement(tempElementName) {
-                public String getDisplayName() {
-                    XmlAttribute tempXmlAttr = getAttributeNamed(IAntEditorConstants.ATTR_NAME);
-                    if(tempXmlAttr != null) {
-                    	return tempXmlAttr.getValue();
-                    }
-                    tempXmlAttr = getAttributeNamed(IAntEditorConstants.ATTR_FILE);
-                    if(tempXmlAttr != null) {
-                    	return "file="+tempXmlAttr.getValue(); //$NON-NLS-1$
-                    }	
-                    tempXmlAttr = getAttributeNamed(IAntEditorConstants.ATTR_RESOURCE);
-                    if(tempXmlAttr != null) {
-                    	return "resource="+tempXmlAttr.getValue(); //$NON-NLS-1$
-                    }	
-                    tempXmlAttr = getAttributeNamed(IAntEditorConstants.ATTR_ENVIRONMENT);
-                    if(tempXmlAttr != null) {
-                    	return "environment="+tempXmlAttr.getValue(); //$NON-NLS-1$
-                    }	
-                    return super.getDisplayName();
-                }
-        	};
-        }	
-        else if(tempElementName.equalsIgnoreCase("antcall")) { //$NON-NLS-1$
-			elementType= IAntEditorConstants.TYPE_ANTCALL;
-        	tempElement = new XmlElement(tempElementName) {
-                public String getDisplayName() {
-		        	String tempDisplayName = "antcall "; //$NON-NLS-1$
-                    XmlAttribute tempXmlAttr = getAttributeNamed(IAntEditorConstants.ATTR_TARGET);
-                    if(tempXmlAttr != null) {
-                    	tempDisplayName += tempXmlAttr.getValue();
-                    }
-                    return tempDisplayName;
-                }
-        	};
-        }	
-        else if(tempElementName.equalsIgnoreCase("mkdir")) { //$NON-NLS-1$
-			elementType= IAntEditorConstants.TYPE_MKDIR;
-        	tempElement = new XmlElement(tempElementName) {
-                public String getDisplayName() {
-		        	String tempDisplayName = "mkdir "; //$NON-NLS-1$
-                    XmlAttribute tempXmlAttr = getAttributeNamed(IAntEditorConstants.ATTR_DIR);
-                    if(tempXmlAttr != null) {
-                    	tempDisplayName += tempXmlAttr.getValue();
-                    }
-                    return tempDisplayName;
-                }
-        	};
-        }	
-        else if(tempElementName.equalsIgnoreCase("copy")) { //$NON-NLS-1$
-			elementType= IAntEditorConstants.TYPE_COPY;
-        	tempElement = new XmlElement(tempElementName) {
-                public String getDisplayName() {
-		        	String tempDisplayName = "copy "; //$NON-NLS-1$
-                    XmlAttribute tempXmlAttr = getAttributeNamed(IAntEditorConstants.ATTR_FILE);
-                    if(tempXmlAttr != null) {
-                    	tempDisplayName += tempXmlAttr.getValue();
-                    }
-                    return tempDisplayName;
-                }
-        	};
-        }	
-        else if(tempElementName.equalsIgnoreCase("tar")  //$NON-NLS-1$
-        	|| tempElementName.equalsIgnoreCase("jar") //$NON-NLS-1$
-        	|| tempElementName.equalsIgnoreCase("war") //$NON-NLS-1$
-        	|| tempElementName.equalsIgnoreCase("zip")) { //$NON-NLS-1$
-			elementType= IAntEditorConstants.TYPE_ARCHIVE;
-        	tempElement = new XmlElement(tempElementName) {
-                public String getDisplayName() {
-		        	String tempDisplayName = super.getDisplayName();
-                    XmlAttribute tempXmlAttr = getAttributeNamed(IAntEditorConstants.ATTR_DESTFILE);
-                    if(tempXmlAttr != null) {
-                    	tempDisplayName += " " + tempXmlAttr.getValue(); //$NON-NLS-1$
-                    }
-                    return tempDisplayName;
-                }
-        	};
-        }	
-        else if(tempElementName.equalsIgnoreCase("untar")  //$NON-NLS-1$
-        	|| tempElementName.equalsIgnoreCase("unjar") //$NON-NLS-1$
-        	|| tempElementName.equalsIgnoreCase("unwar") //$NON-NLS-1$
-        	|| tempElementName.equalsIgnoreCase("gunzip") //$NON-NLS-1$
-        	|| tempElementName.equalsIgnoreCase("bunzip2") //$NON-NLS-1$
-        	|| tempElementName.equalsIgnoreCase("unzip")) { //$NON-NLS-1$
-			elementType= IAntEditorConstants.TYPE_DECOMPRESS;
-        	tempElement = new XmlElement(tempElementName) {
-                public String getDisplayName() {
-		        	String tempDisplayName = super.getDisplayName();
-                    XmlAttribute tempXmlAttr = getAttributeNamed(IAntEditorConstants.ATTR_SRC);
-                    if(tempXmlAttr != null) {
-                    	tempDisplayName += " " + tempXmlAttr.getValue(); //$NON-NLS-1$
-                    }
-                    return tempDisplayName;
-                }
-        	};
-        }	
-        else if(tempElementName.equalsIgnoreCase("gzip")  //$NON-NLS-1$
-        		|| tempElementName.equalsIgnoreCase("bzip2")) { //$NON-NLS-1$
-			elementType= IAntEditorConstants.TYPE_COMPRESS;
-        	tempElement = new XmlElement(tempElementName) {
-                public String getDisplayName() {
-		        	String tempDisplayName = super.getDisplayName();
-                    XmlAttribute tempXmlAttr = getAttributeNamed(IAntEditorConstants.ATTR_ZIPFILE);
-                    if(tempXmlAttr != null) {
-                    	tempDisplayName += " " + tempXmlAttr.getValue(); //$NON-NLS-1$
-                    }
-                    return tempDisplayName;
-                }
-        	};
-        }	
-        else if(tempElementName.equalsIgnoreCase("exec")) { //$NON-NLS-1$
-			elementType= IAntEditorConstants.TYPE_EXEC;
-        	tempElement = new XmlElement(tempElementName) {
-                public String getDisplayName() {
-		        	String tempDisplayName = "exec "; //$NON-NLS-1$
-                    XmlAttribute tempXmlAttr = getAttributeNamed(IAntEditorConstants.ATTR_COMMAND);
-                    if(tempXmlAttr != null) {
-                    	tempDisplayName += tempXmlAttr.getValue();
-                    }
-                    tempXmlAttr = getAttributeNamed(IAntEditorConstants.ATTR_EXECUTABLE);
-                    if(tempXmlAttr != null) {
-                    	tempDisplayName += tempXmlAttr.getValue();
-                    }
-                    return tempDisplayName;
-                }
-        	};
-        }	
-        else if(tempElementName.equalsIgnoreCase("delete")) { //$NON-NLS-1$
-			elementType= IAntEditorConstants.TYPE_DELETE;
-        	tempElement = new XmlElement(tempElementName) {
-                public String getDisplayName() {
-		        	String tempDisplayName = "delete "; //$NON-NLS-1$
-                    XmlAttribute tempXmlAttr = getAttributeNamed(IAntEditorConstants.ATTR_FILE);
-                    if(tempXmlAttr != null) {
-                    	return tempDisplayName + tempXmlAttr.getValue();
-                    }
-                    tempXmlAttr = getAttributeNamed(IAntEditorConstants.ATTR_DIR);
-                    if(tempXmlAttr != null) {
-                    	return tempDisplayName + tempXmlAttr.getValue();
-                    }
-                    return tempDisplayName;
-                }
-        	};
-        }	
-        else {
-			elementType= IAntEditorConstants.TYPE_UNKNOWN;
-	        tempElement = new XmlElement(tempElementName);
-        }
-
-		if (attributes != null) { 
-			// Add all attributes
-			for(int i=0; i < attributes.getLength(); i++) {
-				String tempAttrName = attributes.getLocalName(i);
-				if(tempAttrName == null || tempAttrName.length() == 0) {
-					tempAttrName = attributes.getQName(i);
-				}
-				String tempAttrValue = attributes.getValue(i);
-				tempElement.addAttribute(new XmlAttribute(tempAttrName, tempAttrValue));				
-			}
-		}
-		// Add the type attribute
-		tempElement.addAttribute(new XmlAttribute(IAntEditorConstants.ATTR_TYPE, elementType));
-        tempElement.setFilePath(locator.getSystemId());
-        return tempElement;
-    }
-
-
-    /* (non-Javadoc)
-     * @see org.xml.sax.ContentHandler#endElement(String, String, String)
-     */
-    public void endElement(String aUri, String aLocalName, String aQualifiedName)
-        throws SAXException {
-
-        String tempTagName = aLocalName.length() > 0 ? aLocalName : aQualifiedName;
-        
-        XmlElement tempLastStillOpenElement = (XmlElement)stillOpenElements.peek(); 
-        if(tempLastStillOpenElement != null && tempLastStillOpenElement.getName().equalsIgnoreCase(tempTagName)) {
-	    	computeEndLocation(tempLastStillOpenElement);
-            stillOpenElements.pop();
-        }
-    }
-
-
-    /**
-     * We use the document locator to locate the position of elements in the
-     * document exactly.
-     * 
-     * @see org.xml.sax.ContentHandler#setDocumentLocator(Locator)
-     */
-    public void setDocumentLocator(Locator aLocator) {
-        locator = aLocator;
-        super.setDocumentLocator(aLocator);
-    }
-
-
-    /**
-     * Returns the parent that has been created during a prior 
-     * parsing.
-     * <P>
-     * It is quite common that parsing stopped before the current cursor 
-     * position. That happens when the parser finds an error within the parsed 
-     * document before. 
-     * 
-     * @return the parent element or <code>null</code> if no parent exists
-     */
-    public XmlElement getRootElement() {
-        return rootElement;
-    }
-
-
-    /*
-     * @see org.xml.sax.ErrorHandler#warning(org.xml.sax.SAXParseException)
-     */
-    public void warning(SAXParseException anException) throws SAXException {
-		if (errorHandler != null) {
-			XmlElement element= createProblemElement(anException);
-			errorHandler.warning(anException, element);
-		}
-    }
-
-    /* (non-Javadoc)
-     * @see org.xml.sax.ErrorHandler#error(SAXParseException)
-     */
-    public void error(SAXParseException anException) throws SAXException {
-		generateErrorElementHierarchy();
-		if (errorHandler != null) {
-			XmlElement errorElement= createProblemElement(anException);
-			errorHandler.error(anException, errorElement);
-		}
-    }
-
-    /**
-     * Fatal errors occur when we parse a non valid file. Populate the error
-     * element hierarchy.
-     * 
-     * @see org.xml.sax.ErrorHandler#fatalError(SAXParseException)
-     */
-    public void fatalError(SAXParseException anException) throws SAXException {
-		generateErrorElementHierarchy();
-		if (errorHandler != null) {
-			XmlElement errorElement= createProblemElement(anException);
-			errorHandler.fatalError(anException, errorElement);
-		}
-    }
-
-	private XmlElement createProblemElement(SAXParseException exception) {
-		int lineNumber= exception.getLineNumber();
-		StringBuffer message= new StringBuffer(exception.getMessage());
-		if (lineNumber != -1){
-			message.append(AntOutlineMessages.getString("OutlinePreparingHandler._line___2") + lineNumber); //$NON-NLS-1$
-		}
-
-		XmlElement errorNode= new XmlElement(message.toString());
-		errorNode.setFilePath(exception.getSystemId());
-		errorNode.setExternal(isExternal());
-		errorNode.setIsErrorNode(true);
-		computeErrorLocation(errorNode, exception);
-		return errorNode;
-	}
-	
-	private void generateErrorElementHierarchy() {
-		XmlElement openElement= getLastOpenElement();
-		while (openElement != null) {
-			openElement.setIsErrorNode(true);
-			openElement= openElement.getParentNode();
-		}
-	}
-	
-	/**
-	 * @see org.xml.sax.EntityResolver#resolveEntity(java.lang.String, java.lang.String)
-	 */
-	public InputSource resolveEntity(String publicId, String systemId) throws SAXException {
-			int index= systemId.indexOf(':');
-			if (index > 0) {
-				//remove file:
-				systemId= systemId.substring(index + 1, systemId.length());
-			}
-			File resolvedFile= null;
-			IPath filePath= new Path(systemId);
-			IFile file = ResourcesPlugin.getWorkspace().getRoot().getFileForLocation(filePath);
-			if (file == null || !file.exists()) {
-				//relative path
-				try {
-					//this call is ok if mainFileContainer is null
-					resolvedFile= FileUtils.newFileUtils().resolveFile(mainFile.getParentFile(), systemId);
-				} catch (BuildException be) {
-					return null;
-				}
-			} else {
-				resolvedFile= file.getLocation().toFile();
-			}
-		
-			if (resolvedFile != null && resolvedFile.exists()) {
-				try {
-					InputSource inputSource= new InputSource(new FileReader(resolvedFile));
-					inputSource.setSystemId(resolvedFile.getAbsolutePath());
-					return inputSource;
-				} catch (FileNotFoundException e) {
-					return null;
-				}
-			}
-					
-		return super.resolveEntity(publicId, systemId);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.xml.sax.ext.LexicalHandler#comment(char[], int, int)
-	 */
-	public void comment(char[] ch, int start, int length) throws SAXException {
-		if (isInDTD || isExternal()) {
-			return;
-		}
-
-		try {
-			lastExternalEntityOffset= getOffset(locator.getLineNumber(), locator.getColumnNumber()) - 1;
-		} catch (BadLocationException e) {
-			AntUIPlugin.log(e);
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.xml.sax.ext.LexicalHandler#endCDATA()
-	 */
-	public void endCDATA() throws SAXException {
-	}
-
-	/* (non-Javadoc)
-	 * @see org.xml.sax.ext.LexicalHandler#endDTD()
-	 */
-	public void endDTD() throws SAXException {
-		isInDTD= false;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.xml.sax.ext.LexicalHandler#endEntity(java.lang.String)
-	 */
-	public void endEntity(String name) throws SAXException {
-		if (isInDTD) {
-			return;
-		}
-		XmlElement element= getLastOpenElement();
-		boolean isNestedRootExternal= element == null || element.getParentNode() == null || element.getParentNode().isExternal();
-		if (!isNestedRootExternal) {
-			isTopLevelRootExternal= true;
-		}
-		endElement(null, name, ""); //$NON-NLS-1$
-		if (!isNestedRootExternal) {
-			isTopLevelRootExternal= false;
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.xml.sax.ext.LexicalHandler#startCDATA()
-	 */
-	public void startCDATA() throws SAXException {
-	}
-
-	/* (non-Javadoc)
-	 * @see org.xml.sax.ext.LexicalHandler#startDTD(java.lang.String, java.lang.String, java.lang.String)
-	 */
-	public void startDTD(String name, String publicId, String systemId) throws SAXException {
-		isInDTD= true;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.xml.sax.ext.LexicalHandler#startEntity(java.lang.String)
-	 */
-	public void startEntity(String name) throws SAXException {
-		if (isInDTD) {
-			return;
-		}
-		boolean isNestedRootExternal= isExternal();
-		if (!isNestedRootExternal) {
-			isTopLevelRootExternal= true;
-		}
-		startElement(null, name, "", null); //$NON-NLS-1$
-		XmlElement external= (XmlElement)stillOpenElements.peek();
-		external.setExternal(true);
-		external.setRootExternal(true);
-		external.getAttributes().removeAll(external.getAttributes());
-		external.addAttribute(new XmlAttribute(IAntEditorConstants.ATTR_TYPE, IAntEditorConstants.TYPE_EXTERNAL));
-		if (!isNestedRootExternal) {
-			isTopLevelRootExternal= false;
-		}
-	}
-
-	private void computeStartLocation(XmlElement element) {
-		if (element.isExternal()) {
-			return;
-		}
-		
-		try {
-			int offset;
- 			
-			if (isTopLevelRootExternal) {
-				String source= "&" + element.getName() + ";";  //$NON-NLS-1$ //$NON-NLS-2$
-				offset= document.search(lastExternalEntityOffset + 1, source, true, true, false);
-				lastExternalEntityOffset= offset;
-			} else {
-				int locatorLine= locator.getLineNumber();
-				int locatorColumn= locator.getColumnNumber();
-				String prefix= "<"; //$NON-NLS-1$
-
-				if (locatorColumn <= 0) {
-					offset= getOffset(locatorLine, getLastCharColumn(locatorLine));
-					offset= document.search(offset, prefix + element.getName(), false, false, false);
-					
-					lastExternalEntityOffset= offset;
-				} else {
-					offset= getOffset(locatorLine, locatorColumn);
-					
-					lastExternalEntityOffset= offset - 1;
-					
-					offset= document.search(offset - 1, prefix, false, true, false); 
-				}
-			}
- 			
-			int line= getLine(offset);
-			int column= getColumn(offset, line);
-			
-			element.setOffset(offset);
-			element.setStartingRow(line);
-			element.setStartingColumn(column);
-		} catch (BadLocationException e) {
-			//ignore as the parser may be out of sync with the document during reconciliation
-		}
-	}
-
-	private void computeEndLocation(XmlElement element) {
-		if (element.isExternal() && !isTopLevelRootExternal) {
-			return;
-		}
-		
-		try {
-			int length, line, column;
-
-			if (isTopLevelRootExternal) {
-				length= element.getName().length() + 2;
-				line= element.getStartingRow();
-				column= element.getStartingColumn() + length;
-			} else {
-				line= locator.getLineNumber();
-				column= locator.getColumnNumber();
-				
-				int offset;
- 			
-				if (column <= 0) {
-					int lineOffset= getOffset(line, 1);
-					offset= document.search(lineOffset, element.getName(), true, false, false);
-					if (offset < 0 || getLine(offset) != line) {
-						offset= lineOffset;
-					}
-					String endDelimiter= ">"; //$NON-NLS-1$
-					offset= document.search(lineOffset, endDelimiter, true, true, false); //$NON-NLS-1$
-					if (offset < 0 || getLine(offset) != line) {
-						offset= lineOffset;
-						column= 1;
-					} else {
-						offset++;
-						column= getColumn(offset, line);
-					}
-				} else {
-					offset= getOffset(line, column);
-				}
-				
-				length= offset - element.getOffset();
-				
-				lastExternalEntityOffset= offset - 1;
-			}
- 			
-			element.setLength(length);
-			element.setEndingRow(line);
-			element.setEndingColumn(column);
-		} catch (BadLocationException e) {
-			//ignore as the parser may be out of sync with the document during reconciliation
-		}
-	}
-
-	private void computeErrorLocation(XmlElement element, SAXParseException exception) {
-		if (element.isExternal()) {
-			return;
-		}
-		
-		try {
-			int line= exception.getLineNumber();
-			int startColumn= exception.getColumnNumber();
-			int endColumn;
-			
-			if (line <= 0) {
-				line= locator.getLineNumber();
-				startColumn= locator.getColumnNumber();
-				
-				if (line <= 0) {
-					line= 1;
-					startColumn= 1;
-				}
-			}
-
-			if (startColumn <= 0) {
-				startColumn= 1;
-				endColumn= getLastCharColumn(line) + 1;
-			} else {
-				if (startColumn > 1) {
-					--startColumn;
-				}
-				
-				endColumn= startColumn;
-				if (startColumn <= getLastCharColumn(line)) {
-					++endColumn;
-				}
-			}
-			
-			int offset= getOffset(line, startColumn);
-
-			element.setStartingRow(line);
-			element.setStartingColumn(startColumn);
-			element.setOffset(offset);
-			
-			element.setEndingRow(line);
-			element.setEndingColumn(endColumn);
-			element.setLength(endColumn - startColumn);
-		} catch (BadLocationException e) {
-			//ignore as the parser may be out of sync with the document during reconciliation
-		}		
-	}
-
-	public void fixEndLocations() {
-		fixEndLocations(null);
-	}
-	
-	public void fixEndLocations(SAXParseException e) {
-		XmlElement lastOpenElement= getLastOpenElement();
-		if (lastOpenElement == null) {
-			return;
-		}
-		
-		boolean recoverFromExternal= lastOpenElement.isExternal();
-		
-		while (lastOpenElement.isExternal() && (!lastOpenElement.isRootExternal() || (lastOpenElement.getParentNode() != null && lastOpenElement.getParentNode().isExternal()))) {
-			stillOpenElements.pop();
-			lastOpenElement= getLastOpenElement();
-		}
-		
-		try {
-			int offset, line, column;
-			
-			if (recoverFromExternal) {
-				XmlElement element= (XmlElement) stillOpenElements.peek();
-				int length= element.getName().length() + 2;
-				offset= element.getOffset() + length;
-				line= element.getStartingRow();
-				column= element.getStartingColumn() + length;
-			} else if (e == null) {
-				XmlElement element= (XmlElement) stillOpenElements.peek();			
-				offset= element.getOffset();
-				line= element.getStartingRow();
-				column= element.getStartingColumn();
-			} else {
-				line= e.getLineNumber();
-				column= e.getColumnNumber();
-				
-				if (line <= 0) {
-					line= 1;
-				}
-				
-				if (column <= 0) {
-					column= 1;
-				}
-
-				offset= getOffset(line, column);
-			}			
-			
-			while (!stillOpenElements.empty()) {
-				XmlElement element= (XmlElement) stillOpenElements.pop();			
-				element.setLength(offset - element.getOffset());
-				element.setEndingRow(line);
-				element.setEndingColumn(column);
-			}
-		} catch (BadLocationException ble) {
-			//ignore as the parser may be out of sync with the document during reconciliation
-		}
-	}
-
-	public XmlElement getLastOpenElement() {
-		if (!stillOpenElements.empty()) {
-			return (XmlElement) stillOpenElements.peek();
-		}
-		return null;
-	}
-
-	private boolean isExternal() {
-		if (!stillOpenElements.empty()) {
-			return ((XmlElement) stillOpenElements.peek()).isExternal();
-		}
-		return false;
-	}
-
-	private int getLastCharColumn(int line) throws BadLocationException {
-		String lineDelimiter= document.getLineDelimiter(line - 1);
-		int lineDelimiterLength= lineDelimiter != null ? lineDelimiter.length() : 0;
-		return document.getLineLength(line - 1) - lineDelimiterLength;
-	}
-
-	private int getOffset(int line, int column) throws BadLocationException {
-		return document.getLineOffset(line - 1) + column - 1;
-	}
-
-	private int getLine(int offset) throws BadLocationException {
-		return document.getLineOfOffset(offset) + 1;
-	}
-
-	private int getColumn(int offset, int line) throws BadLocationException {
-		return offset - document.getLineOffset(line - 1) + 1;
-	}
-
-	public void begin() {
-		if (errorHandler != null) {
-			errorHandler.beginReporting();
-		}
-	}
-
-	public void end() {
-		if (errorHandler != null) {
-			errorHandler.endReporting();
-		}
-	}
-
-	public void setDocument(IDocument document) {
-		this.document= document;
-	}
-
-	public void setProblemRequestor(IProblemRequestor requestor) {
-		if (requestor != null) {
-			errorHandler= new XEErrorHandler(requestor);
-		} else {
-			errorHandler= null;
-		}
-	}
-}
\ No newline at end of file
diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/outline/XEErrorHandler.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/outline/XEErrorHandler.java
deleted file mode 100644
index 2619ff3..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/outline/XEErrorHandler.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.ui.internal.editor.outline;
-
-import org.eclipse.jface.text.Region;
-import org.eclipse.ant.ui.internal.editor.xml.XmlElement;
-import org.xml.sax.SAXParseException;
-
-
-public class XEErrorHandler implements IProblemRequestor {
-	
-	protected class XMLProblem extends Region implements IProblem {
-		private String fCode, fMessage;
-		private int fSeverity;
-		
-		public XMLProblem(String code, String message, int severity, int offset, int length) {
-			super(offset, length);
-			fCode= code;
-			fMessage= message;
-			fSeverity= severity;
-		}
-		
-		public String getCode() {
-			return fCode;
-		}
-		
-		public String getMessage() {
-			return fMessage;
-		}
-		
-		public boolean isError() {
-			return fSeverity == SEVERTITY_ERROR || fSeverity == SEVERTITY_FATAL_ERROR;
-		}
-		
-		public boolean isWarning() {
-			return fSeverity == SEVERTITY_WARNING;
-		}
-		
-	}
-	
-	private static final int SEVERTITY_WARNING= 0;
-	private static final int SEVERTITY_ERROR= 1;
-	private static final int SEVERTITY_FATAL_ERROR= 2;
-
-	private IProblemRequestor fProblemRequestor;	
-	
-	/**
-	 * Constructor XEErrorHandler.
-	 * @param resourceProvider
-	 */
-	public XEErrorHandler(IProblemRequestor problemRequestor) {
-		fProblemRequestor= problemRequestor;
-	}
-
-	public void acceptProblem(IProblem problem) {
-		if (fProblemRequestor != null) {
-			fProblemRequestor.acceptProblem(problem);
-		}
-	}
-
-	public void beginReporting() {
-		if (fProblemRequestor != null) {
-			fProblemRequestor.beginReporting();
-		}
-	}
-	
-	public void endReporting() {
-		if (fProblemRequestor != null) {
-			fProblemRequestor.endReporting();
-		}
-	}
-
-	protected IProblem createProblem(SAXParseException exception, XmlElement element, int severity) {
-		return new XMLProblem(exception.toString(), exception.getMessage(), severity, element.getOffset(), element.getLength());
-	}
-
-	protected void notifyProblemRequestor(SAXParseException exception, XmlElement element, int severity) {
-		IProblem problem= createProblem(exception, element, severity);
-		acceptProblem(problem);
-	}
-
-	public void warning(SAXParseException exception, XmlElement element) {
-		notifyProblemRequestor(exception, element, SEVERTITY_WARNING);
-	}
-	
-	public void error(SAXParseException exception, XmlElement element) {
-		notifyProblemRequestor(exception, element, SEVERTITY_ERROR);
-	}
-
-	public void fatalError(SAXParseException exception, XmlElement element) {
-		notifyProblemRequestor(exception, element, SEVERTITY_FATAL_ERROR);
-	}
-}
diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/outline/XMLCore.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/outline/XMLCore.java
deleted file mode 100644
index fa79bd4..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/outline/XMLCore.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.ui.internal.editor.outline;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-
-/**
- * XMLCore.java
- */
-public class XMLCore {
-	
-	private static XMLCore inst;
-	
-	public static XMLCore getDefault() {
-		if (inst == null) {
-			inst= new XMLCore();
-		}
-			
-		return inst;
-	}
-	
-	private ArrayList fModelChangeListeners= new ArrayList();
-	
-	private XMLCore() { }
-
-	public void addDocumentModelListener(IDocumentModelListener listener) {
-		synchronized (fModelChangeListeners) {
-			fModelChangeListeners.add(listener);
-		}
-	}
-	
-	public void removeDocumentModelListener(IDocumentModelListener listener) {
-		synchronized (fModelChangeListeners) {
-			fModelChangeListeners.remove(listener);
-		}
-	}
-	
-	public void notifyDocumentModelListeners(DocumentModelChangeEvent event) {
-		Iterator i;
-		synchronized (fModelChangeListeners) {
-			i= new ArrayList(fModelChangeListeners).iterator();
-		}
-		while (i.hasNext()) {
-			((IDocumentModelListener)i.next()).documentModelChanged(event);
-		}
-	}
-}
diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/text/AnnotationAccess.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/text/AnnotationAccess.java
deleted file mode 100644
index 431cdc7..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/text/AnnotationAccess.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.ui.internal.editor.text;
-
-import org.eclipse.jface.text.source.Annotation;
-import org.eclipse.jface.text.source.IAnnotationAccess;
-
-/**
- * AnnotationAccess.java
- */
-public class AnnotationAccess implements IAnnotationAccess {
-
-	/*
-	 * @see org.eclipse.jface.text.source.IAnnotationAccess#getType(org.eclipse.jface.text.source.Annotation)
-	 */
-	public Object getType(Annotation annotation) {
-		if (annotation instanceof IXMLAnnotation) {
-			IXMLAnnotation xmlAnnotation= (IXMLAnnotation) annotation;
-			if (xmlAnnotation.isRelevant()) {
-				return xmlAnnotation.getAnnotationType();
-			}
-		}
-		return null;
-	}
-
-	/*
-	 * @see org.eclipse.jface.text.source.IAnnotationAccess#isMultiLine(org.eclipse.jface.text.source.Annotation)
-	 */
-	public boolean isMultiLine(Annotation annotation) {
-		return true;
-	}
-
-	/*
-	 * @see org.eclipse.jface.text.source.IAnnotationAccess#isTemporary(org.eclipse.jface.text.source.Annotation)
-	 */
-	public boolean isTemporary(Annotation annotation) {
-		if (annotation instanceof IXMLAnnotation) {
-			IXMLAnnotation xmlAnnotation= (IXMLAnnotation) annotation;
-			if (xmlAnnotation.isRelevant()) {
-				return xmlAnnotation.isTemporary();
-			}
-		}
-		return false;
-	}
-}
diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/text/AnnotationType.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/text/AnnotationType.java
deleted file mode 100644
index e96b1e7..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/text/AnnotationType.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.ui.internal.editor.text;
-
-import org.eclipse.jface.util.Assert;
-
-final public class AnnotationType {
-	
-	public final static AnnotationType UNKNOWN= new AnnotationType();
-	public final static AnnotationType BOOKMARK= new AnnotationType();
-	public final static AnnotationType TASK= new AnnotationType();
-	public final static AnnotationType ERROR= new AnnotationType();
-	public final static AnnotationType WARNING= new AnnotationType();
-	public final static AnnotationType INFO= new AnnotationType();
-	public final static AnnotationType SEARCH= new AnnotationType();
-	
-	private AnnotationType() {
-	}
-
-	public String toString() {
-		if (this == UNKNOWN)
-			return "AnnotationType.UNKNOWN"; //$NON-NLS-1$
-
-		if (this == BOOKMARK)
-			return "AnnotationType.BOOKMARK"; //$NON-NLS-1$
-
-		if (this == TASK)
-			return "AnnotationType.TASK"; //$NON-NLS-1$
-		
-		if (this == ERROR)
-			return "AnnotationType.ERROR"; //$NON-NLS-1$
-
-		if (this == WARNING)
-			return "AnnotationType.WARNING"; //$NON-NLS-1$
-
-		if (this == SEARCH)
-			return "AnnotationType.SEARCH"; //$NON-NLS-1$
-
-		Assert.isLegal(false);
-		return ""; //$NON-NLS-1$
-	}
-}
diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/text/AntEditorDocumentProvider.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/text/AntEditorDocumentProvider.java
deleted file mode 100644
index edd9e67..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/text/AntEditorDocumentProvider.java
+++ /dev/null
@@ -1,439 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2003 GEBIT Gesellschaft fuer EDV-Beratung
- * und Informatik-Technologien mbH, 
- * Berlin, Duesseldorf, Frankfurt (Germany) and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     GEBIT Gesellschaft fuer EDV-Beratung und Informatik-Technologien mbH - initial API and implementation
- * 	   IBM Corporation - bug 24108
- *******************************************************************************/
-
-package org.eclipse.ant.ui.internal.editor.text;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.IDocumentPartitioner;
-import org.eclipse.jface.text.Position;
-import org.eclipse.jface.text.rules.DefaultPartitioner;
-import org.eclipse.jface.text.source.Annotation;
-import org.eclipse.jface.text.source.AnnotationModelEvent;
-import org.eclipse.jface.text.source.IAnnotationModel;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IFileEditorInput;
-import org.eclipse.ui.editors.text.FileDocumentProvider;
-import org.eclipse.ant.ui.internal.editor.outline.AntModel;
-import org.eclipse.ant.ui.internal.editor.outline.IProblem;
-import org.eclipse.ant.ui.internal.editor.outline.LocationProvider;
-import org.eclipse.ant.ui.internal.editor.outline.IProblemRequestor;
-import org.eclipse.ant.ui.internal.editor.outline.XMLCore;
-import org.eclipse.ui.texteditor.MarkerAnnotation;
-import org.eclipse.ui.texteditor.ResourceMarkerAnnotationModel;
-
-/*
- * This file originates from an internal package of Eclipse's 
- * Manifest Editor. It has been copied by GEBIT to here in order to
- * permanently use those features. It has been renamed and edited by GEBIT 
- * after copying.
- */
-public class AntEditorDocumentProvider extends FileDocumentProvider {
-
-	protected class XMLAnnotationModel extends ResourceMarkerAnnotationModel implements IProblemRequestor {
-		
-		private List fGeneratedAnnotations= new ArrayList();
-		private List fCollectedProblems= new ArrayList();
-		
-		private ReverseMap fReverseMap= new ReverseMap();
-		private List fPreviouslyOverlaid= null; 
-		private List fCurrentlyOverlaid= new ArrayList();
-
-		/**
-		 * Constructor for XMLAnnotationModel.
-		 * @param resource
-		 */
-		public XMLAnnotationModel(IFileEditorInput input) {
-			super(input.getFile());
-		}
-
-		/*
-		 * @see org.eclipse.ui.texteditor.AbstractMarkerAnnotationModel#createMarkerAnnotation(org.eclipse.core.resources.IMarker)
-		 */
-		protected MarkerAnnotation createMarkerAnnotation(IMarker marker) {
-			return new XMLMarkerAnnotation(marker);
-		}
-
-		protected Position createPositionFromProblem(IProblem problem) {
-			int start= problem.getOffset();
-			if (start >= 0) {
-				int length= problem.getLength();
-					
-				if (length >= 0)
-					return new Position(start, length);
-			}
-
-			return null;
-		}
-		
-		/* (non-Javadoc)
-		 * @see org.eclipse.ant.ui.internal.editor.outline.IProblemRequestor#acceptProblem(org.eclipse.ant.ui.internal.editor.outline.IProblem)
-		 */
-		public void acceptProblem(IProblem problem) {
-			fCollectedProblems.add(problem);
-		}
-		
-		/* (non-Javadoc)
-		 * @see org.eclipse.ant.ui.internal.editor.outline.IProblemRequestor#acceptProblem(org.eclipse.ant.ui.internal.editor.outline.IProblem)
-		 */
-		public void beginReporting() {
-		}
-		
-		/* (non-Javadoc)
-		 * @see org.eclipse.ant.ui.internal.editor.outline.IProblemRequestor#acceptProblem(org.eclipse.ant.ui.internal.editor.outline.IProblem)
-		 */
-		public void endReporting() {
-			boolean temporaryProblemsChanged= false;
-			fPreviouslyOverlaid= fCurrentlyOverlaid;
-			fCurrentlyOverlaid= new ArrayList();
-				
-			synchronized (fAnnotations) {
-					
-				if (fGeneratedAnnotations.size() > 0) {
-					temporaryProblemsChanged= true;	
-					removeAnnotations(fGeneratedAnnotations, false, true);
-					fGeneratedAnnotations.clear();
-				}
-					
-				if (fCollectedProblems != null && fCollectedProblems.size() > 0) {
-					Iterator e= fCollectedProblems.iterator();
-					while (e.hasNext()) {
-							
-						IProblem problem= (IProblem) e.next();
-							
-						Position position= createPositionFromProblem(problem);
-						if (position != null) {
-								
-							XMLProblemAnnotation annotation= new XMLProblemAnnotation(problem);
-							overlayMarkers(position, annotation);								
-							fGeneratedAnnotations.add(annotation);
-							addAnnotation(annotation, position, false);
-								
-							temporaryProblemsChanged= true;
-						}
-					}
-						
-					fCollectedProblems.clear();
-				}
-					
-				removeMarkerOverlays();
-				fPreviouslyOverlaid.clear();
-				fPreviouslyOverlaid= null;
-			}
-					
-			if (temporaryProblemsChanged)
-				fireModelChanged(new AnnotationModelEvent(this));
-		}
-
-		private void removeMarkerOverlays() {
-			Iterator e= fPreviouslyOverlaid.iterator();
-			while (e.hasNext()) {
-				XMLMarkerAnnotation annotation= (XMLMarkerAnnotation) e.next();
-				annotation.setOverlay(null);
-			}			
-		}
-			
-		/**
-		 * Overlays value with problem annotation.
-		 * @param problemAnnotation
-		 */
-		private void setOverlay(Object value, XMLProblemAnnotation problemAnnotation) {
-			if (value instanceof  XMLMarkerAnnotation) {
-				XMLMarkerAnnotation annotation= (XMLMarkerAnnotation) value;
-				if (annotation.isProblem()) {
-					annotation.setOverlay(problemAnnotation);
-					fPreviouslyOverlaid.remove(annotation);
-					fCurrentlyOverlaid.add(annotation);
-				}
-			}
-		}
-			
-		private void  overlayMarkers(Position position, XMLProblemAnnotation problemAnnotation) {
-			Object value= getAnnotations(position);
-			if (value instanceof List) {
-				List list= (List) value;
-				for (Iterator e = list.iterator(); e.hasNext();)
-					setOverlay(e.next(), problemAnnotation);
-			} else {
-				setOverlay(value, problemAnnotation);
-			}
-		}
-
-		private Object getAnnotations(Position position) {
-			return fReverseMap.get(position);
-		}
-						
-		/*
-		 * @see AnnotationModel#addAnnotation(Annotation, Position, boolean)
-		 */
-		protected void addAnnotation(Annotation annotation, Position position, boolean fireModelChanged) {
-			super.addAnnotation(annotation, position, fireModelChanged);
-				
-			Object cached= fReverseMap.get(position);
-			if (cached == null)
-				fReverseMap.put(position, annotation);
-			else if (cached instanceof List) {
-				List list= (List) cached;
-				list.add(annotation);
-			} else if (cached instanceof Annotation) {
-				List list= new ArrayList(2);
-				list.add(cached);
-				list.add(annotation);
-				fReverseMap.put(position, list);
-			}
-		}
-			
-		/*
-		 * @see AnnotationModel#removeAllAnnotations(boolean)
-		 */
-		protected void removeAllAnnotations(boolean fireModelChanged) {
-			super.removeAllAnnotations(fireModelChanged);
-			fReverseMap.clear();
-		}
-			
-		/*
-		 * @see AnnotationModel#removeAnnotation(Annotation, boolean)
-		 */
-		protected void removeAnnotation(Annotation annotation, boolean fireModelChanged) {
-			Position position= getPosition(annotation);
-			Object cached= fReverseMap.get(position);
-			if (cached instanceof List) {
-				List list= (List) cached;
-				list.remove(annotation);
-				if (list.size() == 1) {
-					fReverseMap.put(position, list.get(0));
-					list.clear();
-				}
-			} else if (cached instanceof Annotation) {
-				fReverseMap.remove(position);
-			}
-				
-			super.removeAnnotation(annotation, fireModelChanged);
-		}
-	};
-	
-	/**
-	 * Remembers a XML document model for each element.
-	 */
-	protected class XMLFileInfo extends FileInfo {
-		
-		public AntModel fAntModel;
-		
-		public XMLFileInfo(IDocument document, IAnnotationModel annotationModel, FileSynchronizer fileSynchronizer, AntModel model) {
-			super(document, annotationModel, fileSynchronizer);
-			fAntModel= model;
-		}
-	};
-	
-	/**
-	 * Internal structure for mapping positions to some value. 
-	 * The reason for this specific structure is that positions can
-	 * change over time. Thus a lookup is based on value and not
-	 * on hash value.
-	 */
-	protected static class ReverseMap {
-			
-		static class Entry {
-			Position fPosition;
-			Object fValue;
-		};
-			
-		private List fList= new ArrayList(2);
-		private int fAnchor= 0;
-			
-		public ReverseMap() {
-		}
-			
-		public Object get(Position position) {
-				
-			Entry entry;
-				
-			// behind anchor
-			int length= fList.size();
-			for (int i= fAnchor; i < length; i++) {
-				entry= (Entry) fList.get(i);
-				if (entry.fPosition.equals(position)) {
-					fAnchor= i;
-					return entry.fValue;
-				}
-			}
-				
-			// before anchor
-			for (int i= 0; i < fAnchor; i++) {
-				entry= (Entry) fList.get(i);
-				if (entry.fPosition.equals(position)) {
-					fAnchor= i;
-					return entry.fValue;
-				}
-			}
-				
-			return null;
-		}
-			
-		private int getIndex(Position position) {
-			Entry entry;
-			int length= fList.size();
-			for (int i= 0; i < length; i++) {
-				entry= (Entry) fList.get(i);
-				if (entry.fPosition.equals(position))
-					return i;
-			}
-			return -1;
-		}
-			
-		public void put(Position position,  Object value) {
-			int index= getIndex(position);
-			if (index == -1) {
-				Entry entry= new Entry();
-				entry.fPosition= position;
-				entry.fValue= value;
-				fList.add(entry);
-			} else {
-				Entry entry= (Entry) fList.get(index);
-				entry.fValue= value;
-			}
-		}
-			
-		public void remove(Position position) {
-			int index= getIndex(position);
-			if (index > -1)
-				fList.remove(index);
-		}
-			
-		public void clear() {
-			fList.clear();
-		}
-	}
-	
-	
-	private XMLCore fCore;
-
-	public AntEditorDocumentProvider(XMLCore core) {
-		super();
-		fCore= core;
-	}
-
-    private IDocumentPartitioner createDocumentPartitioner() {
-        DefaultPartitioner partitioner =
-            new DefaultPartitioner(
-                new AntEditorPartitionScanner(),
-                new String[] {
-                    AntEditorPartitionScanner.XML_TAG,
-                    AntEditorPartitionScanner.XML_COMMENT });
-        return partitioner;
-    }
-
-    public IDocument createDocument(Object element) throws CoreException {
-	    IDocument document;
-	    if (element instanceof IEditorInput) {
-		    document= new PartiallySynchronizedDocument();
-		    if (setDocumentContent(document, (IEditorInput) element, getEncoding(element))) {
-			    initializeDocument(document);
-		    }
-	    } else {
-		    document= null;
-	    }
-	    return document;
-    }
-	
-    protected void initializeDocument(IDocument document) {
-	    IDocumentPartitioner partitioner= createDocumentPartitioner();
-	    document.setDocumentPartitioner(partitioner);
-	    partitioner.connect(document);
-    }
-
-    public AntModel getAntModel(Object element) {
-	    ElementInfo info= getElementInfo(element);
-	    if (info instanceof XMLFileInfo) {
-		    XMLFileInfo xmlInfo= (XMLFileInfo) info;
-		    return xmlInfo.fAntModel;
-	    }
-	    return null;
-    }
-
-    /*
-     * @see org.eclipse.ui.texteditor.AbstractDocumentProvider#createAnnotationModel(java.lang.Object)
-     */
-    protected IAnnotationModel createAnnotationModel(Object element) throws CoreException {
-	    if (element instanceof IFileEditorInput) {
-		    IFileEditorInput input= (IFileEditorInput) element;
-		    return new XMLAnnotationModel(input);
-	    }
-	    return super.createAnnotationModel(element);
-    }
-
-    protected AntModel createAntModel(Object element, IDocument document, IAnnotationModel annotationModel) {
-	    IProblemRequestor requestor= annotationModel instanceof IProblemRequestor ? (IProblemRequestor) annotationModel : null;
-	    return new AntModel(fCore, document, requestor, new LocationProvider(element instanceof IFileEditorInput ? ((IFileEditorInput) element).getFile() : null));
-    }
-
-    /*
-     * @see org.eclipse.ui.editors.text.FileDocumentProvider#createElementInfo(java.lang.Object)
-     */
-    protected ElementInfo createElementInfo(Object element) throws CoreException {
-	    if (element instanceof IFileEditorInput) {
-			
-		    IFileEditorInput input= (IFileEditorInput) element;
-			
-		    try {
-			    refreshFile(input.getFile());
-		    } catch (CoreException x) {
-			    handleCoreException(x, "XMLDocumentProvider.createElementInfo: Core exception"); //$NON-NLS-1$
-		    }
-			
-		    IDocument d= null;
-		    IStatus s= null;
-			
-		    try {
-			    d= createDocument(element);
-		    } catch (CoreException x) {
-			    s= x.getStatus();
-			    d= createEmptyDocument();
-		    }
-			
-		    IAnnotationModel m= createAnnotationModel(element);
-		    AntModel o= createAntModel(element, d, m);
-		    o.install();
-		    FileSynchronizer f= new FileSynchronizer(input);
-		    f.install();
-			
-		    XMLFileInfo info= new XMLFileInfo(d, m, f, o);
-		    info.fModificationStamp= computeModificationStamp(input.getFile());
-		    info.fStatus= s;
-		    info.fEncoding= getPersistedEncoding(input);
-			
-		    return info;
-	    }
-		
-	    return super.createElementInfo(element);
-    }
-	
-    /*
-     * @see org.eclipse.ui.editors.text.FileDocumentProvider#disposeElementInfo(java.lang.Object, org.eclipse.ui.texteditor.AbstractDocumentProvider.ElementInfo)
-     */
-    protected void disposeElementInfo(Object element, ElementInfo info) {
-	    if (info instanceof XMLFileInfo) {
-		    XMLFileInfo xmlInfo= (XMLFileInfo) info;
-		    if (xmlInfo.fAntModel != null)
-			    xmlInfo.fAntModel.dispose();
-	    }
-	    super.disposeElementInfo(element, info);	
-    }
-}
diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/text/AntEditorPartitionScanner.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/text/AntEditorPartitionScanner.java
deleted file mode 100644
index 69deecd..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/text/AntEditorPartitionScanner.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2003 GEBIT Gesellschaft fuer EDV-Beratung
- * und Informatik-Technologien mbH, 
- * Berlin, Duesseldorf, Frankfurt (Germany) and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     GEBIT Gesellschaft fuer EDV-Beratung und Informatik-Technologien mbH - initial API and implementation
- * 	   IBM Corporation - bug 32890, bug 24108
- *******************************************************************************/
-
-package org.eclipse.ant.ui.internal.editor.text;
-
-/*
- * This file originates from an internal package of Eclipse's 
- * Manifest Editor. It has been copied by GEBIT to here in order to
- * permanently use those features. It has been renamed and edited by GEBIT 
- * after copying.
- */
-
-import org.eclipse.jface.text.rules.ICharacterScanner;
-import org.eclipse.jface.text.rules.IPredicateRule;
-import org.eclipse.jface.text.rules.IToken;
-import org.eclipse.jface.text.rules.MultiLineRule;
-import org.eclipse.jface.text.rules.RuleBasedPartitionScanner;
-import org.eclipse.jface.text.rules.Token;
-
-/**
- * Scanner that scans the document and partitions the document into the two 
- * supported content types:
- * <ul>
- * <li>XML_COMMENT</li>
- * <li>XML_TAG</li>
- * </ul>
- */
-public class AntEditorPartitionScanner extends RuleBasedPartitionScanner {
-	public class MultiLineRuleWithEOF extends MultiLineRule {
-		public MultiLineRuleWithEOF(String startSequence, String endSequence, IToken token) {
-			super(startSequence, endSequence, token);
-		}
-		protected boolean endSequenceDetected(ICharacterScanner scanner) {
-			boolean result= super.endSequenceDetected(scanner);
-			if (!result) {
-				if (scanner.read() == ICharacterScanner.EOF) {
-					result= true;
-				} else {
-					scanner.unread();
-				}
-			}
-			return result;
-		}
-	}
-
-	public final static String XML_COMMENT = "__xml_comment"; //$NON-NLS-1$
-	public final static String XML_TAG = "__xml_tag"; //$NON-NLS-1$
-
-    /**
-     * Creates an instance.
-     */
-	public AntEditorPartitionScanner() {
-
-		IPredicateRule[] rules =new IPredicateRule[2];
-
-        IToken xmlComment = new Token(XML_COMMENT);
-		rules[0]= new MultiLineRuleWithEOF("<!--", "-->", xmlComment); //$NON-NLS-1$ //$NON-NLS-2$
-
-        IToken tag = new Token(XML_TAG);
-		rules[1]= new TagRule(tag);
-	
-		setPredicateRules(rules);
-	}
-}
diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/text/AntEditorProcInstrScanner.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/text/AntEditorProcInstrScanner.java
deleted file mode 100644
index 66d7b99..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/text/AntEditorProcInstrScanner.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2003 GEBIT Gesellschaft fuer EDV-Beratung
- * und Informatik-Technologien mbH, 
- * Berlin, Duesseldorf, Frankfurt (Germany) and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     GEBIT Gesellschaft fuer EDV-Beratung und Informatik-Technologien mbH - initial API and implementation
- * 	   IBM Corporation - bug 24108
- *******************************************************************************/
-
-package org.eclipse.ant.ui.internal.editor.text;
-
-/*
- * This file originates from an internal package of Eclipse's 
- * Manifest Editor. It has been copied by GEBIT to here in order to
- * permanently use those features. It has been renamed and edited by GEBIT 
- * after copying.
- */
-
-import org.eclipse.ant.ui.internal.model.AntUIPlugin;
-import org.eclipse.jface.text.TextAttribute;
-import org.eclipse.jface.text.rules.IRule;
-import org.eclipse.jface.text.rules.IToken;
-import org.eclipse.jface.text.rules.RuleBasedScanner;
-import org.eclipse.jface.text.rules.SingleLineRule;
-import org.eclipse.jface.text.rules.Token;
-import org.eclipse.jface.text.rules.WhitespaceRule;
-
-public class AntEditorProcInstrScanner extends RuleBasedScanner {
-
-    public AntEditorProcInstrScanner() {
-		IRule[] rules =new IRule[2];
-        IToken procInstr =
-            new Token(
-                new TextAttribute(
-                    AntUIPlugin.getPreferenceColor(IAntEditorColorConstants.P_PROC_INSTR)));
-
-        //Add rule for processing instructions
-        rules[0]= new SingleLineRule("<?", "?>", procInstr); //$NON-NLS-1$ //$NON-NLS-2$
-
-        // Add generic whitespace rule.
-        rules[1]= new WhitespaceRule(new AntEditorWhitespaceDetector());
-
-        setRules(rules);
-    }
-}
diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/text/AntEditorTagScanner.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/text/AntEditorTagScanner.java
deleted file mode 100644
index 784820c..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/text/AntEditorTagScanner.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2003 GEBIT Gesellschaft fuer EDV-Beratung
- * und Informatik-Technologien mbH, 
- * Berlin, Duesseldorf, Frankfurt (Germany) and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     GEBIT Gesellschaft fuer EDV-Beratung und Informatik-Technologien mbH - initial API and implementation
- * 	   IBM Corporation - bug 31796, bug 24108
- *******************************************************************************/
-
-package org.eclipse.ant.ui.internal.editor.text;
-
-/*
- * This file originates from an internal package of Eclipse's 
- * Manifest Editor. It has been copied by GEBIT to here in order to
- * permanently use those features. It has been renamed and edited by GEBIT 
- * after copying.
- */
-
-import org.eclipse.ant.ui.internal.model.AntUIPlugin;
-import org.eclipse.jface.text.TextAttribute;
-import org.eclipse.jface.text.rules.IRule;
-import org.eclipse.jface.text.rules.IToken;
-import org.eclipse.jface.text.rules.MultiLineRule;
-import org.eclipse.jface.text.rules.RuleBasedScanner;
-import org.eclipse.jface.text.rules.SingleLineRule;
-import org.eclipse.jface.text.rules.Token;
-import org.eclipse.jface.text.rules.WhitespaceRule;
-
-public class AntEditorTagScanner extends RuleBasedScanner {
-
-    public AntEditorTagScanner() {
-        IToken string = 
-        	new Token(
-                new TextAttribute(
-                    AntUIPlugin.getPreferenceColor(IAntEditorColorConstants.P_STRING)));
-                    
-		IRule[] rules =new IRule[3];
-
-        // Add rule for single and double quotes
-        rules[0]= new MultiLineRule("\"", "\"", string, '\\'); //$NON-NLS-1$ //$NON-NLS-2$
-        rules[1]= new SingleLineRule("'", "'", string, '\\'); //$NON-NLS-1$ //$NON-NLS-2$
-
-        // Add generic whitespace rule.
-        rules[2]= new WhitespaceRule(new AntEditorWhitespaceDetector());
-
-        setRules(rules);
-    }
-}
diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/text/AntEditorWhitespaceDetector.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/text/AntEditorWhitespaceDetector.java
deleted file mode 100644
index e06f37a..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/text/AntEditorWhitespaceDetector.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2003 GEBIT Gesellschaft fuer EDV-Beratung
- * und Informatik-Technologien mbH, 
- * Berlin, Duesseldorf, Frankfurt (Germany) and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     GEBIT Gesellschaft fuer EDV-Beratung und Informatik-Technologien mbH - initial API and implementation
- * 	   IBM Corporation - bug 29148
- *******************************************************************************/
-
-package org.eclipse.ant.ui.internal.editor.text;
-
-/*
- * This file originates from an internal package of Eclipse's 
- * Manifest Editor. It has been copied by GEBIT to here in order to
- * permanently use those features. It has been renamed by GEBIT 
- * after copying.
- */
-
-import org.eclipse.jface.text.rules.IWhitespaceDetector;
-
-public class AntEditorWhitespaceDetector implements IWhitespaceDetector {
-
-	public boolean isWhitespace(char c) {
-		return (c == ' ' || c == '\t' || c == '\n' || c == '\r');
-	}
-}
diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/text/IAntEditorColorConstants.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/text/IAntEditorColorConstants.java
deleted file mode 100644
index 8fff383..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/text/IAntEditorColorConstants.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2003 GEBIT Gesellschaft fuer EDV-Beratung
- * und Informatik-Technologien mbH, 
- * Berlin, Duesseldorf, Frankfurt (Germany) and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     GEBIT Gesellschaft fuer EDV-Beratung und Informatik-Technologien mbH - initial API and implementation
- * 	   IBM Corporation - bug fixes
- *******************************************************************************/
-
-package org.eclipse.ant.ui.internal.editor.text;
-
-import org.eclipse.swt.graphics.RGB;
-
-/**
- * The color constants used by the Ant Editor.
- */
-public interface IAntEditorColorConstants {
-	RGB XML_COMMENT =       new RGB(128,   0,   0);
-	RGB PROC_INSTR =        new RGB(128, 128, 128);
-	RGB STRING=             new RGB(  0, 128,   0);
-	RGB DEFAULT=            new RGB(  0,   0,   0);
-	RGB TAG=                new RGB(  0,   0, 128);
-	
-	
-	String P_XML_COMMENT = "antEditor.color.xml_comment"; //$NON-NLS-1$
-	String P_PROC_INSTR = "antEditor.color.instr"; //$NON-NLS-1$
-	String P_STRING = "antEditor.color.string"; //$NON-NLS-1$
-	String P_DEFAULT = "antEditor.color.default"; //$NON-NLS-1$
-	String P_TAG = "antEditor.color.tag"; //$NON-NLS-1$
-}
diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/text/IReconcilingParticipant.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/text/IReconcilingParticipant.java
deleted file mode 100644
index 7d24cc5..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/text/IReconcilingParticipant.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.ui.internal.editor.text;
-
-
-
-/**
- * Interface of an object participating in reconciling.
- */
-public interface IReconcilingParticipant {
-	
-	/**
-	 * Called after reconciling has been finished.
-	 */
-	void reconciled();
-}
diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/text/IXMLAnnotation.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/text/IXMLAnnotation.java
deleted file mode 100644
index 6c178e4..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/text/IXMLAnnotation.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.ui.internal.editor.text;
-
-import java.util.Iterator;
-
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-
-/**
- * Interface of annotations representing markers
- * and problems.
- * 
- * @see org.eclipse.core.resources.IMarker
- * @see org.eclipse.jdt.core.compiler.IProblem
- */
-public interface IXMLAnnotation {
-	
-	AnnotationType getAnnotationType();
-	
-	boolean isTemporary();
-	
-	String getMessage();
-	
-	Image getImage(Display display);
-	
-	/**
-	 * Returns whether this annotation is relavant.
-	 * <p>
-	 * If the annotation is overlaid then it is not
-	 * relevant. After all overlays have been removed
-	 * the annotation might either become relevant again
-	 * or stay irrelevant.
-	 * </p>
-	 * 
-	 * @return <code>true</code> if relevant
-	 * @see #hasOverlay()
-	 */
-	boolean isRelevant();
-	
-	/**
-	 * Returns whether this annotation is overlaid.
-	 * 
-	 * @return <code>true</code> if overlaid
-	 */
-	boolean hasOverlay();
-	
-	/**
-	 * Returns an iterator for iterating over the
- 	 * annotation which are overlaid by this annotation.
-	 * 
-	 * @return an iterator over the overlaid annotaions
-	 */
-	Iterator getOverlaidIterator();
-	
-	/**
-	 * Adds the given annotation to the list of
-	 * annotations which overlaid by this annotations.
-	 *  
-	 * @param annotation	the problem annoation
-	 */
-	void addOverlaid(IXMLAnnotation annotation);
-	
-	/**
-	 * Removes the given annotation from the list of
-	 * annotations which are overlaid by this annotation.
-	 *  
-	 * @param annotation	the problem annoation
-	 */
-	void removeOverlaid(IXMLAnnotation annotation);
-	
-	/**
-	 * Tells whether this annotation is a problem
-	 * annotation.
-	 * 
-	 * @return <code>true</code> if it is a problem annotation
-	 */
-	boolean isProblem();
-}
diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/text/NonRuleBasedDamagerRepairer.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/text/NonRuleBasedDamagerRepairer.java
deleted file mode 100644
index fcc94e8..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/text/NonRuleBasedDamagerRepairer.java
+++ /dev/null
@@ -1,151 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2003 GEBIT Gesellschaft fuer EDV-Beratung
- * und Informatik-Technologien mbH, 
- * Berlin, Duesseldorf, Frankfurt (Germany) and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     GEBIT Gesellschaft fuer EDV-Beratung und Informatik-Technologien mbH - initial API and implementation
- * 	   IBM Corporation - bug 31797
- *******************************************************************************/
-
-package org.eclipse.ant.ui.internal.editor.text;
-
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.DocumentEvent;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.jface.text.ITypedRegion;
-import org.eclipse.jface.text.Region;
-import org.eclipse.jface.text.TextAttribute;
-import org.eclipse.jface.text.TextPresentation;
-import org.eclipse.jface.text.presentation.IPresentationDamager;
-import org.eclipse.jface.text.presentation.IPresentationRepairer;
-import org.eclipse.jface.util.Assert;
-import org.eclipse.swt.custom.StyleRange;
-
-/*
- * This file originates from an internal package of Eclipse's 
- * Manifest Editor. It has been copied by GEBIT to here in order to
- * permanently use those features.
- */
-public class NonRuleBasedDamagerRepairer implements IPresentationDamager, IPresentationRepairer {
-
-	/** The document this object works on */
-	protected IDocument fDocument;
-	/** The default text attribute if none is returned as data by the current token */
-	protected TextAttribute fDefaultTextAttribute;
-
-	public NonRuleBasedDamagerRepairer(TextAttribute defaultTextAttribute) {
-		Assert.isNotNull(defaultTextAttribute);
-
-		fDefaultTextAttribute = defaultTextAttribute;
-	}
-
-	/**
-	 * @see IPresentationRepairer#setDocument(IDocument)
-	 */
-	public void setDocument(IDocument document) {
-		fDocument = document;
-	}
-
-	/**
-	 * Returns the end offset of the line that contains the specified offset or
-	 * if the offset is inside a line delimiter, the end offset of the next line.
-	 *
-	 * @param offset the offset whose line end offset must be computed
-	 * @return the line end offset for the given offset
-	 * @exception BadLocationException if offset is invalid in the current document
-	 */
-	private int endOfLineOf(int offset) throws BadLocationException {
-
-		IRegion info = fDocument.getLineInformationOfOffset(offset);
-		if (offset <= info.getOffset() + info.getLength())
-			return info.getOffset() + info.getLength();
-
-		int line = fDocument.getLineOfOffset(offset);
-		try {
-			info = fDocument.getLineInformation(line + 1);
-			return info.getOffset() + info.getLength();
-		} catch (BadLocationException x) {
-			return fDocument.getLength();
-		}
-	}
-
-	/**
-	 * @see IPresentationDamager#getDamageRegion(ITypedRegion, DocumentEvent, boolean)
-	 */
-	public IRegion getDamageRegion(
-		ITypedRegion partition,
-		DocumentEvent event,
-		boolean documentPartitioningChanged) {
-		if (!documentPartitioningChanged) {
-			try {
-
-				IRegion info = fDocument.getLineInformationOfOffset(event.getOffset());
-				int start = Math.max(partition.getOffset(), info.getOffset());
-
-				int end =
-					event.getOffset()
-						+ (event.getText() == null ? event.getLength() : event.getText().length());
-
-				if (info.getOffset() <= end && end <= info.getOffset() + info.getLength()) {
-					// optimize the case of the same line
-					end = info.getOffset() + info.getLength();
-				} else {
-					end = endOfLineOf(end);
-				}
-
-				end = Math.min(partition.getOffset() + partition.getLength(), end);
-				return new Region(start, end - start);
-
-			} catch (BadLocationException x) {
-			}
-		}
-
-		return partition;
-	}
-
-	/**
-	 * @see IPresentationRepairer#createPresentation(TextPresentation, ITypedRegion)
-	 */
-	public void createPresentation(TextPresentation presentation, ITypedRegion region) {
-		addRange(
-			presentation,
-			region.getOffset(),
-			region.getLength(),
-			fDefaultTextAttribute);
-	}
-
-	/**
-	 * Adds style information to the given text presentation.
-	 *
-	 * @param presentation the text presentation to be extended
-	 * @param offset the offset of the range to be styled
-	 * @param length the length of the range to be styled
-	 * @param attr the attribute describing the style of the range to be styled
-	 */
-	private void addRange(TextPresentation presentation, int offset, int length, TextAttribute attr) {
-		if (attr != null) {
-			presentation.addStyleRange(
-				new StyleRange(
-					offset,
-					length,
-					attr.getForeground(),
-					attr.getBackground(),
-					attr.getStyle()));
-		}
-	}
-	
-	/**
-	 * Configures the scanner's default return token. This is the text attribute
-	 * which is returned when none is returned by the current token.
-	 */
-	public void setDefaultTextAttribute(TextAttribute defaultTextAttribute) {
-		Assert.isNotNull(defaultTextAttribute);
-		fDefaultTextAttribute= defaultTextAttribute;
-	}
-}
\ No newline at end of file
diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/text/NotifyingReconciler.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/text/NotifyingReconciler.java
deleted file mode 100644
index c77742f..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/text/NotifyingReconciler.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ant.ui.internal.editor.text;
-
-
-import java.util.ArrayList;
-import java.util.Iterator;
-
-import org.eclipse.jface.text.reconciler.DirtyRegion;
-import org.eclipse.jface.text.reconciler.IReconcilingStrategy;
-import org.eclipse.jface.text.reconciler.MonoReconciler;
-
-
-public class NotifyingReconciler extends MonoReconciler {
-
-	private ArrayList fReconcilingParticipants= new ArrayList();
-	
-	/**
-	 * Constructor for NotifyingReconciler.
-	 * @param strategy
-	 * @param isIncremental
-	 */
-	public NotifyingReconciler(IReconcilingStrategy strategy, boolean isIncremental) {
-		super(strategy, isIncremental);
-	}
-
-	/*
-	 * @see org.eclipse.jface.text.reconciler.AbstractReconciler#process(org.eclipse.jface.text.reconciler.DirtyRegion)
-	 */
-	protected void process(DirtyRegion dirtyRegion) {
-		super.process(dirtyRegion);
-		notifyReconcilingParticipants();
-	}
-
-	public void addReconcilingParticipant(IReconcilingParticipant participant) {
-		fReconcilingParticipants.add(participant);
-	}
-
-	public void removeReconcilingParticipant(IReconcilingParticipant participant) {
-		fReconcilingParticipants.remove(participant);
-	}
-
-	protected void notifyReconcilingParticipants() {
-		Iterator i= new ArrayList(fReconcilingParticipants).iterator();
-		while (i.hasNext()) {
-			((IReconcilingParticipant) i.next()).reconciled();
-		}
-	}
-}
diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/text/PartiallySynchronizedDocument.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/text/PartiallySynchronizedDocument.java
deleted file mode 100644
index b6e3240..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/text/PartiallySynchronizedDocument.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ant.ui.internal.editor.text;
-
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.Document;
-
-/**
- * Document that can also be used by a background reconciler.
- */
-public class PartiallySynchronizedDocument extends Document {
-			
-	/*
-	 * @see IDocumentExtension#startSequentialRewrite(boolean)
-	 */
-	synchronized public void startSequentialRewrite(boolean normalized) {
-		super.startSequentialRewrite(normalized);
-	}
-		
-	/*
-	 * @see IDocumentExtension#stopSequentialRewrite()
-	 */
-	synchronized public void stopSequentialRewrite() {
-		super.stopSequentialRewrite();
-	}
-			
-	/*
-	 * @see IDocument#get()
-	 */
-	synchronized public String get() {
-		return super.get();
-	}
-			
-	/*
-	 * @see IDocument#get(int, int)
-	 */
-	synchronized public String get(int offset, int length) throws BadLocationException {
-		return super.get(offset, length);
-	}
-			
-	/*
-	 * @see IDocument#getChar(int)
-	 */
-	synchronized public char getChar(int offset) throws BadLocationException {
-		return super.getChar(offset);
-	}
-			
-	/*
-	 * @see IDocument#replace(int, int, String)
-	 */
-	synchronized public void replace(int offset, int length, String text) throws BadLocationException {
-		super.replace(offset, length, text);
-	}
-			
-	/*
-	 * @see IDocument#set(String)
-	 */
-	synchronized public void set(String text) {
-		super.set(text);
-	}
-};
diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/text/TagRule.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/text/TagRule.java
deleted file mode 100644
index d85cafb..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/text/TagRule.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2003 GEBIT Gesellschaft fuer EDV-Beratung
- * und Informatik-Technologien mbH, 
- * Berlin, Duesseldorf, Frankfurt (Germany) and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     GEBIT Gesellschaft fuer EDV-Beratung und Informatik-Technologien mbH - initial API and implementation
- * 	   IBM Corporation - bug 24108
- *******************************************************************************/
-
-package org.eclipse.ant.ui.internal.editor.text;
-
-/*
- * This file originates from an internal package of Eclipse's 
- * Manifest Editor. It has been copied by GEBIT to here in order to
- * permanently use those features. It has been renamed and edited by GEBIT 
- * after copying.
- */
-
-import org.eclipse.jface.text.rules.*;
-
-public class TagRule extends MultiLineRule {
-
-    public TagRule(IToken token) {
-        super("<", ">", token); //$NON-NLS-1$ //$NON-NLS-2$
-    }
-
-    protected boolean sequenceDetected(ICharacterScanner scanner, char[] sequence, boolean eofAllowed) {
-        int c = scanner.read();
-        if (sequence[0] == '<') {
-            if (c == '?') {
-                // processing instruction - abort
-                scanner.unread();
-                return false;
-            }
-            if (c == '!') {
-                scanner.unread();
-                // comment - abort
-                return false;
-            }
-        } else if (sequence[0] == '>') {
-            scanner.unread();
-        }
-
-        return super.sequenceDetected(scanner, sequence, eofAllowed);
-    }
-
-}
diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/text/XMLAnnotationHover.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/text/XMLAnnotationHover.java
deleted file mode 100644
index ebcced6..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/text/XMLAnnotationHover.java
+++ /dev/null
@@ -1,195 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.ui.internal.editor.text;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.Position;
-import org.eclipse.jface.text.source.Annotation;
-import org.eclipse.jface.text.source.IAnnotationHover;
-import org.eclipse.jface.text.source.IAnnotationModel;
-import org.eclipse.jface.text.source.ISourceViewer;
-import org.eclipse.ant.ui.internal.editor.AntEditorMessages;
-import org.eclipse.ant.ui.internal.editor.derived.HTMLPrinter;
-
-
-/**
- * Determines all markers for the given line and collects, concatenates, and formates
- * their messages.
- */
-public class XMLAnnotationHover implements IAnnotationHover {
-	
-	/**
-	 * Returns the distance to the ruler line. 
-	 */
-	protected int compareRulerLine(Position position, IDocument document, int line) {
-		
-		if (position.getOffset() > -1 && position.getLength() > -1) {
-			try {
-				int xmlAnnotationLine= document.getLineOfOffset(position.getOffset());
-				if (line == xmlAnnotationLine)
-					return 1;
-				if (xmlAnnotationLine <= line && line <= document.getLineOfOffset(position.getOffset() + position.getLength()))
-					return 2;
-			} catch (BadLocationException x) {
-			}
-		}
-		
-		return 0;
-	}
-	
-	/**
-	 * Selects a set of markers from the two lists. By default, it just returns
-	 * the set of exact matches.
-	 */
-	protected List select(List exactMatch, List including) {
-		return exactMatch;
-	}
-	
-	/**
-	 * Returns one marker which includes the ruler's line of activity.
-	 */
-	protected List getXMLAnnotationsForLine(ISourceViewer viewer, int line) {
-		
-		IDocument document= viewer.getDocument();
-		IAnnotationModel model= viewer.getAnnotationModel();
-		
-		if (model == null)
-			return null;
-			
-		List exact= new ArrayList();
-		List including= new ArrayList();
-		
-		Iterator e= model.getAnnotationIterator();
-		HashMap messagesAtPosition= new HashMap();
-		while (e.hasNext()) {
-			Object o= e.next();
-			if (o instanceof IXMLAnnotation) {
-				IXMLAnnotation a= (IXMLAnnotation)o;
-				if (!a.hasOverlay()) {
-					Position position= model.getPosition((Annotation)a);
-					if (position == null)
-						continue;
-
-					if (isDuplicateXMLAnnotation(messagesAtPosition, position, a.getMessage()))
-						continue;
-	
-					switch (compareRulerLine(position, document, line)) {
-						case 1:
-							exact.add(a);
-							break;
-						case 2:
-							including.add(a);
-							break;
-					}
-				}
-			}
-		}
-		
-		return select(exact, including);
-	}
-
-	private boolean isDuplicateXMLAnnotation(Map messagesAtPosition, Position position, String message) {
-		if (messagesAtPosition.containsKey(position)) {
-			Object value= messagesAtPosition.get(position);
-			if (message.equals(value))
-				return true;
-
-			if (value instanceof List) {
-				List messages= (List)value;
-				if  (messages.contains(message))
-					return true;
-				else
-					messages.add(message);
-			} else {
-				ArrayList messages= new ArrayList();
-				messages.add(value);
-				messages.add(message);
-				messagesAtPosition.put(position, messages);
-			}
-		} else
-			messagesAtPosition.put(position, message);
-		return false;
-	}
-		
-	/*
-	 * @see IVerticalRulerHover#getHoverInfo(ISourceViewer, int)
-	 */
-	public String getHoverInfo(ISourceViewer sourceViewer, int lineNumber) {
-		List xmlAnnotations= getXMLAnnotationsForLine(sourceViewer, lineNumber);
-		if (xmlAnnotations != null) {
-			
-			if (xmlAnnotations.size() == 1) {
-				
-				// optimization
-				IXMLAnnotation xmlAnnotation= (IXMLAnnotation)xmlAnnotations.get(0);
-				String message= xmlAnnotation.getMessage();
-				if (message != null && message.trim().length() > 0)
-					return formatSingleMessage(message);
-					
-			} else {
-					
-				List messages= new ArrayList();
-				
-				Iterator e= xmlAnnotations.iterator();
-				while (e.hasNext()) {
-					IXMLAnnotation xmlAnnotation= (IXMLAnnotation)e.next();
-					String message= xmlAnnotation.getMessage();
-					if (message != null && message.trim().length() > 0)
-						messages.add(message.trim());
-				}
-				
-				if (messages.size() == 1)
-					return formatSingleMessage((String) messages.get(0));
-					
-				if (messages.size() > 1)
-					return formatMultipleMessages(messages);
-			}
-		}
-		
-		return null;
-	}
-	
-	/*
-	 * Formats a message as HTML text.
-	 */
-	private String formatSingleMessage(String message) {
-		StringBuffer buffer= new StringBuffer();
-		HTMLPrinter.addPageProlog(buffer);
-		HTMLPrinter.addParagraph(buffer, HTMLPrinter.convertToHTMLContent(message));
-		HTMLPrinter.addPageEpilog(buffer);
-		return buffer.toString();
-	}
-	
-	/*
-	 * Formats several message as HTML text.
-	 */
-	private String formatMultipleMessages(List messages) {
-		StringBuffer buffer= new StringBuffer();
-		HTMLPrinter.addPageProlog(buffer);
-		HTMLPrinter.addParagraph(buffer, HTMLPrinter.convertToHTMLContent(AntEditorMessages.getString("AntAnnotationHover.multipleMarkersAtThisLine"))); //$NON-NLS-1$
-		
-		HTMLPrinter.startBulletList(buffer);
-		Iterator e= messages.iterator();
-		while (e.hasNext())
-			HTMLPrinter.addBullet(buffer, HTMLPrinter.convertToHTMLContent((String) e.next()));
-		HTMLPrinter.endBulletList(buffer);	
-		
-		HTMLPrinter.addPageEpilog(buffer);
-		return buffer.toString();
-	}
-}
diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/text/XMLAnnotationIterator.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/text/XMLAnnotationIterator.java
deleted file mode 100644
index edb93d3..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/text/XMLAnnotationIterator.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.ui.internal.editor.text;
-
-import java.util.Iterator;
-import org.eclipse.jface.text.source.IAnnotationModel;
-
-
-/**
- * Filters problems based on their types.
- */
-public class XMLAnnotationIterator implements Iterator {
-			
-	private Iterator fIterator;
-	private IXMLAnnotation fNext;
-	private boolean fSkipIrrelevants;
-	
-	public XMLAnnotationIterator(IAnnotationModel model, boolean skipIrrelevants) {
-		fIterator= model.getAnnotationIterator();
-		fSkipIrrelevants= skipIrrelevants;
-		skip();
-	}
-	
-	private void skip() {
-		while (fIterator.hasNext()) {
-			Object next= fIterator.next();
-			if (next instanceof IXMLAnnotation) {
-				IXMLAnnotation a= (IXMLAnnotation) next;
-				if (fSkipIrrelevants) {
-					if (a.isRelevant()) {
-						fNext= a;
-						return;
-					}
-				} else {
-					fNext= a;
-					return;
-				}
-			}
-		}
-		fNext= null;
-	}
-	
-	/*
-	 * @see Iterator#hasNext()
-	 */
-	public boolean hasNext() {
-		return fNext != null;
-	}
-
-	/*
-	 * @see Iterator#next()
-	 */
-	public Object next() {
-		try {
-			return fNext;
-		} finally {
-			skip();
-		}
-	}
-
-	/*
-	 * @see Iterator#remove()
-	 */
-	public void remove() {
-		throw new UnsupportedOperationException();
-	}
-}
diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/text/XMLMarkerAnnotation.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/text/XMLMarkerAnnotation.java
deleted file mode 100644
index 7a9c894..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/text/XMLMarkerAnnotation.java
+++ /dev/null
@@ -1,225 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.ui.internal.editor.text;
-
-
-import java.util.Iterator;
-
-import org.eclipse.ant.ui.internal.model.AntUIPlugin;
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.runtime.CoreException;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-
-import org.eclipse.jface.resource.ImageRegistry;
-import org.eclipse.jface.text.Assert;
-
-import org.eclipse.ui.texteditor.MarkerAnnotation;
-
-public class XMLMarkerAnnotation extends MarkerAnnotation implements IXMLAnnotation {
-	
-	private static final int NO_IMAGE= 0;
-	private static final int ORIGINAL_MARKER_IMAGE= 1;
-	private static final int OVERLAY_IMAGE= 4;
-	private static final int GRAY_IMAGE= 5;
-
-	private static ImageRegistry fgGrayMarkersImageRegistry;
-	
-	private IXMLAnnotation fOverlay;
-	private boolean fNotRelevant= false;
-	private AnnotationType fType;
-	private int fImageType;
-	
-	public XMLMarkerAnnotation(IMarker marker) {
-		super(marker);
-	}
-	
-	/**
-	 * Initializes the annotation's icon representation and its drawing layer
-	 * based upon the properties of the underlying marker.
-	 */
-	protected void initialize() {
-		fImageType= NO_IMAGE;
-		IMarker marker= getMarker();
-		
-		fType= AnnotationType.UNKNOWN;
-		try {
-			if (marker != null && marker.exists()) {
-				if (marker.isSubtypeOf(IMarker.BOOKMARK)) {
-					fType= AnnotationType.BOOKMARK;
-				} else if (marker.isSubtypeOf(IMarker.TASK)) {
-					fType= AnnotationType.TASK;
-				} else if (marker.isSubtypeOf(IMarker.PROBLEM)) {
-					int severity= marker.getAttribute(IMarker.SEVERITY, -1);
-					switch (severity) {
-						case IMarker.SEVERITY_ERROR:
-							fType= AnnotationType.ERROR;
-							break;
-						case IMarker.SEVERITY_WARNING:
-							fType= AnnotationType.WARNING;
-							break;
-						case IMarker.SEVERITY_INFO:
-							fType= AnnotationType.INFO;
-							break;
-					}
-//				} else if (marker.isSubtypeOf(SearchUI.SEARCH_MARKER)) { TODO: fix
-//					result= AnnotationType.SEARCH;
-				}
-			}
-		} catch (CoreException e) {
-			AntUIPlugin.log(e);
-		}
-		super.initialize();
-	}
-	
-	/*
-	 * @see IXMLAnnotation#getMessage()
-	 */
-	public String getMessage() {
-		IMarker marker= getMarker();
-		if (marker == null || !marker.exists())
-			return ""; //$NON-NLS-1$
-		else
-			return marker.getAttribute(IMarker.MESSAGE, ""); //$NON-NLS-1$
-	}
-
-	/*
-	 * @see IXMLAnnotation#isTemporary()
-	 */
-	public boolean isTemporary() {
-		return false;
-	}
-	
-	/*
-	 * @see IXMLAnnotation#isProblem()
-	 */
-	public boolean isProblem() {
-		return fType == AnnotationType.WARNING || fType == AnnotationType.ERROR;
-	}
-	
-	/*
-	 * @see IXMLAnnotation#isRelevant()
-	 */
-	public boolean isRelevant() {
-		return !fNotRelevant;
-	}
-
-	/**
-	 * Overlays this annotation with the given xmlAnnotation.
-	 * 
-	 * @param javaAnnotation annotation that is overlaid by this annotation
-	 */
-	public void setOverlay(IXMLAnnotation xmlAnnotation) {
-		if (fOverlay != null)
-			fOverlay.removeOverlaid(this);
-			
-		fOverlay= xmlAnnotation;
-		fNotRelevant= (fNotRelevant || fOverlay != null);
-		
-		if (xmlAnnotation != null)
-			xmlAnnotation.addOverlaid(this);
-	}
-	
-	/*
-	 * @see IXMLAnnotation#hasOverlay()
-	 */
-	public boolean hasOverlay() {
-		return fOverlay != null;
-	}
-	
-	/*
-	 * @see MarkerAnnotation#getImage(Display)
-	 */
-	public Image getImage(Display display) {
-		int newImageType= NO_IMAGE;
-
-		if (hasOverlay())
-			newImageType= OVERLAY_IMAGE;
-		else if (isRelevant())
-			newImageType= ORIGINAL_MARKER_IMAGE; 
-		else
-			newImageType= GRAY_IMAGE;
-
-		if (fImageType == newImageType && newImageType != OVERLAY_IMAGE)
-			// Nothing changed - simply return the current image
-			return super.getImage(display);
-
-		Image newImage= null;
-		switch (newImageType) {
-			case ORIGINAL_MARKER_IMAGE:
-				newImage= null;
-				break;
-			case OVERLAY_IMAGE:
-				newImage= fOverlay.getImage(display);
-				break;
-			case GRAY_IMAGE:
-				if (fImageType != ORIGINAL_MARKER_IMAGE)
-					setImage(null);
-				Image originalImage= super.getImage(display);
-				if (originalImage != null) {
-					ImageRegistry imageRegistry= getGrayMarkerImageRegistry(display);
-					if (imageRegistry != null) {
-						String key= Integer.toString(originalImage.hashCode());
-						Image grayImage= imageRegistry.get(key);
-						if (grayImage == null) {
-							grayImage= new Image(display, originalImage, SWT.IMAGE_GRAY);
-							imageRegistry.put(key, grayImage);
-						}
-						newImage= grayImage;
-					}
-				}
-				break;
-			default:
-				Assert.isLegal(false);
-		}
-
-		fImageType= newImageType;
-		setImage(newImage);
-		return super.getImage(display);
-	}
-	
-	private ImageRegistry getGrayMarkerImageRegistry(Display display) {
-		if (fgGrayMarkersImageRegistry == null)
-			fgGrayMarkersImageRegistry= new ImageRegistry(display);
-		return fgGrayMarkersImageRegistry;
-	}
-	
-	/*
-	 * @see IXMLAnnotation#addOverlaid(IXMLAnnotation)
-	 */
-	public void addOverlaid(IXMLAnnotation annotation) {
-		// not supported
-	}
-
-	/*
-	 * @see IXMLAnnotation#removeOverlaid(IXMLAnnotation)
-	 */
-	public void removeOverlaid(IXMLAnnotation annotation) {
-		// not supported
-	}
-	
-	/*
-	 * @see IXMLAnnotation#getOverlaidIterator()
-	 */
-	public Iterator getOverlaidIterator() {
-		// not supported
-		return null;
-	}
-	
-	/*
-	 * @see org.eclipse.jdt.internal.ui.javaeditor.IXMLAnnotation#getAnnotationType()
-	 */
-	public AnnotationType getAnnotationType() {
-		return fType;
-	}
-}
diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/text/XMLProblemAnnotation.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/text/XMLProblemAnnotation.java
deleted file mode 100644
index 8b52248..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/text/XMLProblemAnnotation.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.ui.internal.editor.text;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.jface.text.source.Annotation;
-import org.eclipse.swt.graphics.GC;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.Rectangle;
-import org.eclipse.swt.widgets.Canvas;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ant.ui.internal.editor.outline.IProblem;
-import org.eclipse.ui.texteditor.MarkerAnnotation;
-
-/**
- * Annotation representating an <code>IProblem</code>.
- */
-public class XMLProblemAnnotation extends Annotation implements IXMLAnnotation {
-	
-	private List fOverlaids;
-	private IProblem fProblem;
-	private AnnotationType fType;
-	
-	
-	public XMLProblemAnnotation(IProblem problem) {
-		
-		fProblem= problem;
-		setLayer(MarkerAnnotation.PROBLEM_LAYER + 1);
-		
-		if (fProblem.isError())
-			fType= AnnotationType.ERROR;
-		else if (fProblem.isWarning())
-			fType= AnnotationType.WARNING;
-		else
-			fType= AnnotationType.INFO;			
-	}
-	
-	/*
-	 * @see Annotation#paint
-	 */
-	public void paint(GC gc, Canvas canvas, Rectangle r) {
-	}
-	
-	/*
-	 * @see IXMLAnnotation#getImage(Display)
-	 */
-	public Image getImage(Display display) {
-		return null;
-	}
-	
-	/*
-	 * @see IXMLAnnotation#getMessage()
-	 */
-	public String getMessage() {
-		return fProblem.getMessage();
-	}
-
-	/*
-	 * @see IXMLAnnotation#isTemporary()
-	 */
-	public boolean isTemporary() {
-		return true;
-	}
-	
-	/*
-	 * @see IXMLAnnotation#isProblem()
-	 */
-	public boolean isProblem() {
-		return  fType == AnnotationType.WARNING || fType == AnnotationType.ERROR;
-	}
-	
-	/*
-	 * @see IXMLAnnotation#isRelevant()
-	 */
-	public boolean isRelevant() {
-		return true;
-	}
-	
-	/*
-	 * @see IXMLAnnotation#hasOverlay()
-	 */
-	public boolean hasOverlay() {
-		return false;
-	}
-	
-	/*
-	 * @see IXMLAnnotation#addOverlaid(IXMLAnnotation)
-	 */
-	public void addOverlaid(IXMLAnnotation annotation) {
-		if (fOverlaids == null)
-			fOverlaids= new ArrayList(1);
-		fOverlaids.add(annotation);
-	}
-
-	/*
-	 * @see IXMLAnnotation#removeOverlaid(IXMLAnnotation)
-	 */
-	public void removeOverlaid(IXMLAnnotation annotation) {
-		if (fOverlaids != null) {
-			fOverlaids.remove(annotation);
-			if (fOverlaids.size() == 0)
-				fOverlaids= null;
-		}
-	}
-	
-	/*
-	 * @see IXMLAnnotation#getOverlaidIterator()
-	 */
-	public Iterator getOverlaidIterator() {
-		if (fOverlaids != null)
-			return fOverlaids.iterator();
-		return null;
-	}
-	
-	public AnnotationType getAnnotationType() {
-		return fType;
-	}
-}
diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/text/XMLReconcilingStrategy.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/text/XMLReconcilingStrategy.java
deleted file mode 100644
index 484a656..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/text/XMLReconcilingStrategy.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ant.ui.internal.editor.text;
-
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.jface.text.reconciler.DirtyRegion;
-import org.eclipse.jface.text.reconciler.IReconcilingStrategy;
-import org.eclipse.jface.text.reconciler.IReconcilingStrategyExtension;
-import org.eclipse.ant.ui.internal.editor.outline.AntModel;
-import org.eclipse.ui.texteditor.IDocumentProvider;
-import org.eclipse.ui.texteditor.ITextEditor;
-
-
-public class XMLReconcilingStrategy implements IReconcilingStrategy, IReconcilingStrategyExtension {
-
-	private ITextEditor fEditor;
-
-	public XMLReconcilingStrategy(ITextEditor editor) {
-		fEditor= editor;
-	}
-	
-	private void internalReconcile() {
-		IDocumentProvider provider= fEditor.getDocumentProvider();
-		if (provider instanceof AntEditorDocumentProvider) {
-			AntEditorDocumentProvider documentProvider= (AntEditorDocumentProvider) provider;
-			AntModel model= documentProvider.getAntModel(fEditor.getEditorInput());
-			if (model != null)
-				model.reconcile();
-		}
-	}
-
-	/*
-	 * @see IReconcilingStrategy#reconcile(IRegion)
-	 */
-	public void reconcile(IRegion partition) {
-		internalReconcile();
-	}
-
-	/*
-	 * @see IReconcilingStrategy#reconcile(DirtyRegion, IRegion)
-	 */
-	public void reconcile(DirtyRegion dirtyRegion, IRegion subRegion) {
-		internalReconcile();
-	}
-
-	/*
-	 * @see IReconcilingStrategy#setDocument(IDocument)
-	 */
-	public void setDocument(IDocument document) {
-	}
-
-	/*
-	 * @see org.eclipse.jface.text.reconciler.IReconcilingStrategyExtension#setProgressMonitor(org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	public void setProgressMonitor(IProgressMonitor monitor) {
-	}
-
-	/*
-	 * @see org.eclipse.jface.text.reconciler.IReconcilingStrategyExtension#initialReconcile()
-	 */
-	public void initialReconcile() {
-		internalReconcile();
-	}
-}
diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/text/XMLTextHover.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/text/XMLTextHover.java
deleted file mode 100644
index 404a4d6..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/text/XMLTextHover.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.ui.internal.editor.text;
-
-
-import java.util.Iterator;
-
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.jface.text.ITextHover;
-import org.eclipse.jface.text.ITextViewer;
-import org.eclipse.jface.text.Position;
-import org.eclipse.jface.text.Region;
-import org.eclipse.jface.text.source.Annotation;
-import org.eclipse.jface.text.source.IAnnotationModel;
-import org.eclipse.jface.text.source.ISourceViewer;
-import org.eclipse.ant.ui.internal.editor.derived.HTMLPrinter;
-
-
-public class XMLTextHover implements ITextHover {
-
-	/*
-	 * Formats a message as HTML text.
-	 */
-	private String formatMessage(String message) {
-		StringBuffer buffer= new StringBuffer();
-		HTMLPrinter.addPageProlog(buffer);
-		HTMLPrinter.addParagraph(buffer, HTMLPrinter.convertToHTMLContent(message));
-		HTMLPrinter.addPageEpilog(buffer);
-		return buffer.toString();
-	}
-	
-	/*
-	 * @see ITextHover#getHoverInfo(ITextViewer, IRegion)
-	 */
-	public String getHoverInfo(ITextViewer textViewer, IRegion hoverRegion) {
-		
-		if (!(textViewer instanceof ISourceViewer))
-			return null;
-		
-		ISourceViewer sourceViewer= (ISourceViewer) textViewer;
-		IAnnotationModel model= sourceViewer.getAnnotationModel();
-		
-		if (model != null) {
-			Iterator e= new XMLAnnotationIterator(model, true);
-			while (e.hasNext()) {
-				Annotation a= (Annotation) e.next();
-				Position p= model.getPosition(a);
-				if (p.overlapsWith(hoverRegion.getOffset(), hoverRegion.getLength())) {
-					String msg= ((IXMLAnnotation) a).getMessage();
-					if (msg != null && msg.trim().length() > 0)
-						return formatMessage(msg);
-				}
-			}
-		}
-		
-		return null;
-	}
-	
-	/*
-	 * @see ITextHover#getHoverRegion(ITextViewer, int)
-	 */
-	public IRegion getHoverRegion(ITextViewer textViewer, int offset) {
-		int startOffset= offset > 0 ? offset - 1 : offset;
-		int documentLength= textViewer.getDocument() != null ? textViewer.getDocument().getLength() : 0;
-		int endOffset= offset < documentLength - 1 ? offset + 1 : offset;
-		return new Region(startOffset, endOffset - startOffset);
-	}
-
-}
diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/tools/AntEditorToolsMessages.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/tools/AntEditorToolsMessages.java
deleted file mode 100644
index 0cfb8a6..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/tools/AntEditorToolsMessages.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.ui.internal.editor.tools;
-
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-public class AntEditorToolsMessages {
-
-	private static final String BUNDLE_NAME = "org.eclipse.ant.ui.internal.editor.tools.AntEditorToolsMessages"; //$NON-NLS-1$
-
-	private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME);
-
-	private AntEditorToolsMessages() {
-	}
-
-	public static String getString(String key) {
-		try {
-			return RESOURCE_BUNDLE.getString(key);
-		} catch (MissingResourceException e) {
-			return '!' + key + '!';
-		}
-	}
-}
diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/tools/AntEditorToolsMessages.properties b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/tools/AntEditorToolsMessages.properties
deleted file mode 100644
index 7602f99..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/tools/AntEditorToolsMessages.properties
+++ /dev/null
@@ -1,14 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2003 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Common Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/cpl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-TaskXMLFileMerger.No_Task=Did not find Task \"{0}\" in HTML XML file.
-TaskXMLFileMerger.No_TaskName=Did not find TaskName in TargetTaskNode: {0}
-TaskXMLFileMerger.Could_not_print=Could not print XML: {0}
diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/tools/TaskXMLFileMerger.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/tools/TaskXMLFileMerger.java
deleted file mode 100644
index 2c5f70c..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/tools/TaskXMLFileMerger.java
+++ /dev/null
@@ -1,341 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2003 GEBIT Gesellschaft fuer EDV-Beratung
- * und Informatik-Technologien mbH, 
- * Berlin, Duesseldorf, Frankfurt (Germany) and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     GEBIT Gesellschaft fuer EDV-Beratung und Informatik-Technologien mbH - initial API and implementation
- * 	   IBM Corporation - bug 24108
- *******************************************************************************/
-
-package org.eclipse.ant.ui.internal.editor.tools;
-
-import java.io.IOException;
-import java.net.URL;
-import java.text.MessageFormat;
-import java.util.Vector;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-
-import org.eclipse.ant.ui.internal.model.AntUIPlugin;
-import org.w3c.dom.Document;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-
-/**
- * This class can be used to merge the tasks.xml and XDOCtasks.xml.
- * These files can be found in the Ant Editor Content Assist Dev folder.
- * Move the files to the Ant Editor folder to use this class.
- * 
- * The xml automatically generated from the proposed xdoclet in the Apache Ant's
- * project currently has no information on required attributes. In the future the task writers
- * hopefully will include this information in the source code comments. Our
- * template currently inserts an attribute required="NOTDEFINED" and this class
- * replaces that field if its defined in the xml file we have generated from the
- * information based on the html files in the Apache Ant's manual directory.
- */
-public class TaskXMLFileMerger {
-
-	//Definitions for the HTML Generated XML File
-    public static String HTML_TASKS_DESCRIPTION_XML_FILE_NAME = "/tasks.xml"; //$NON-NLS-1$
-    public static String HTML_XML_TAG_TASKS = "TASKS"; //$NON-NLS-1$
-    public static String HTML_XML_TAG_TASK = "TASK"; //$NON-NLS-1$
-    public static String HTML_XML_TAG_ATTRIBUTE = "ATTRIBUTE"; //$NON-NLS-1$
-    //public static String HTML_XML_TAG_DESCRIPTION = "DESCRIPTION";
-    public static String HTML_XML_ATTRIBUTE_NAME = "NAME"; //$NON-NLS-1$
-    public static String HTML_XML_ATTRIBUTE_REQUIRED = "REQUIRED"; //$NON-NLS-1$
-
-	//Definitions for the XDoclet Genereated XML File
-	public static String XDOC_TASKS_DESCRIPTION_XML_FILE_NAME = "/XDOCtasks.xml"; //$NON-NLS-1$
-	public static String XDOC_XML_TAG_TASKS = "tasks"; //$NON-NLS-1$
-	public static String XDOC_XML_TAG_TASK = "task"; //$NON-NLS-1$
-	public static String XDOC_XML_TAG_NAME = "name"; //$NON-NLS-1$
-	public static String XDOC_XML_TAG_STRUCTURE = "structure"; //$NON-NLS-1$
-	public static String XDOC_XML_TAG_ATTRIBUTES = "attributes"; //$NON-NLS-1$
-	public static String XDOC_XML_TAG_ATTRIBUTE = "attribute"; //$NON-NLS-1$
-	public static String XDOC_XML_TAG_ELEMENTS = "elements"; //$NON-NLS-1$
-	public static String XDOC_XML_TAG_ELEMENT = "element"; //$NON-NLS-1$
-	public static String XDOC_XML_TAG_REQUIRED = "required"; //$NON-NLS-1$
-	
-
-    protected NodeList taskNodes_HTML = null;
-	protected NodeList taskNodes_XDOC = null;
-	public Document xdocXMLDocument = null;
-
-    /**
-     * Creates an initialized instance.
-     */
-    public TaskXMLFileMerger() {
-        initialize();
-    }
-
-    
-    /**
-     * Parses the task description xml files and stores the information.
-     */
-	private void initialize() {
-    	
-    	Document tmpDocument = null;
-    	
-    	//Get All the Tasks in the HTML XML Generated file and store in the taskNodes_HTML
-    	tmpDocument = parseFile(HTML_TASKS_DESCRIPTION_XML_FILE_NAME);
-    	taskNodes_HTML = tmpDocument.getFirstChild().getChildNodes();
-    	
-    	//Do the same for the XDOC XML Generated file
-    	tmpDocument = parseFile(XDOC_TASKS_DESCRIPTION_XML_FILE_NAME);
-    	taskNodes_XDOC = tmpDocument.getFirstChild().getChildNodes();
-    	xdocXMLDocument = tmpDocument;
-/*   	
-        Document tempDocument = parseFile(aFileName);
-        Node tempRootNode = tempDocument.getDocumentElement();
-        NodeList tempChildNodes = tempRootNode.getChildNodes();
-        for(int i=0; i<tempChildNodes.getLength(); i++) {
-            Node tempNode = tempChildNodes.item(i);
-            if(tempNode.getNodeType() == Node.ELEMENT_NODE) {
-                String tempTagName = tempNode.getNodeName();
-                if(tempTagName.equals(anXML_TAG_TASK)) {
-                    NamedNodeMap tempAttributes = tempNode.getAttributes();
-                    Node tempAttributeNode = tempAttributes.getNamedItem(anXML_ATTRIBUTE_NAME);
-                    if(tempAttributeNode != null) {
-                        String tempTaskName = tempAttributeNode.getNodeValue();
-                        if(tempTaskName != null) {
-                           aHashMap.put(tempTaskName, tempNode);
-                        }
-                    }
-                }
-            }
-        }
-*/
-    }
-    
-
-	/**
-	 * This is the function that does all the work. Calling this
-	 * will cause all Required fields in all Attributes in the
-	 * XMLDoc file to be replaced with the value in the corresponding
-	 * Attributes Required field in the HTML Xml file. 
-	 */
-	public void runReplaceAttributeRequiredProcess() {
-		
-		//Iterate over all the tasks. If task is found in sourceList,
-		//then iterate over all the attributes, try to find out if the
-		//the attribute is required.
-		for(int i = 0; i < taskNodes_XDOC.getLength(); ++i ) {
-			Node tmpTargetNode = taskNodes_XDOC.item(i);
-			
-			if(tmpTargetNode.getNodeType() == Node.ELEMENT_NODE ) {
-				replaceAttributeRequiredInTaskNode(tmpTargetNode);
-			}
-		}
-	}
-	
-	private void replaceAttributeRequiredInTaskNode(Node aTargetTaskNode) {
-		
-		String tmpTaskName = aTargetTaskNode.getAttributes().getNamedItem(XDOC_XML_TAG_NAME).getNodeValue();
-		
-		if(tmpTaskName != null ) {
-			Node tmpSourceNode = getTaskInHTMLGeneratedTaskListNamed(tmpTaskName);
-			
-			if(tmpSourceNode != null) {
-				replaceAttributeRequiredInXMLTaskNodeWithAttributeRequiredInHTMLNode(aTargetTaskNode,
-																		 tmpSourceNode);
-			}
-			else {
-				System.out.println(MessageFormat.format(AntEditorToolsMessages.getString("TaskXMLFileMerger.No_Task"), new String[]{tmpTaskName})); //$NON-NLS-1$
-			}
-		}
-		else {
-			System.out.println(MessageFormat.format(AntEditorToolsMessages.getString("TaskXMLFileMerger.No_TaskName"), new String[]{aTargetTaskNode.toString()})); //$NON-NLS-1$
-		}
-	}
-	
-	private Node getTaskInHTMLGeneratedTaskListNamed(String aTaskName) {
-		
-		for(int i = 0; i<taskNodes_HTML.getLength(); ++i ) {
-			
-			Node tmpTaskNode = taskNodes_HTML.item(i);
-			if(tmpTaskNode.getNodeType() == Node.ELEMENT_NODE ) {
-				String tmpTagName = tmpTaskNode.getNodeName();
-                if(tmpTagName.equals(HTML_XML_TAG_TASK)) {
-                	NamedNodeMap tmpMap = tmpTaskNode.getAttributes();
-                	Node tmpNameNode = tmpMap.getNamedItem(HTML_XML_ATTRIBUTE_NAME);
-                	if( aTaskName.equals(tmpNameNode.getNodeValue()) ) {
-                		return tmpTaskNode;
-                	}
-                }
-			}
-		}
-		//Not found
-		return null;
-	}
-	
-	private void replaceAttributeRequiredInXMLTaskNodeWithAttributeRequiredInHTMLNode(Node aTargetTaskNode,
-																						  Node aSourceTaskNode) {
-		
-			Node tmpStructureNode = getChildNodeNamedWithTypeFromNode( XDOC_XML_TAG_STRUCTURE,
-															  			Node.ELEMENT_NODE,
-															  			aTargetTaskNode );
-															  
-			if(tmpStructureNode != null ) {
-				Node tmpTargetAttributesNode = getChildNodeNamedWithTypeFromNode(XDOC_XML_TAG_ATTRIBUTES,
-															  					  Node.ELEMENT_NODE,
-															  					  tmpStructureNode);
-				if(tmpTargetAttributesNode != null ) {
-					Vector tmpTargetAttributesVector = getAttributeNodesFromXMLAttributesNode(tmpTargetAttributesNode);
-					Vector tmpSourceAttributesVector = getAttributeNodesFromHTMLTaskNode(aSourceTaskNode);
-					
-					//Iterate over all the attributes in the targetTaskNode
-					for(int i=0; i < tmpTargetAttributesVector.size(); ++i) {
-						Node tmpAttributeNode = (Node)tmpTargetAttributesVector.get(i);
-						replaceAttributeRequiredInAttributeNodeWithValueFoundInNodeVector(tmpAttributeNode, tmpSourceAttributesVector);
-					}
-				}
-			}
-	}
-	
-	private void replaceAttributeRequiredInAttributeNodeWithValueFoundInNodeVector(Node aTargetAttributeNode, Vector aSourceAttributeVector) {
-		
-		NamedNodeMap tmpTargetNamedNodeMap = aTargetAttributeNode.getAttributes();
-		String tmpTargetAttributeName = tmpTargetNamedNodeMap.getNamedItem(XDOC_XML_TAG_NAME).getNodeValue();
-		
-		String tmpSourceAttributeName = null;
-		String tmpSourceRequiredValue = null;
-		
-		for(int i=0; i < aSourceAttributeVector.size(); ++i) {
-			Node tmpSourceAttributeNode = (Node)aSourceAttributeVector.get(i);
-			NamedNodeMap tmpSourceAttributeNamedNodeMap = tmpSourceAttributeNode.getAttributes();
-			tmpSourceAttributeName = tmpSourceAttributeNamedNodeMap.getNamedItem(HTML_XML_ATTRIBUTE_NAME).getNodeValue();
-			//If the Attribute Name is the same we replace the REQUIRED Value	
-			if(tmpTargetAttributeName.equals(tmpSourceAttributeName) ){
-				tmpSourceRequiredValue = tmpSourceAttributeNamedNodeMap.getNamedItem(HTML_XML_ATTRIBUTE_REQUIRED).getNodeValue(); 
-				//Set the Vaule to the on we just got.
-				tmpTargetNamedNodeMap.getNamedItem(XDOC_XML_TAG_REQUIRED).setNodeValue(tmpSourceRequiredValue);
-			}
-		}
-	}
-						
-	private Vector getAttributeNodesFromXMLAttributesNode(Node anXMLAttributesNode){
-		
-		Vector allAttributes = new Vector(); 
-		NodeList tmpList = anXMLAttributesNode.getChildNodes();
-		
-		for(int i = 0; i<tmpList.getLength(); ++i) {
-			Node tmpNode = tmpList.item(i);
-			if(tmpNode.getNodeType() == Node.ELEMENT_NODE 
-				&& XDOC_XML_TAG_ATTRIBUTE.equals(tmpNode.getNodeName()) ) {
-				allAttributes.add(tmpNode);
-			}
-		}
-		return allAttributes;
-	}
-	
-	private Vector getAttributeNodesFromHTMLTaskNode(Node anHTTP_XML_TaskNode) {
-		
-		Vector tmpVector = new Vector();
-		NodeList tmpList = anHTTP_XML_TaskNode.getChildNodes();
-		
-		for(int i = 0; i < tmpList.getLength(); ++i) {
-			Node tmpNode = tmpList.item(i);
-			if(tmpNode.getNodeType() == Node.ELEMENT_NODE
-				&& HTML_XML_TAG_ATTRIBUTE.equals(tmpNode.getNodeName()) ) {
-					tmpVector.add(tmpNode);
-				}
-		}
-		
-		return tmpVector;
-	}
-	
-	/**
-     * Returns the ChildNode of the node defined by the Arguments. The
-     * first child found matching the criterias is returned.
-     * 
-     * @param aNodeName The Name of the Node to return.
-     * @param aType The Type of the node @see Node
-     * @param aParentNode The Node to get the child from
-     * 
-     * @return The First Child Node found matching the criterias,
-     * or null if none is found.
-     */																		  			
-	private Node getChildNodeNamedWithTypeFromNode(String aName, short aNodeType, Node aNode ) {
-		
-		NodeList tmpNodeList = aNode.getChildNodes();
-		for(int i=0; i<tmpNodeList.getLength(); ++i ) {
-			Node tmpNode = tmpNodeList.item(i);
-			if( (tmpNode.getNodeType() == aNodeType) && aName.equals(tmpNode.getNodeName()) ) {
-				return tmpNode;
-			}
-		}
-		//Not found
-		return null;
-	} 
-			
-		
-    /**
-     * Returns the (DOM) document as a result of parsing the file with the 
-     * specified file name.
-     * <P>
-     * The file will be loaded as resource, thus must begin with '/' and must
-     * be relative to the classpath.
-     */
-	private Document parseFile(String aFileName) {
-        Document tempDocument = null;
-
-        DocumentBuilderFactory tempFactory = DocumentBuilderFactory.newInstance();
-        tempFactory.setIgnoringComments(true);
-        tempFactory.setIgnoringElementContentWhitespace(true);
-        tempFactory.setCoalescing(true);
-
-        try {
-            DocumentBuilder tempDocBuilder = tempFactory.newDocumentBuilder();
-            URL tempURL = getClass().getResource(aFileName);
-            InputSource tempInputSource = new InputSource(tempURL.toExternalForm());
-            tempDocument = tempDocBuilder.parse(tempInputSource);
-        } catch (ParserConfigurationException e) {
-			AntUIPlugin.log(e);
-        }
-        catch (IOException ioException) {
-			AntUIPlugin.log(ioException);
-        }
-        catch (SAXException saxException) {
-			AntUIPlugin.log(saxException);
-        }
-
-        return tempDocument;
-    }
-    
-    /**
-     * This function writes the XMLDocument to the specified file.
-     * @param aFileName The filename to which the XMLDocument should be written.
-     */
-    public void writeXMLDocumentToFile(String aFileName) {
-    	
-//    	try {	
-//    		XmlDocument xmlDocument = (XmlDocument)xdocXMLDocument;
-//    		xmlDocument.write(new FileWriter(aFileName), "UTF-8"); //$NON-NLS-1$
-//    	}
-//    	catch(IOException ioe) {
-//    		System.out.println(MessageFormat.format(AntEditorToolsMessages.getString("TaskXMLFileMerger.Could_not_print"), new String[]{ioe.toString()})); //$NON-NLS-1$
-//    	} 
-    }
-	
-	/**
-	 * Creates an Instance of this class and calls the
-	 * generateParsedXML() method.
-	 * @see generateParsedXML()
-	 */
-	public static void main(String[] args) {
-		
-		TaskXMLFileMerger tmpTaskXMLFileMerger = new TaskXMLFileMerger();
-		tmpTaskXMLFileMerger.runReplaceAttributeRequiredProcess();
-		tmpTaskXMLFileMerger.writeXMLDocumentToFile("src\\anttasks_1.5b.xml"); //$NON-NLS-1$
-	}
-}
diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/utils/AntEditorUtilsMessages.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/utils/AntEditorUtilsMessages.java
deleted file mode 100644
index 8e505ac..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/utils/AntEditorUtilsMessages.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.ui.internal.editor.utils;
-
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-public class AntEditorUtilsMessages {
-
-	private static final String BUNDLE_NAME = "org.eclipse.ant.ui.internal.editor.utils.AntEditorUtilsMessages"; //$NON-NLS-1$
-
-	private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME);
-
-	private AntEditorUtilsMessages() {
-	}
-
-	public static String getString(String key) {
-		try {
-			return RESOURCE_BUNDLE.getString(key);
-		} catch (MissingResourceException e) {
-			return '!' + key + '!';
-		}
-	}
-}
diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/utils/AntEditorUtilsMessages.properties b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/utils/AntEditorUtilsMessages.properties
deleted file mode 100644
index 99b18e6..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/utils/AntEditorUtilsMessages.properties
+++ /dev/null
@@ -1,22 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2003 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Common Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/cpl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-ProjectHelperImpl.Unexpected_element___{0}__1=Unexpected element \"{0}"
-ProjectHelperImpl.Unexpected_text___{0}__2=Unexpected text \"{0}"
-ProjectHelperImpl.Unknown_data_type__3=Unknown data type 
-ProjectHelperImpl.Unexpected_attribute___{0}__4=Unexpected attribute \"{0}"
-ProjectHelperImpl.The_default_attribute_of_project_is_required_5=The default attribute of project is required
-ProjectHelperImpl.Unexpected_element___{0}__6=Unexpected element \"{0}"
-ProjectHelperImpl.Config_file_is_not_of_expected_XML_type_7=Config file is not of expected XML type
-ProjectHelperImpl.Unexpected_attribute___{0}__8=Unexpected attribute \"{0}"
-ProjectHelperImpl.target_element_appears_without_a_name_attribute_9=target element appears without a name attribute
-ProjectHelperImpl.Encoding_of_project_file_is_invalid._10=Encoding of project file is invalid.
-ProjectHelperImpl.Error_reading_project_file__{0}_11=Error reading project file: {0}
diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/utils/ProjectHelper.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/utils/ProjectHelper.java
deleted file mode 100644
index 310f634..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/utils/ProjectHelper.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ant.ui.internal.editor.utils;
-
-/*
- * 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
- * <http://www.apache.org/>.
- */
- 
-import java.io.File;
-
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Project;
-
-/**
- * Derived from the original Ant ProjectHelper class
- */
-public class ProjectHelper extends org.apache.tools.ant.ProjectHelper {
-
-    /**
-     * That is the one method that was needed and why copying of this package
-     * from ant 1.5 had to be done. Other than usual Ant processing, here we don't
-     * work on a file but on a string.
-     * 
-     * @param project the project
-     * @param aWholeDocumentString the string that contains the whole docoment
-     * that we want to configure the project on.
-     * 
-     * @author Alf Schiefelbein
-     */
-    public static void configureProject(Project project, File aFile, String aWholeDocumentString) throws BuildException {
-        ProjectHelperImpl helper = (ProjectHelperImpl)getProjectHelper();
-        helper.parse(project, aFile, aWholeDocumentString);
-    }
-    
-	public static org.apache.tools.ant.ProjectHelper getProjectHelper() throws BuildException {
-		return new ProjectHelperImpl();
-	}
-}
diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/utils/ProjectHelperImpl.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/utils/ProjectHelperImpl.java
deleted file mode 100644
index c59dc48..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/utils/ProjectHelperImpl.java
+++ /dev/null
@@ -1,1167 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ant.ui.internal.editor.utils;
-
-/*
- * 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
- * <http://www.apache.org/>.
- */
- 
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.StringReader;
-import java.io.UnsupportedEncodingException;
-import java.text.MessageFormat;
-import java.util.Locale;
-
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.IntrospectionHelper;
-import org.apache.tools.ant.Location;
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.ProjectHelper;
-import org.apache.tools.ant.RuntimeConfigurable;
-import org.apache.tools.ant.Target;
-import org.apache.tools.ant.Task;
-import org.apache.tools.ant.TaskAdapter;
-import org.apache.tools.ant.TaskContainer;
-import org.apache.tools.ant.UnknownElement;
-import org.apache.tools.ant.util.JAXPUtils;
-import org.xml.sax.AttributeList;
-import org.xml.sax.DocumentHandler;
-import org.xml.sax.HandlerBase;
-import org.xml.sax.InputSource;
-import org.xml.sax.Locator;
-import org.xml.sax.SAXException;
-import org.xml.sax.SAXParseException;
-import org.xml.sax.helpers.XMLReaderAdapter;
-
-/**
- * Derived from the original Ant ProjectHelperImpl class.
- * Changes:
- *  All logging is turned off as the Project we are dealing with is a "temp"
- *  project that has no registered build listeners.  
- * NLS'ed  
- * Able to parse based on String instead of a file
- */
-
-public class ProjectHelperImpl extends org.apache.tools.ant.helper.ProjectHelperImpl {
-
-    /**
-     * SAX 1 style parser used to parse the given file. This may
-     * in fact be a SAX 2 XMLReader wrapped in an XMLReaderAdapter.
-     */
-    private org.xml.sax.Parser parser;
-
-    /** The project to configure. */
-    private Project project;
-    /** The configuration file to parse. */
-    private File buildFile;
-    /**
-     * Parent directory of the build file. Used for resolving entities
-     * and setting the project's base directory.
-     */
-    private File buildFileParent;
-    /**
-     * Locator for the configuration file parser.
-     * Used for giving locations of errors etc.
-     */
-    private Locator locator;
-
-	/**
-	 * Scans an attribute list for the <code>id</code> attribute and
-	 * stores a reference to the target object in the project if an
-	 * id is found.
-	 * <p>
-	 * This method was moved out of the configure method to allow
-	 * it to be executed at parse time.
-	 *
-	 * @see #configure(Object,AttributeList,Project)
-	 */
-	private void configureId(Object target, AttributeList attr) {
-		String id = attr.getValue("id"); //$NON-NLS-1$
-		if (id != null) {
-			project.addReference(id, target);
-		}
-	}
-	
-    /**
-     * Parses the project file, configuring the project as it goes.
-     * <P>
-     * This method does the same as <code>parse(Project, File)</code>, though
-     * it works on a string. This is required for finding the properties for
-     * the Ant Editor code assistance.
-     * 
-     * @param project project instance to be configured.
-     * @param source the source as string from which the project is read.
-     * @exception BuildException if the configuration is invalid or cannot
-     *                           be read.
-     * 
-     * @author Alf Schiefelbein
-     */
-    public void parse(Project refProject, File aFile, String sourceAsString) throws BuildException {
-        FileInputStream inputStream = null;
-        InputSource inputSource = null;
-
-        this.project = refProject;
-        this.buildFile = new File(aFile.getAbsolutePath());
-        buildFileParent = new File(this.buildFile.getParent());
-
-        try {
-            try {
-                parser = JAXPUtils.getParser();
-            } catch (BuildException e) {
-                parser = new XMLReaderAdapter(JAXPUtils.getXMLReader());
-            }
-
-            String uri = "file:" + buildFile.getAbsolutePath().replace('\\', '/'); //$NON-NLS-1$
-            for (int index = uri.indexOf('#'); index != -1; index = uri.indexOf('#')) {
-                uri = uri.substring(0, index) + "%23" + uri.substring(index + 1); //$NON-NLS-1$
-            }
-             
-            // changed here
-            inputSource = new InputSource(new StringReader(sourceAsString));
-			inputSource.setSystemId(uri);
-          
-            HandlerBase hb = new RootHandler(this);
-            parser.setDocumentHandler(hb);
-            parser.setEntityResolver(hb);
-            parser.setErrorHandler(hb);
-            parser.setDTDHandler(hb);
-            parser.parse(inputSource);
-        } catch (SAXParseException exc) {
-            Location location =
-                new Location(exc.getSystemId(), exc.getLineNumber(),
-                    exc.getColumnNumber());
-
-            Throwable t = exc.getException();
-            if (t instanceof BuildException) {
-                BuildException be = (BuildException) t;
-                if (be.getLocation() == Location.UNKNOWN_LOCATION) {
-                    be.setLocation(location);
-                }
-                throw be;
-            }
-
-            throw new BuildException(exc.getMessage(), t, location);
-        } catch (SAXException exc) {
-            Throwable t = exc.getException();
-            if (t instanceof BuildException) {
-                throw (BuildException) t;
-            }
-            throw new BuildException(exc.getMessage(), t);
-        } catch (FileNotFoundException exc) {
-            throw new BuildException(exc);
-        } catch (UnsupportedEncodingException exc) {
-            throw new BuildException(AntEditorUtilsMessages.getString("ProjectHelperImpl.Encoding_of_project_file_is_invalid._10"), //$NON-NLS-1$
-                                     exc);
-        } catch (IOException exc) {
-            throw new BuildException(MessageFormat.format(AntEditorUtilsMessages.getString("ProjectHelperImpl.Error_reading_project_file__{0}_11"), new String[]{exc.getMessage()}), exc); //$NON-NLS-1$
-        } finally {
-            if (inputStream != null) {
-                try {
-                    inputStream.close();
-                } catch (IOException ioe) {
-                    // ignore this
-                }
-            }
-        }
-    }
-    
-	/**
-	 * The common superclass for all SAX event handlers used to parse
-	 * the configuration file. Each method just throws an exception,
-	 * so subclasses should override what they can handle.
-	 *
-	 * Each type of XML element (task, target, etc.) in Ant has
-	 * a specific subclass.
-	 *
-	 * In the constructor, this class takes over the handling of SAX
-	 * events from the parent handler and returns
-	 * control back to the parent in the endElement method.
-	 */
-	static class AbstractHandler extends HandlerBase {
-
-		/**
-		 * Previous handler for the document.
-		 * When the next element is finished, control returns
-		 * to this handler.
-		 */
-		protected DocumentHandler parentHandler;
-
-		/** Helper impl. With non-static internal classes, the compiler will generate
-			this automatically - but this will fail with some compilers ( reporting
-			"Expecting to find object/array on stack" ). If we pass it
-			explicitely it'll work with more compilers.
-		*/
-		ProjectHelperImpl helperImpl;
-
-		/**
-		 * Creates a handler and sets the parser to use it
-		 * for the current element.
-		 *
-		 * @param helperImpl the ProjectHelperImpl instance associated
-		 *                   with this handler.
-		 *
-		 * @param parentHandler The handler which should be restored to the
-		 *                      parser at the end of the element.
-		 *                      Must not be <code>null</code>.
-		 */
-		public AbstractHandler(ProjectHelperImpl helperImpl, DocumentHandler parentHandler) {
-			this.parentHandler = parentHandler;
-			this.helperImpl = helperImpl;
-
-			// Start handling SAX events
-			helperImpl.parser.setDocumentHandler(this);
-		}
-
-		/**
-		 * Handles the start of an element. This base implementation just
-		 * throws an exception.
-		 *
-		 * @param tag The name of the element being started.
-		 *            Will not be <code>null</code>.
-		 * @param attrs Attributes of the element being started.
-		 *              Will not be <code>null</code>.
-		 *
-		 * @exception SAXParseException if this method is not overridden, or in
-		 *                              case of error in an overridden version
-		 */
-		public void startElement(String tag, AttributeList attrs) throws SAXParseException {
-			throw new SAXParseException(MessageFormat.format(AntEditorUtilsMessages.getString("ProjectHelperImpl.Unexpected_element___{0}__1"), new String[]{tag}), helperImpl.locator); //$NON-NLS-1$
-		}
-
-		/**
-		 * Handles text within an element. This base implementation just
-		 * throws an exception.
-		 *
-		 * @param buf A character array of the text within the element.
-		 *            Will not be <code>null</code>.
-		 * @param start The start element in the array.
-		 * @param count The number of characters to read from the array.
-		 *
-		 * @exception SAXParseException if this method is not overridden, or in
-		 *                              case of error in an overridden version
-		 */
-		public void characters(char[] buf, int start, int count) throws SAXParseException {
-			String s = new String(buf, start, count).trim();
-
-			if (s.length() > 0) {
-				throw new SAXParseException(MessageFormat.format(AntEditorUtilsMessages.getString("ProjectHelperImpl.Unexpected_text___{0}__2"), new String[]{s}), helperImpl.locator); //$NON-NLS-1$
-			}
-		}
-
-		/**
-		 * Called when this element and all elements nested into it have been
-		 * handled.
-		 */
-		protected void finished() {}
-
-		/**
-		 * Handles the end of an element. Any required clean-up is performed
-		 * by the finished() method and then the original handler is restored to
-		 * the parser.
-		 *
-		 * @param name The name of the element which is ending.
-		 *             Will not be <code>null</code>.
-		 *
-		 * @exception SAXException in case of error (not thrown in
-		 *                         this implementation)
-		 *
-		 * @see #finished()
-		 */
-		public void endElement(String name) throws SAXException {
-
-			finished();
-			// Let parent resume handling SAX events
-			helperImpl.parser.setDocumentHandler(parentHandler);
-		}
-	}
-	/**
-	 * Handler for all data types directly subordinate to project or target.
-	 */
-	static class DataTypeHandler extends AbstractHandler {
-		/** Parent target, if any. */
-		private Target target;
-		/** The element being configured. */
-		private Object element;
-		/** Wrapper for this element, if it's part of a target. */
-		private RuntimeConfigurable wrapper = null;
-
-		/**
-		 * Constructor with no target specified.
-		 *
-		 * @param parentHandler The handler which should be restored to the
-		 *                      parser at the end of the element.
-		 *                      Must not be <code>null</code>.
-		 */
-		public DataTypeHandler(ProjectHelperImpl helperImpl, DocumentHandler parentHandler) {
-			this(helperImpl, parentHandler, null);
-		}
-
-		/**
-		 * Constructor with a target specified.
-		 *
-		 * @param parentHandler The handler which should be restored to the
-		 *                      parser at the end of the element.
-		 *                      Must not be <code>null</code>.
-		 *
-		 * @param target The parent target of this element.
-		 *               May be <code>null</code>.
-		 */
-		public DataTypeHandler(ProjectHelperImpl helperImpl, DocumentHandler parentHandler, Target target) {
-			super(helperImpl, parentHandler);
-			this.target = target;
-		}
-
-		/**
-		 * Initialisation routine called after handler creation
-		 * with the element name and attributes. This configures
-		 * the element with its attributes and sets it up with
-		 * its parent container (if any). Nested elements are then
-		 * added later as the parser encounters them.
-		 *
-		 * @param propType Name of the element which caused this handler
-		 *            to be created. Must not be <code>null</code>.
-		 *
-		 * @param attrs Attributes of the element which caused this
-		 *              handler to be created. Must not be <code>null</code>.
-		 *
-		 * @exception SAXParseException in case of error, such as a
-		 *            BuildException being thrown during configuration.
-		 */
-		public void init(String propType, AttributeList attrs) throws SAXParseException {
-			try {
-				element = helperImpl.project.createDataType(propType);
-				if (element == null) {
-					throw new BuildException(AntEditorUtilsMessages.getString("ProjectHelperImpl.Unknown_data_type__3") + propType); //$NON-NLS-1$
-				}
-
-				if (target != null) {
-					wrapper = new RuntimeConfigurable(element, propType);
-					wrapper.setAttributes(attrs);
-					target.addDataType(wrapper);
-				} else {
-					configure(element, attrs, helperImpl.project);
-					helperImpl.configureId(element, attrs);
-				}
-			} catch (BuildException exc) {
-				throw new SAXParseException(exc.getMessage(), helperImpl.locator, exc);
-			}
-		}
-
-		// XXX: (Jon Skeet) Any reason why this doesn't use the wrapper
-		// if one is available, whereas NestedElementHandler.characters does?
-		/**
-		 * Adds text to the element.
-		 *
-		 * @param buf A character array of the text within the element.
-		 *            Will not be <code>null</code>.
-		 * @param start The start element in the array.
-		 * @param count The number of characters to read from the array.
-		 *
-		 * @exception SAXParseException if the element doesn't support text
-		 *
-		 * @see ProjectHelper#addText(Project,Object,char[],int,int)
-		 */
-		public void characters(char[] buf, int start, int count) throws SAXParseException {
-			try {
-				ProjectHelper.addText(helperImpl.project, element, buf, start, count);
-			} catch (BuildException exc) {
-				throw new SAXParseException(exc.getMessage(), helperImpl.locator, exc);
-			}
-		}
-
-		/**
-		 * Handles the start of an element within this one.
-		 * This will always use a nested element handler.
-		 *
-		 * @param name The name of the element being started.
-		 *            Will not be <code>null</code>.
-		 * @param attrs Attributes of the element being started.
-		 *              Will not be <code>null</code>.
-		 *
-		 * @exception SAXParseException if an error occurs when initialising
-		 *                              the child handler
-		 */
-		public void startElement(String name, AttributeList attrs) throws SAXParseException {
-			new NestedElementHandler(helperImpl, this, element, wrapper, target).init(name, attrs);
-		}
-	}
-	/**
-	 * Handler for all nested properties.
-	 */
-	static class NestedElementHandler extends AbstractHandler {
-		/** Parent object (task/data type/etc). */
-		private Object parent;
-		/** The nested element itself. */
-		private Object child;
-		/**
-		 * Wrapper for the parent element, if any. The wrapper for this
-		 * element will be added to this wrapper as a child.
-		 */
-		private RuntimeConfigurable parentWrapper;
-		/**
-		 * Wrapper for this element which takes care of actually configuring
-		 * the element, if a parent wrapper is provided.
-		 * Otherwise the configuration is performed with the configure method.
-		 * @see ProjectHelper#configure(Object,AttributeList,Project)
-		 */
-		private RuntimeConfigurable childWrapper = null;
-		/** Target this element is part of, if any. */
-		private Target target;
-
-		/**
-		 * Constructor.
-		 *
-		 * @param parentHandler The handler which should be restored to the
-		 *                      parser at the end of the element.
-		 *                      Must not be <code>null</code>.
-		 *
-		 * @param parent        Parent of this element (task/data type/etc).
-		 *                      Must not be <code>null</code>.
-		 *
-		 * @param parentWrapper Wrapper for the parent element, if any.
-		 *                      May be <code>null</code>.
-		 *
-		 * @param target        Target this element is part of.
-		 *                      May be <code>null</code>.
-		 */
-		public NestedElementHandler(ProjectHelperImpl helperImpl,
-									DocumentHandler parentHandler,
-									Object parent,
-									RuntimeConfigurable parentWrapper,
-									Target target) {
-			super(helperImpl, parentHandler);
-
-			if (parent instanceof TaskAdapter) {
-				this.parent = ((TaskAdapter) parent).getProxy();
-			} else {
-				this.parent = parent;
-			}
-			this.parentWrapper = parentWrapper;
-			this.target = target;
-		}
-
-		/**
-		 * Initialisation routine called after handler creation
-		 * with the element name and attributes. This configures
-		 * the element with its attributes and sets it up with
-		 * its parent container (if any). Nested elements are then
-		 * added later as the parser encounters them.
-		 *
-		 * @param propType Name of the element which caused this handler
-		 *            to be created. Must not be <code>null</code>.
-		 *
-		 * @param attrs Attributes of the element which caused this
-		 *              handler to be created. Must not be <code>null</code>.
-		 *
-		 * @exception SAXParseException in case of error, such as a
-		 *            BuildException being thrown during configuration.
-		 */
-		public void init(String propType, AttributeList attrs) throws SAXParseException {
-			Class parentClass = parent.getClass();
-			IntrospectionHelper ih =
-				IntrospectionHelper.getHelper(parentClass);
-
-			try {
-				String elementName = propType.toLowerCase(Locale.US);
-				if (parent instanceof UnknownElement) {
-					UnknownElement uc = new UnknownElement(elementName);
-					uc.setProject(helperImpl.project);
-					((UnknownElement) parent).addChild(uc);
-					child = uc;
-				} else {
-					child = ih.createElement(helperImpl.project, parent, elementName);
-				}
-
-				helperImpl.configureId(child, attrs);
-
-				if (parentWrapper != null) {
-					childWrapper = new RuntimeConfigurable(child, propType);
-					childWrapper.setAttributes(attrs);
-					parentWrapper.addChild(childWrapper);
-				} else {
-					configure(child, attrs, helperImpl.project);
-					ih.storeElement(helperImpl.project, parent, child, elementName);
-				}
-			} catch (BuildException exc) {
-				throw new SAXParseException(exc.getMessage(), helperImpl.locator, exc);
-			}
-		}
-
-		/**
-		 * Adds text to the element, using the wrapper if one is
-		 * available or using addText otherwise.
-		 *
-		 * @param buf A character array of the text within the element.
-		 *            Will not be <code>null</code>.
-		 * @param start The start element in the array.
-		 * @param count The number of characters to read from the array.
-		 *
-		 * @exception SAXParseException if the element doesn't support text
-		 *
-		 * @see ProjectHelper#addText(Project,Object,char[],int,int)
-		 */
-		public void characters(char[] buf, int start, int count) throws SAXParseException {
-			if (parentWrapper == null) {
-				try {
-					ProjectHelper.addText(helperImpl.project, child, buf, start, count);
-				} catch (BuildException exc) {
-					throw new SAXParseException(exc.getMessage(), helperImpl.locator, exc);
-				}
-			} else {
-				childWrapper.addText(buf, start, count);
-			}
-		}
-
-		/**
-		 * Handles the start of an element within this one. Task containers
-		 * will always use a task handler, and all other elements
-		 * will always use another nested element handler.
-		 *
-		 * @param name The name of the element being started.
-		 *            Will not be <code>null</code>.
-		 * @param attrs Attributes of the element being started.
-		 *              Will not be <code>null</code>.
-		 *
-		 * @exception SAXParseException if an error occurs when initialising
-		 *                              the appropriate child handler
-		 */
-		public void startElement(String name, AttributeList attrs) throws SAXParseException {
-			if (child instanceof TaskContainer) {
-				// taskcontainer nested element can contain other tasks - no other
-				// nested elements possible
-				new TaskHandler(helperImpl, this, (TaskContainer) child,
-					childWrapper, target).init(name, attrs);
-			} else {
-				new NestedElementHandler(helperImpl, this, child,
-					childWrapper, target).init(name, attrs);
-			}
-		}
-	}
-	/**
-	 * Handler for the top level "project" element.
-	 */
-	static class ProjectHandler extends AbstractHandler {
-
-		/**
-		 * Constructor which just delegates to the superconstructor.
-		 *
-		 * @param parentHandler The handler which should be restored to the
-		 *                      parser at the end of the element.
-		 *                      Must not be <code>null</code>.
-		 */
-		public ProjectHandler(ProjectHelperImpl helperImpl, DocumentHandler parentHandler) {
-			super(helperImpl, parentHandler);
-		}
-
-		/**
-		 * Initialisation routine called after handler creation
-		 * with the element name and attributes. The attributes which
-		 * this handler can deal with are: <code>"default"</code>,
-		 * <code>"name"</code>, <code>"id"</code> and <code>"basedir"</code>.
-		 *
-		 * @param tag Name of the element which caused this handler
-		 *            to be created. Should not be <code>null</code>.
-		 *            Ignored in this implementation.
-		 * @param attrs Attributes of the element which caused this
-		 *              handler to be created. Must not be <code>null</code>.
-		 *
-		 * @exception SAXParseException if an unexpected attribute is
-		 *            encountered or if the <code>"default"</code> attribute
-		 *            is missing.
-		 */
-		public void init(String tag, AttributeList attrs) throws SAXParseException {
-			String def = null;
-			String name = null;
-			String id = null;
-			String baseDir = null;
-
-			for (int i = 0; i < attrs.getLength(); i++) {
-				String key = attrs.getName(i);
-				String value = attrs.getValue(i);
-
-				if (key.equals("default")) { //$NON-NLS-1$
-					def = value;
-				} else if (key.equals("name")) { //$NON-NLS-1$
-					name = value;
-				} else if (key.equals("id")) { //$NON-NLS-1$
-					id = value;
-				} else if (key.equals("basedir")) { //$NON-NLS-1$
-					baseDir = value;
-				} else {
-					throw new SAXParseException(MessageFormat.format(AntEditorUtilsMessages.getString("ProjectHelperImpl.Unexpected_attribute___{0}__4"), new String[]{attrs.getName(i)}), //$NON-NLS-1$
-												helperImpl.locator);
-				}
-			}
-
-			if (def == null) {
-				throw new SAXParseException(AntEditorUtilsMessages.getString("ProjectHelperImpl.The_default_attribute_of_project_is_required_5"),  //$NON-NLS-1$
-											helperImpl.locator);
-			} else {
-				helperImpl.project.setDefaultTarget(def);
-			}
-
-			if (name != null) {
-				helperImpl.project.setName(name);
-				helperImpl.project.addReference(name, helperImpl.project);
-			}
-
-			if (id != null) {
-			  helperImpl.project.addReference(id, helperImpl.project);
-			}
-
-			if (helperImpl.project.getProperty("basedir") != null) { //$NON-NLS-1$
-				helperImpl.project.setBasedir(helperImpl.project.getProperty("basedir")); //$NON-NLS-1$
-			} else {
-				if (baseDir == null) {
-					helperImpl.project.setBasedir(helperImpl.buildFileParent.getAbsolutePath());
-				} else {
-					// check whether the user has specified an absolute path
-					if ((new File(baseDir)).isAbsolute()) {
-						helperImpl.project.setBasedir(baseDir);
-					} else {
-						helperImpl.project.setBaseDir(helperImpl.project.resolveFile(baseDir,
-																					 helperImpl.buildFileParent));
-					}
-				}
-			}
-
-		}
-
-		/**
-		 * Handles the start of a top-level element within the project. An
-		 * appropriate handler is created and initialised with the details
-		 * of the element.
-		 *
-		 * @param name The name of the element being started.
-		 *            Will not be <code>null</code>.
-		 * @param attrs Attributes of the element being started.
-		 *              Will not be <code>null</code>.
-		 *
-		 * @exception SAXParseException if the tag given is not
-		 *            <code>"taskdef"</code>, <code>"typedef"</code>,
-		 *            <code>"property"</code>, <code>"target"</code>
-		 *            or a data type definition
-		 */
-		public void startElement(String name, AttributeList attrs) throws SAXParseException {
-			if (name.equals("taskdef")) { //$NON-NLS-1$
-				handleTaskdef(name, attrs);
-			} else if (name.equals("typedef")) { //$NON-NLS-1$
-				handleTypedef(name, attrs);
-			} else if (name.equals("property")) { //$NON-NLS-1$
-				handleProperty(name, attrs);
-			} else if (name.equals("target")) { //$NON-NLS-1$
-				handleTarget(name, attrs);
-			} else if (helperImpl.project.getDataTypeDefinitions().get(name) != null) {
-				handleDataType(name, attrs);
-			} else {
-				throw new SAXParseException(MessageFormat.format(AntEditorUtilsMessages.getString("ProjectHelperImpl.Unexpected_element___{0}__6"), new String[]{name}), helperImpl.locator); //$NON-NLS-1$
-			}
-		}
-
-		/**
-		 * Handles a task defintion element by creating a task handler
-		 * and initialising is with the details of the element.
-		 *
-		 * @param name The name of the element to be handled.
-		 *            Will not be <code>null</code>.
-		 * @param attrs Attributes of the element to be handled.
-		 *              Will not be <code>null</code>.
-		 *
-		 * @exception SAXParseException if an error occurs when initialising
-		 *                              the task handler
-		 *
-		 */
-		private void handleTaskdef(String name, AttributeList attrs) throws SAXParseException {
-			(new TaskHandler(helperImpl, this, null, null, null)).init(name, attrs);
-		}
-
-		/**
-		 * Handles a type defintion element by creating a task handler
-		 * and initialising is with the details of the element.
-		 *
-		 * @param name The name of the element to be handled.
-		 *            Will not be <code>null</code>.
-		 * @param attrs Attributes of the element to be handled.
-		 *              Will not be <code>null</code>.
-		 *
-		 * @exception SAXParseException if an error occurs initialising the
-		 *                              handler
-		 */
-		private void handleTypedef(String name, AttributeList attrs) throws SAXParseException {
-			(new TaskHandler(helperImpl, this, null, null, null)).init(name, attrs);
-		}
-
-		/**
-		 * Handles a property defintion element by creating a task handler
-		 * and initialising is with the details of the element.
-		 *
-		 * @param name The name of the element to be handled.
-		 *            Will not be <code>null</code>.
-		 * @param attrs Attributes of the element to be handled.
-		 *              Will not be <code>null</code>.
-		 *
-		 * @exception SAXParseException if an error occurs initialising
-		 *                              the handler
-		 */
-		private void handleProperty(String name, AttributeList attrs) throws SAXParseException {
-			(new TaskHandler(helperImpl, this, null, null, null)).init(name, attrs);
-		}
-
-		/**
-		 * Handles a target defintion element by creating a target handler
-		 * and initialising is with the details of the element.
-		 *
-		 * @param tag The name of the element to be handled.
-		 *            Will not be <code>null</code>.
-		 * @param attrs Attributes of the element to be handled.
-		 *              Will not be <code>null</code>.
-		 *
-		 * @exception SAXParseException if an error occurs initialising
-		 *                              the handler
-		 */
-		private void handleTarget(String tag, AttributeList attrs) throws SAXParseException {
-			new TargetHandler(helperImpl, this).init(tag, attrs);
-		}
-		/**
-		 * Handles a data type defintion element by creating a data type
-		 * handler and initialising is with the details of the element.
-		 *
-		 * @param name The name of the element to be handled.
-		 *            Will not be <code>null</code>.
-		 * @param attrs Attributes of the element to be handled.
-		 *              Will not be <code>null</code>.
-		 *
-		 * @exception SAXParseException if an error occurs initialising
-		 *                              the handler
-		 */
-		private void handleDataType(String name, AttributeList attrs) throws SAXParseException {
-			new DataTypeHandler(helperImpl, this).init(name, attrs);
-		}
-
-	}
-	/**
-	 * Handler for the root element. Its only child must be the "project" element.
-	 */
-	static class RootHandler extends HandlerBase {
-		ProjectHelperImpl helperImpl;
-
-		public RootHandler(ProjectHelperImpl helperImpl) {
-			this.helperImpl = helperImpl;
-		}
-
-		/**
-		 * Resolves file: URIs relative to the build file.
-		 *
-		 * @param publicId The public identifer, or <code>null</code>
-		 *                 if none is available. Ignored in this
-		 *                 implementation.
-		 * @param systemId The system identifier provided in the XML
-		 *                 document. Will not be <code>null</code>.
-		 */
-		public InputSource resolveEntity(String publicId,
-										 String systemId) {
-
-			//helperImpl.project.log("resolving systemId: " + systemId, Project.MSG_VERBOSE);
-
-			if (systemId.startsWith("file:")) { //$NON-NLS-1$
-				String path = systemId.substring(5);
-				int index = path.indexOf("file:"); //$NON-NLS-1$
-
-				// we only have to handle these for backward compatibility
-				// since they are in the FAQ.
-				while (index != -1) {
-					path = path.substring(0, index) + path.substring(index + 5);
-					index = path.indexOf("file:"); //$NON-NLS-1$
-				}
-
-				String entitySystemId = path;
-				index = path.indexOf("%23"); //$NON-NLS-1$
-				// convert these to #
-				while (index != -1) {
-					path = path.substring(0, index) + "#" + path.substring(index + 3); //$NON-NLS-1$
-					index = path.indexOf("%23"); //$NON-NLS-1$
-				}
-
-				File file = new File(path);
-				if (!file.isAbsolute()) {
-					file = new File(helperImpl.buildFileParent, path);
-				}
-
-				try {
-					InputSource inputSource = new InputSource(new FileInputStream(file));
-					inputSource.setSystemId("file:" + entitySystemId); //$NON-NLS-1$
-					return inputSource;
-				} catch (FileNotFoundException fne) {
-					//helperImpl.project.log(file.getAbsolutePath() + " could not be found",
-					  //          Project.MSG_WARN);
-				}
-			}
-			// use default if not file or file not found
-			return null;
-		}
-
-		/**
-		 * Handles the start of a project element. A project handler is created
-		 * and initialised with the element name and attributes.
-		 *
-		 * @param tag The name of the element being started.
-		 *            Will not be <code>null</code>.
-		 * @param attrs Attributes of the element being started.
-		 *              Will not be <code>null</code>.
-		 *
-		 * @exception SAXParseException if the tag given is not
-		 *                              <code>"project"</code>
-		 */
-		public void startElement(String tag, AttributeList attrs) throws SAXParseException {
-			if (tag.equals("project")) { //$NON-NLS-1$
-				new ProjectHandler(helperImpl, this).init(tag, attrs);
-			} else {
-				throw new SAXParseException(AntEditorUtilsMessages.getString("ProjectHelperImpl.Config_file_is_not_of_expected_XML_type_7"), helperImpl.locator); //$NON-NLS-1$
-			}
-		}
-
-		/**
-		 * Sets the locator in the project helper for future reference.
-		 *
-		 * @param locator The locator used by the parser.
-		 *                Will not be <code>null</code>.
-		 */
-		public void setDocumentLocator(Locator locator) {
-			helperImpl.locator = locator;
-		}
-	}
-	/**
-	 * Handler for "target" elements.
-	 */
-	static class TargetHandler extends AbstractHandler {
-		private Target target;
-
-		/**
-		 * Constructor which just delegates to the superconstructor.
-		 *
-		 * @param parentHandler The handler which should be restored to the
-		 *                      parser at the end of the element.
-		 *                      Must not be <code>null</code>.
-		 */
-		public TargetHandler(ProjectHelperImpl helperImpl, DocumentHandler parentHandler) {
-			super(helperImpl, parentHandler);
-		}
-
-		/**
-		 * Initialisation routine called after handler creation
-		 * with the element name and attributes. The attributes which
-		 * this handler can deal with are: <code>"name"</code>,
-		 * <code>"depends"</code>, <code>"if"</code>,
-		 * <code>"unless"</code>, <code>"id"</code> and
-		 * <code>"description"</code>.
-		 *
-		 * @param tag Name of the element which caused this handler
-		 *            to be created. Should not be <code>null</code>.
-		 *            Ignored in this implementation.
-		 * @param attrs Attributes of the element which caused this
-		 *              handler to be created. Must not be <code>null</code>.
-		 *
-		 * @exception SAXParseException if an unexpected attribute is encountered
-		 *            or if the <code>"name"</code> attribute is missing.
-		 */
-		public void init(String tag, AttributeList attrs) throws SAXParseException {
-			String name = null;
-			String depends = ""; //$NON-NLS-1$
-			String ifCond = null;
-			String unlessCond = null;
-			String id = null;
-			String description = null;
-
-			for (int i = 0; i < attrs.getLength(); i++) {
-				String key = attrs.getName(i);
-				String value = attrs.getValue(i);
-
-				if (key.equals("name")) { //$NON-NLS-1$
-					name = value;
-				} else if (key.equals("depends")) { //$NON-NLS-1$
-					depends = value;
-				} else if (key.equals("if")) { //$NON-NLS-1$
-					ifCond = value;
-				} else if (key.equals("unless")) { //$NON-NLS-1$
-					unlessCond = value;
-				} else if (key.equals("id")) { //$NON-NLS-1$
-					id = value;
-				} else if (key.equals("description")) { //$NON-NLS-1$
-					description = value;
-				} else {
-					throw new SAXParseException(MessageFormat.format(AntEditorUtilsMessages.getString("ProjectHelperImpl.Unexpected_attribute___{0}__8"), new String[]{key}), helperImpl.locator); //$NON-NLS-1$
-				}
-			}
-
-			if (name == null) {
-				throw new SAXParseException(AntEditorUtilsMessages.getString("ProjectHelperImpl.target_element_appears_without_a_name_attribute_9"), //$NON-NLS-1$
-											helperImpl.locator);
-			}
-
-			target = new Target();
-			target.setName(name);
-			target.setIf(ifCond);
-			target.setUnless(unlessCond);
-			target.setDescription(description);
-			helperImpl.project.addTarget(name, target);
-
-			if (id != null && !id.equals("")) { //$NON-NLS-1$
-				helperImpl.project.addReference(id, target);
-			}
-
-			// take care of dependencies
-
-			if (depends.length() > 0) {
-				target.setDepends(depends);
-			}
-		}
-
-		/**
-		 * Handles the start of an element within a target.
-		 *
-		 * @param name The name of the element being started.
-		 *            Will not be <code>null</code>.
-		 * @param attrs Attributes of the element being started.
-		 *              Will not be <code>null</code>.
-		 *
-		 * @exception SAXParseException if an error occurs when initialising
-		 *                              the appropriate child handler
-		 */
-		public void startElement(String name, AttributeList attrs) throws SAXParseException {
-			if (helperImpl.project.getDataTypeDefinitions().get(name) != null) {
-				new DataTypeHandler(helperImpl, this, target).init(name, attrs);
-			} else {
-				new TaskHandler(helperImpl, this, target, null, target).init(name, attrs);
-			}
-		}
-	}
-	/**
-	 * Handler for all task elements.
-	 */
-	static class TaskHandler extends AbstractHandler {
-		/** Containing target, if any. */
-		private Target target;
-		/**
-		 * Container for the task, if any. If target is
-		 * non-<code>null</code>, this must be too.
-		 */
-		private TaskContainer container;
-		/**
-		 * Task created by this handler.
-		 */
-		private Task task;
-		/**
-		 * Wrapper for the parent element, if any. The wrapper for this
-		 * element will be added to this wrapper as a child.
-		 */
-		private RuntimeConfigurable parentWrapper;
-		/**
-		 * Wrapper for this element which takes care of actually configuring
-		 * the element, if this element is contained within a target.
-		 * Otherwise the configuration is performed with the configure method.
-		 * @see ProjectHelper#configure(Object,AttributeList,Project)
-		 */
-		private RuntimeConfigurable wrapper = null;
-
-		/**
-		 * Constructor.
-		 *
-		 * @param parentHandler The handler which should be restored to the
-		 *                      parser at the end of the element.
-		 *                      Must not be <code>null</code>.
-		 *
-		 * @param container     Container for the element.
-		 *                      May be <code>null</code> if the target is
-		 *                      <code>null</code> as well. If the
-		 *                      target is <code>null</code>, this parameter
-		 *                      is effectively ignored.
-		 *
-		 * @param parentWrapper Wrapper for the parent element, if any.
-		 *                      May be <code>null</code>. If the
-		 *                      target is <code>null</code>, this parameter
-		 *                      is effectively ignored.
-		 *
-		 * @param target        Target this element is part of.
-		 *                      May be <code>null</code>.
-		 */
-		public TaskHandler(ProjectHelperImpl helperImpl, DocumentHandler parentHandler,
-						   TaskContainer container, RuntimeConfigurable parentWrapper, Target target) {
-			super(helperImpl, parentHandler);
-			this.container = container;
-			this.parentWrapper = parentWrapper;
-			this.target = target;
-		}
-
-		/**
-		 * Initialisation routine called after handler creation
-		 * with the element name and attributes. This configures
-		 * the element with its attributes and sets it up with
-		 * its parent container (if any). Nested elements are then
-		 * added later as the parser encounters them.
-		 *
-		 * @param tag Name of the element which caused this handler
-		 *            to be created. Must not be <code>null</code>.
-		 *
-		 * @param attrs Attributes of the element which caused this
-		 *              handler to be created. Must not be <code>null</code>.
-		 *
-		 * @exception SAXParseException in case of error (not thrown in
-		 *                              this implementation)
-		 */
-		public void init(String tag, AttributeList attrs) throws SAXParseException {
-			try {
-				task = helperImpl.project.createTask(tag);
-			} catch (BuildException e) {
-				// swallow here, will be thrown again in
-				// UnknownElement.maybeConfigure if the problem persists.
-			}
-
-			if (task == null) {
-				task = new UnknownElement(tag);
-				task.setProject(helperImpl.project);
-				//XXX task.setTaskType(tag);
-				task.setTaskName(tag);
-			}
-
-			task.setLocation(new Location(helperImpl.locator.getSystemId(), helperImpl.locator.getLineNumber(),
-										  helperImpl.locator.getColumnNumber()));
-			helperImpl.configureId(task, attrs);
-
-			// Top level tasks don't have associated targets
-			if (target != null) {
-				task.setOwningTarget(target);
-				container.addTask(task);
-				task.init();
-				wrapper = task.getRuntimeConfigurableWrapper();
-				wrapper.setAttributes(attrs);
-				if (parentWrapper != null) {
-					parentWrapper.addChild(wrapper);
-				}
-			} else {
-				task.init();
-				configure(task, attrs, helperImpl.project);
-			}
-		}
-
-		/**
-		 * Executes the task if it is a top-level one.
-		 */
-		protected void finished() {
-			if (task != null && target == null) {
-				task.execute();
-			}
-		}
-
-		/**
-		 * Adds text to the task, using the wrapper if one is
-		 * available (in other words if the task is within a target)
-		 * or using addText otherwise.
-		 *
-		 * @param buf A character array of the text within the element.
-		 *            Will not be <code>null</code>.
-		 * @param start The start element in the array.
-		 * @param count The number of characters to read from the array.
-		 *
-		 * @exception SAXParseException if the element doesn't support text
-		 *
-		 * @see ProjectHelper#addText(Project,Object,char[],int,int)
-		 */
-		public void characters(char[] buf, int start, int count) throws SAXParseException {
-			if (wrapper == null) {
-				try {
-					ProjectHelper.addText(helperImpl.project, task, buf, start, count);
-				} catch (BuildException exc) {
-					throw new SAXParseException(exc.getMessage(), helperImpl.locator, exc);
-				}
-			} else {
-				wrapper.addText(buf, start, count);
-			}
-		}
-
-		/**
-		 * Handles the start of an element within a target. Task containers
-		 * will always use another task handler, and all other tasks
-		 * will always use a nested element handler.
-		 *
-		 * @param name The name of the element being started.
-		 *            Will not be <code>null</code>.
-		 * @param attrs Attributes of the element being started.
-		 *              Will not be <code>null</code>.
-		 *
-		 * @exception SAXParseException if an error occurs when initialising
-		 *                              the appropriate child handler
-		 */
-		public void startElement(String name, AttributeList attrs) throws SAXParseException {
-			if (task instanceof TaskContainer) {
-				// task can contain other tasks - no other nested elements possible
-				new TaskHandler(helperImpl, this, (TaskContainer) task,
-					wrapper, target).init(name, attrs);
-			} else {
-				new NestedElementHandler(helperImpl, this, task,
-					wrapper, target).init(name, attrs);
-			}
-		}
-	}
-}
diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/xml/AntEditorXMLMessages.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/xml/AntEditorXMLMessages.java
deleted file mode 100644
index 2967f8b..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/xml/AntEditorXMLMessages.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.ui.internal.editor.xml;
-
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-public class AntEditorXMLMessages {
-
-	private static final String BUNDLE_NAME = "org.eclipse.ant.ui.internal.editor.xml.AntEditorXMLMessages"; //$NON-NLS-1$
-
-	private static final ResourceBundle RESOURCE_BUNDLE =
-		ResourceBundle.getBundle(BUNDLE_NAME);
-
-	private AntEditorXMLMessages() {
-	}
-
-	public static String getString(String key) {
-		try {
-			return RESOURCE_BUNDLE.getString(key);
-		} catch (MissingResourceException e) {
-			return '!' + key + '!';
-		}
-	}
-}
diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/xml/AntEditorXMLMessages.properties b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/xml/AntEditorXMLMessages.properties
deleted file mode 100644
index 5f99b34..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/xml/AntEditorXMLMessages.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2003 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Common Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/cpl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-XmlElement.XmlElement_cannot_be_added_as_a_child=XmlElement \'{0}\' cannot be added as a child, as it already is a child of \'{1}\'
-XmlElement.XmlElement_toString=XmlElement[name={0}; starting={1},{2}; ending={3},{4}]
diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/xml/IAntEditorConstants.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/xml/IAntEditorConstants.java
deleted file mode 100644
index e3d3557..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/xml/IAntEditorConstants.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.ui.internal.editor.xml;
-
-/**
- * Constants used by the Ant editor
- */
-public interface IAntEditorConstants {
-	
-	/**
-	 * Attributes stored in XmlElements
-	 */
-	public static final String ATTR_NAME= "name"; //$NON-NLS-1$
-	public static final String ATTR_DEFAULT= "default"; //$NON-NLS-1$
-	public static final String ATTR_RESOURCE= "resource"; //$NON-NLS-1$
-	public static final String ATTR_ENVIRONMENT= "environment"; //$NON-NLS-1$
-	public static final String ATTR_TARGET= "target"; //$NON-NLS-1$
-	public static final String ATTR_DIR= "dir"; //$NON-NLS-1$
-	public static final String ATTR_FILE= "file"; //$NON-NLS-1$
-	public static final String ATTR_DESTFILE= "destfile"; //$NON-NLS-1$
-	public static final String ATTR_SRC= "src"; //$NON-NLS-1$
-	public static final String ATTR_ZIPFILE= "zipfile"; //$NON-NLS-1$
-	public static final String ATTR_COMMAND= "command"; //$NON-NLS-1$
-	public static final String ATTR_EXECUTABLE= "executable"; //$NON-NLS-1$
-	public static final String ATTR_TYPE= "type"; //$NON-NLS-1$
-	public static final String ATTR_DESCRIPTION= "description"; //$NON-NLS-1$
-	/**
-	 * Values of the type attribute stored in XmlElements
-	 */
-	public static final String TYPE_EXTERNAL = "external"; //$NON-NLS-1$
-	public static final String TYPE_TARGET = "target"; //$NON-NLS-1$
-	public static final String TYPE_PROJECT = "project"; //$NON-NLS-1$
-	public static final String TYPE_PROPERTY = "property"; //$NON-NLS-1$
-	public static final String TYPE_ANTCALL = "antcall"; //$NON-NLS-1$
-	public static final String TYPE_MKDIR = "mkdir"; //$NON-NLS-1$
-	public static final String TYPE_COPY = "copy"; //$NON-NLS-1$
-	public static final String TYPE_ARCHIVE = "archive"; //$NON-NLS-1$
-	public static final String TYPE_DECOMPRESS = "decompress"; //$NON-NLS-1$
-	public static final String TYPE_COMPRESS = "compress"; //$NON-NLS-1$
-	public static final String TYPE_EXEC = "exec"; //$NON-NLS-1$
-	public static final String TYPE_DELETE = "delete"; //$NON-NLS-1$
-	public static final String TYPE_UNKNOWN = "unknown"; //$NON-NLS-1$
-
-}
diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/xml/XmlAttribute.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/xml/XmlAttribute.java
deleted file mode 100644
index b2c607d..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/xml/XmlAttribute.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2003 GEBIT Gesellschaft fuer EDV-Beratung
- * und Informatik-Technologien mbH, 
- * Berlin, Duesseldorf, Frankfurt (Germany) and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     GEBIT Gesellschaft fuer EDV-Beratung und Informatik-Technologien mbH - initial API and implementation
- * 	   IBM Corporation - bug 29148
- *******************************************************************************/
-
-package org.eclipse.ant.ui.internal.editor.xml;
-
-
-/**
- * General representation of an xml attribute.
- * <P>
- * Here an xml attribute is refered to as what is specified using like
- * '<... attribute="some value">' in an xml file.
- * 
- */
-public class XmlAttribute {
-
-    /**
-     * The attribute name.
-     */
-    protected String name;
-    
-    /**
-     * The attribute value.
-     */
-    protected String value;
-    
-    /**
-     * Creates an instance with the specified name and value.
-     */
-    public XmlAttribute(String aName, String aValue) {
-        name = aName;
-        value = aValue;
-    }
-
-    /**
-     * Returns the name.
-     */
-    public String getName() {
-        return name;
-    }
-
-    /**
-     * Returns the value.
-     */
-    public String getValue() {
-        return value;
-    }
-}
diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/xml/XmlElement.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/xml/XmlElement.java
deleted file mode 100644
index 762146d..0000000
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/ui/internal/editor/xml/XmlElement.java
+++ /dev/null
@@ -1,565 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2003 GEBIT Gesellschaft fuer EDV-Beratung
- * und Informatik-Technologien mbH, 
- * Berlin, Duesseldorf, Frankfurt (Germany) and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     GEBIT Gesellschaft fuer EDV-Beratung und Informatik-Technologien mbH - initial API and implementation
- * 	   IBM Corporation - bug fixes
- *******************************************************************************/
-
-package org.eclipse.ant.ui.internal.editor.xml;
-
-import java.io.File;
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.apache.xerces.util.URI;
-import org.apache.xerces.util.URI.MalformedURIException;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.ant.ui.internal.editor.AntEditorException;
-import org.eclipse.ant.ui.internal.model.AntUtil;
-
-/**
- * General representation of an xml element.
- * <P>
- * Here an xml element is refered to as what is specified using like
- * '<elementName>' in an xml file.
- * 
- */
-public class XmlElement implements IAdaptable {
-	
-	/*
-	 * (T)
-	 * Eventually extract an interface XmlSourceRange in respect to 
-	 * ISourceReference that contains the two methods getOffset and
-	 * getLength
-	 */
-	
-    
-	/**
-	 * The offset of the corresponding source.
-	 * @see #getOffset()
-	 */
-	protected int offset;
-	
-	
-	/**
-	 * The length of the corresponding source.
-	 * @see #getLength()
-	 */
-	protected int length;
-	
-	
-    /**
-     * The parent node.
-     */
-    protected XmlElement parent;
-    
-
-    /**
-     * The attributes.
-     */
-    protected List attributes = new ArrayList();
-
-
-    /**
-     * The child nodes.
-     */
-    protected List childNodes = new ArrayList();
-
-
-    /**
-     * The (tag-)name of the element.
-     */
-    protected String name;
-    
-    
-    /**
-     * The startingRow where the element begins at.
-     * <P>
-     * The first startingRow has the index '1'.
-     */
-    protected int startingRow;
-
-
-    /**
-     * The startingColumn where the element begins at.
-     * <P>
-     * The first startingColumn has the index '1'.
-     */
-    protected int startingColumn;
-
-
-    /**
-     * The row where the element ends at.
-     * <P>
-     * The first ending row has the index '1'.
-     */
-    protected int endingRow;
-
-
-    /**
-     * The column where the element ends at.
-     * <P>
-     * The first ending column has the index '1'.
-     * The ending column is actually the index on this line after '>'.
-     */
-    protected int endingColumn;
-
-	/**
-	 * Whether this element has been generated as part of an element hierarchy
-	 * this is not complete as a result of an error.
-	 */
-	private boolean isErrorNode;
-	
-	/**
-	 * The absolute file system path of the file this element is
-	 * defined within.
-	 */
-	private String filePath;
-	
-	/**
-	 * Whether this element has been generated from an external entity definition
-	 */
-	private boolean isExternal = false;
-	
-	/**
-	 * Whether this element is the root external element generated from an external entity definition
-	 */
-	private boolean isRootExternal = false;
-
-	/**
-	 * The unique (in the corresponding element tree) path of this element.
-	 */
-	private String fElementPath;
-	
-	/**
-	 * The (not necessarily unique) identifier of this element.
-	 */
-	private String fElementIdentifier;
-
-
-	/**
-     * Creates an instance with the specified name.
-     */
-    public XmlElement(String aName) {
-       name = aName;
-    }
-    
-    
-    /**
-     * Returns the name.
-     */
-    public String getName() {
-        return name;
-    }
-    
-    
-    /**
-     * Returns the name that is used for display in outline view.
-     * <P>
-     * The default implementation returns just the same as the method <code>getName()</code>.
-     * Override this method in your own subclass for special elements in order to provide a
-     * custom display name.
-     */
-    public String getDisplayName() {
-    	return getName();
-    }
-    
-    
-    /**
-     * Returns the child nodes.
-     */
-    public List getChildNodes() {
-        return childNodes;
-    }
-    
-    
-    /**
-     * Returns the parent XmlElement.
-     * 
-     * @return the parent or <code>null</code> if this element has no parent.
-     */
-    public XmlElement getParentNode() {
-        return parent;
-    }    
-    
-    
-    /**
-     * Adds the specified element as child.
-     * <P>
-     * The specified element will have this assigned as its parent.
-     * 
-     * @throws AntEditorException if the specified child element allready
-     * has a parent.
-     */
-    public void addChildNode(XmlElement aChildElement) {
-        if(aChildElement.getParentNode() != null) {
-            throw new AntEditorException(MessageFormat.format(AntEditorXMLMessages.getString("XmlElement.XmlElement_cannot_be_added_as_a_child"), new String[]{aChildElement.toString(), aChildElement.getParentNode().toString()})); //$NON-NLS-1$
-        }
-        aChildElement.parent = this;
-        childNodes.add(aChildElement);
-    }
-
-
-    /**
-     * Returns all attributes.
-     */
-    public List getAttributes() {
-        return attributes;
-    }   
-
-    
-    /**
-     * Adds the specified attribute.
-     */
-    public void addAttribute(XmlAttribute anAttribute) {
-        attributes.add(anAttribute);
-    }
-
-
-    /**
-     * Returns the attribute with the specified name or <code>null</code>,
-     * if non existing.
-     */
-    public XmlAttribute getAttributeNamed(String anAttributeName) {
-        for (Iterator i = attributes.iterator(); i.hasNext();) {
-            XmlAttribute anAttribute = (XmlAttribute) i.next();
-            if(anAttributeName.equals(anAttribute.name)) {
-                return anAttribute;
-            }
-        }
-        return null;
-    }
-
-
-    /**
-     * Returns the startingColumn.
-     * <P>
-     * The first column has the index '1'.
-     */
-    public int getStartingColumn() {
-        return startingColumn;
-    }
-
-
-    /**
-     * Returns the startingRow.
-     * <P>
-     * The first row has the index '1'.
-     */
-    public int getStartingRow() {
-        return startingRow;
-    }
-
-
-    /**
-     * Returns the endingRow.
-     * <P>
-     * The first row has the index '1'.
-     */
-    public int getEndingRow() {
-        return endingRow;
-    }
-
-
-    /**
-     * Sets the endingRow.
-     * <P>
-     * The first row has the index '1'.
-     */
-    public void setEndingRow(int endingRow) {
-        this.endingRow = endingRow;
-    }
-
-
-    /**
-     * Returns the ending column.
-     * <P>
-     * The first column has the index '1'.
-     * The ending column is actually the index right after '>' on the ending 
-     * line.
-     */
-    public int getEndingColumn() {
-        return endingColumn;
-    }
-
-	/**
-	 * Sets the absolute file system path of the file this element is defined
-	 * within.
-	 */
-	public void setFilePath(String path) {
-		URI uri= null;
-		try {
-			uri= new URI(path);
-		} catch (MalformedURIException e) {
-			filePath= path;
-			return;
-		}
-		filePath = new Path(new File(uri.getPath()).getAbsolutePath()).toString();
-	}
-	
-	/**
-	 * Returns the absolute file system path of the file this element is defined
-     * within.
-     */
-	public String getFilePath() {
-		return filePath;
-	}
-
-    /**
-     * Sets the endingColumn.
-     * <P>
-     * The first column has the index '1'.
-     * The ending column is actually the index right after '>' on the ending 
-     * line.
-     */
-    public void setEndingColumn(int endingColumn) {
-        this.endingColumn = endingColumn;
-    }
-
-
-    /**
-     * Sets the startingColumn.
-     * <P>
-     * The first column has the index '1'.
-     */
-    public void setStartingColumn(int startingColumn) {
-        this.startingColumn = startingColumn;
-    }
-
-
-    /**
-     * Sets the startingRow.
-     * <P>
-     * The first row has the index '1'.
-     */
-    public void setStartingRow(int startingRow) {
-        this.startingRow = startingRow;
-    }
-
-
-	/**
-	 * Returns the 0-based index of the first character of the source code for this element,
-	 * relative to the source buffer in which this element is contained.
-	 * 
-	 * @return the 0-based index of the first character of the source code for this element,
-	 * relative to the source buffer in which this element is contained
-	 */
-	public int getOffset() {
-		return offset;
-	}
-
-	
-	/**
-	 * Sets the offset.
-	 * 
-	 * @see #getOffset()
-	 */
-	public void setOffset(int anOffset) {
-		offset = anOffset;
-	}
-	
-
-	/**
-	 * Returns the number of characters of the source code for this element,
-	 * relative to the source buffer in which this element is contained.
-	 * 
-	 * @return the number of characters of the source code for this element,
-	 * relative to the source buffer in which this element is contained
-	 */
-    public int getLength() {
-        return length;
-    }
-    
-
-	/**
-	 * Sets the length.
-	 * 
-	 * @see #getLength()
-	 */
-	public void setLength(int aLength) {
-		length = aLength;
-	}
-
-
-	/**
-	 * Returns a string representation of this element.
-	 */
-	public String toString() {
-		return MessageFormat.format(AntEditorXMLMessages.getString("XmlElement.XmlElement_toString"), new String[]{name, Integer.toString(startingRow), Integer.toString(startingColumn), Integer.toString(endingRow), Integer.toString(endingColumn)}); //$NON-NLS-1$
-	}
-	
-	/**
-	 * Returns whether this element has been generated as part of an element
-	 * hierarchy this is not complete as a result of an error.
-	 */
-	public boolean isErrorNode() {
-		return isErrorNode;
-	}
-	
-	/**
-	 * Sets whether this element has been generated as part of an element
-	 * hierarchy this is not complete as a result of an error.
-	 */
-	public void setIsErrorNode(boolean isErrorNode) {
-		this.isErrorNode= isErrorNode;
-	}
-	/**
-	 * Returns whether this xml element is defined in an external entity.
-	 * 
-	 * @return boolean
-	 */
-	public boolean isExternal() {
-		return isExternal;
-	}
-
-	/**
-	 * Sets whether this xml element is defined in an external entity.
-	 */
-	public void setExternal(boolean isExternal) {
-		this.isExternal = isExternal;
-	}
-	
-	/**
-	 * Sets whether this xml element is the root external entity.
-	 */
-	public void setRootExternal(boolean isExternal) {
-		this.isRootExternal = isExternal;
-	}
-	
-	/**
-	 * Returns whether this xml element is the root external entity.
-	 */
-	public boolean isRootExternal() {
-		return isRootExternal;
-	}
-
-	public String getElementPath() {
-		if (fElementPath == null) {
-			StringBuffer buffer= new StringBuffer(getParentNode() != null ? getParentNode().getElementPath() : ""); //$NON-NLS-1$
-			buffer.append('/');
-			buffer.append(getElementIdentifier());
-			buffer.append('[');
-			buffer.append(getParentNode() != null ? getParentNode().getElementIndexOf(this) : 0);
-			buffer.append(']');
-			
-			fElementPath= buffer.toString();
-		}
-		return fElementPath;
-	}
-
-	private String getElementIdentifier() {
-		if (fElementIdentifier == null) {
-			StringBuffer buffer= escape(new StringBuffer(getName() != null ? getName() : ""), '\\', "$/[]\\"); //$NON-NLS-1$ //$NON-NLS-2$
-			buffer.append('$');
-			buffer.append(escape(new StringBuffer(getDisplayName() != null ? getDisplayName() : ""), '\\', "$/[]\\").toString()); //$NON-NLS-1$ //$NON-NLS-2$
-			
-			fElementIdentifier= buffer.toString();
-		}
-		return fElementIdentifier;
-	}
-
-	private StringBuffer escape(StringBuffer sb, char esc, String special) {
-		for (int i= 0; i < sb.length(); i++) {
-			if (special.indexOf(sb.charAt(i)) >= 0) {
-				sb.insert(i++, esc);
-			}
-		}
-
-		return sb;
-	}
-
-	private int getElementIndexOf(XmlElement child) {
-		if (getChildNodes() == null) {
-			return -1;
-		}
-		
-		int result= -1;
-		
-		Iterator iter= getChildNodes().iterator();
-		XmlElement current= null;
-		while (current != child && iter.hasNext()) {
-			current= (XmlElement) iter.next();
-			if (child.getElementIdentifier().equals(current.getElementIdentifier()))
-				result++;
-		}
-		
-		if (current != child) {
-			return -1;
-		}
-		
-		return result;
-	}
-
-	/*
-	 * @see java.lang.Object#equals(java.lang.Object)
-	 */
-	public boolean equals(Object o2) {
-		// prepared to be used in an IElementComparer, depends on http://dev.eclipse.org/bugs/show_bug.cgi?id=32254
-		Object o1= this;
-		
-		if (o1 == o2) {
-			return true;
-		}
-		if (o1 == null || o2 == null) {
-			return false;
-		}
-		if (!(o1 instanceof XmlElement || o2 instanceof XmlElement)) {
-			return o2.equals(o1);
-		}
-		if (!(o1 instanceof XmlElement && o2 instanceof XmlElement)) {
-			return false;
-		}
-		
-		XmlElement e1= (XmlElement) o1;
-		XmlElement e2= (XmlElement) o2;
-	
-		if (e1.getElementPath().equals(e2.getElementPath())) {
-			return true;
-		}
-
-		return false;
-	}
-
-	/*
-	 * @see java.lang.Object#hashCode()
-	 */
-	public int hashCode() {
-		// prepared to be used in an IElementComparer, depends on http://dev.eclipse.org/bugs/show_bug.cgi?id=32254
-		Object o1= this;
-
-		if (o1 == null) {
-			return 0;
-		}
-		if (!(o1 instanceof XmlElement)) {
-			return o1.hashCode();
-		}
-
-		XmlElement e1= (XmlElement) o1;
-		
-		return e1.getElementPath().hashCode();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
-	 */
-	public Object getAdapter(Class adapter) {
-		if (adapter == IResource.class) {
-			if (getFilePath() != null) {
-				return AntUtil.getFile(getFilePath());
-			}
-		}
-		return null;
-	}
-
-}
\ No newline at end of file
diff --git a/ant/org.eclipse.ant.ui/Ant Runner Support/org/eclipse/ant/ui/internal/antsupport/AntSupportMessages.java b/ant/org.eclipse.ant.ui/Ant Runner Support/org/eclipse/ant/ui/internal/antsupport/AntSupportMessages.java
deleted file mode 100644
index 35fa51f..0000000
--- a/ant/org.eclipse.ant.ui/Ant Runner Support/org/eclipse/ant/ui/internal/antsupport/AntSupportMessages.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.ui.internal.antsupport;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-public class AntSupportMessages {
-
-	private static final String BUNDLE_NAME = "org.eclipse.ant.ui.internal.antsupport.AntSupportMessages"; //$NON-NLS-1$
-
-	private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME);
-
-	private AntSupportMessages() {
-	}
-
-	public static String getString(String key) {
-		try {
-			return RESOURCE_BUNDLE.getString(key);
-		} catch (MissingResourceException e) {
-			return '!' + key + '!';
-		}
-	}
-}
diff --git a/ant/org.eclipse.ant.ui/Ant Runner Support/org/eclipse/ant/ui/internal/antsupport/AntSupportMessages.properties b/ant/org.eclipse.ant.ui/Ant Runner Support/org/eclipse/ant/ui/internal/antsupport/AntSupportMessages.properties
deleted file mode 100644
index b8e9d01..0000000
--- a/ant/org.eclipse.ant.ui/Ant Runner Support/org/eclipse/ant/ui/internal/antsupport/AntSupportMessages.properties
+++ /dev/null
@@ -1,22 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2003 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Common Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/cpl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-AntInputHandler.Ant_Input_Request_1=Ant Input Request
-AntInputHandler.Invalid_input_2=Invalid input
-AntInputHandler.Unable_to_respond_to_<input>_request_4=Unable to respond to <input> request
-
-AntProcessBuildLogger.BUILD_FAILED__{0}_1=BUILD FAILED: {0}
-AntProcessBuildLogger.Total_time=Total time: 
-AntProcessBuildLogger._minutes_2=\ minutes
-AntProcessBuildLogger._minute_3=\ minute
-AntProcessBuildLogger._seconds_4=\ seconds
-AntProcessBuildLogger._second_5=\ second
-AntProcessBuildLogger._milliseconds_6=\ milliseconds
diff --git a/ant/org.eclipse.ant.ui/Ant Runner Support/org/eclipse/ant/ui/internal/antsupport/inputhandler/AntInputHandler.java b/ant/org.eclipse.ant.ui/Ant Runner Support/org/eclipse/ant/ui/internal/antsupport/inputhandler/AntInputHandler.java
deleted file mode 100644
index 6f94baf..0000000
--- a/ant/org.eclipse.ant.ui/Ant Runner Support/org/eclipse/ant/ui/internal/antsupport/inputhandler/AntInputHandler.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.ui.internal.antsupport.inputhandler;
-
-
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.input.DefaultInputHandler;
-import org.apache.tools.ant.input.InputRequest;
-import org.eclipse.jface.dialogs.IInputValidator;
-import org.eclipse.jface.dialogs.InputDialog;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ant.ui.internal.antsupport.AntSupportMessages;
-
-/**
- * The default input handler when using Ant within Eclipse.
- * This is the class that will respond to <input> requests from
- * within an Ant build file.
- */
-public class AntInputHandler extends DefaultInputHandler {
-	
-	/**
-	 * @see org.apache.tools.ant.input.InputHandler#handleInput(org.apache.tools.ant.input.InputRequest)
-	 */
-	public void handleInput(InputRequest request) throws BuildException {
-		BuildException[] problem= new BuildException[1];
-		Runnable runnable= getHandleInputRunnable(request, problem);
-		Display.getDefault().syncExec(runnable);
-		if (problem[0] != null) {
-			throw problem[0];
-		}
-	}
-	
-	protected Runnable getHandleInputRunnable(final InputRequest request, final BuildException[] problem) {
-		return new Runnable() {
-			public void run() {
-				String prompt = getPrompt(request);
-		       	String title= AntSupportMessages.getString("AntInputHandler.Ant_Input_Request_1"); //$NON-NLS-1$
-				IInputValidator validator= new IInputValidator() {
-					int hitCount= -1;
-					public String isValid(String value) {
-						request.setInput(value);
-						if (request.isInputValid()) {
-							return null;
-						} else {
-							return AntSupportMessages.getString("AntInputHandler.Invalid_input_2"); //$NON-NLS-1$
-						}
-					}
-				};
-		
-				InputDialog dialog= new InputDialog(null, title, prompt, "", validator); //$NON-NLS-1$
-				if (dialog.open() != InputDialog.OK) {
-					problem[0]= new BuildException(AntSupportMessages.getString("AntInputHandler.Unable_to_respond_to_<input>_request_4")); //$NON-NLS-1$
-				}
-			}
-		};
-	}
-}
diff --git a/ant/org.eclipse.ant.ui/Ant Runner Support/org/eclipse/ant/ui/internal/antsupport/logger/AntProcessBuildLogger.java b/ant/org.eclipse.ant.ui/Ant Runner Support/org/eclipse/ant/ui/internal/antsupport/logger/AntProcessBuildLogger.java
deleted file mode 100644
index 87298e1..0000000
--- a/ant/org.eclipse.ant.ui/Ant Runner Support/org/eclipse/ant/ui/internal/antsupport/logger/AntProcessBuildLogger.java
+++ /dev/null
@@ -1,344 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Matt Conway - Patch for Bug 28052
- *******************************************************************************/
-
-package org.eclipse.ant.ui.internal.antsupport.logger;
-
-import java.io.File;
-import java.text.MessageFormat;
-
-import org.apache.tools.ant.BuildEvent;
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Location;
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.Task;
-import org.apache.tools.ant.util.FileUtils;
-import org.eclipse.ant.core.AntSecurityException;
-import org.eclipse.ant.ui.internal.launchConfigurations.AntProcess;
-import org.eclipse.ant.ui.internal.launchConfigurations.AntStreamMonitor;
-import org.eclipse.ant.ui.internal.launchConfigurations.AntStreamsProxy;
-import org.eclipse.ant.ui.internal.launchConfigurations.TaskLinkManager;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.debug.core.DebugPlugin;
-import org.eclipse.debug.core.model.IProcess;
-import org.eclipse.debug.ui.console.FileLink;
-import org.eclipse.debug.ui.console.IConsoleHyperlink;
-import org.eclipse.jface.text.Region;
-import org.eclipse.ant.ui.internal.antsupport.AntSupportMessages;
-	
-/**
- */
-public class AntProcessBuildLogger extends NullBuildLogger {
-	
-	private File fBuildFileParent= null;
-	private long fStartTime;
-	
-	/**
-	 * Size of left-hand column for right-justified task name.
-	 * @see #logMessage(String, BuildEvent, -1)
-	  */
-	public static final int LEFT_COLUMN_SIZE = 15;
-
-	/**
-	 * Associated process - discovered as needed to log messages
-	 */
-	private AntProcess fProcess = null;
-	
-	protected void logMessage(String message, BuildEvent event, int overridePriority) {
-		int priority= overridePriority;
-		if (priority == -1) {
-			priority= event.getPriority();
-		} 
-		
-		if (priority > getMessageOutputLevel()) {
-			return;
-		}
-		AntProcess antProcess = getAntProcess(event.getProject().getUserProperty(AntProcess.ATTR_ANT_PROCESS_ID));
-		if (antProcess == null) {
-			return;
-		}
-		
-		AntStreamMonitor monitor = getMonitor(priority);
-		
-		if (event.getTarget() == null) {
-			// look for "Buildfile:" message
-			if (message.startsWith("Buildfile:")) { //$NON-NLS-1$
-				String fileName = message.substring(10).trim();
-				IFile file = getFileForLocation(fileName);
-				if (file != null) {
-					FileLink link = new FileLink(file, null,  -1, -1, -1);
-					TaskLinkManager.addTaskHyperlink(fProcess, link, new Region(11 + System.getProperty("line.separator").length(), fileName.length()), fileName); //$NON-NLS-1$
-					fBuildFileParent= file.getLocation().toFile().getParentFile();
-				}
-			}
-		}
-		
-		StringBuffer fullMessage= new StringBuffer(System.getProperty("line.separator")); //$NON-NLS-1$
-		
-		if (event.getTask() != null && !fEmacsMode) {
-			getAdornedMessage(event, fullMessage);
-		}
-		fullMessage.append(message);
-		message= fullMessage.toString();
-		
-		monitor.append(message);
-		logMessageToLogFile(message, priority);
-		
-	}
-
-	/**
-	 * Builds a right justified task prefix for the given build event, placing it
-	 * in the given string buffer. Creates a hyperlink for the task prefix. 
-	 *  
-	 * @param event build event
-	 * @param fullMessage buffer to place task prefix in
-	 */
-	private void getAdornedMessage(BuildEvent event, StringBuffer fullMessage) {
-		String name = event.getTask().getTaskName();
-		if (name == null) {
-			name = "null"; //$NON-NLS-1$
-		}
-		int size = LEFT_COLUMN_SIZE - (name.length() + 3);
-		for (int i = 0; i < size; i++) {
-			fullMessage.append(' ');
-		}
-		fullMessage.append('[');
-		fullMessage.append(name);
-		fullMessage.append("] "); //$NON-NLS-1$
-		int offset = Math.max(size, 0) + 1;
-		int length = LEFT_COLUMN_SIZE - size - 3;
-		IConsoleHyperlink taskLink = getTaskLink(event);
-		if (taskLink != null) {
-			TaskLinkManager.addTaskHyperlink(fProcess, taskLink, new Region(offset, length), name);
-		}
-	}
-
-	private AntStreamMonitor getMonitor(int priority) {
-		AntStreamsProxy proxy = (AntStreamsProxy)fProcess.getStreamsProxy();
-		AntStreamMonitor monitor = null;
-		switch (priority) {
-			case Project.MSG_INFO:
-				monitor = (AntStreamMonitor)proxy.getOutputStreamMonitor();
-				break;
-			case Project.MSG_ERR:
-				monitor = (AntStreamMonitor)proxy.getErrorStreamMonitor();
-				break;
-			case Project.MSG_DEBUG:
-				monitor = (AntStreamMonitor)proxy.getDebugStreamMonitor();
-				break;
-			case Project.MSG_WARN:
-				monitor = (AntStreamMonitor)proxy.getWarningStreamMonitor();
-				break;
-			case Project.MSG_VERBOSE:
-				monitor = (AntStreamMonitor)proxy.getVerboseStreamMonitor();
-				break;
-		}
-		return monitor;
-	}
-
-	private void logMessageToLogFile(String message, int priority) {
-		if (priority == Project.MSG_ERR) {
-			if (getErrorPrintStream() != null && getErrorPrintStream() != System.err) {
-				//user has designated to log to a logfile
-				getErrorPrintStream().println(message);
-			}
-		} else {
-			if (getOutputPrintStream() != null && getOutputPrintStream() != System.out) {
-				//user has designated to log to a logfile
-				getOutputPrintStream().println(message);
-			}
-		}
-	}
-	
-	/**
-	 * Returns a hyperlink for the given task, or <code>null</code> if unable to
-	 * parse a valid location for the task. The link is set to exist at the specified
-	 * offset and length.
-	 * 
-	 * @return hyper link, or <code>null</code>
-	 */
-	private IConsoleHyperlink getTaskLink(BuildEvent event) {
-		Task task = event.getTask();
-		if (task != null) {
-			Location location = task.getLocation();
-			if (location != null) {
-				String path = location.toString().trim();
-				if (path.length() == 0) {
-					return null;
-				}
-				if (path.startsWith("file:")) { //$NON-NLS-1$
-					// remove "file:"
-					path= path.substring(5, path.length());
-				}
-				// format is file:F:L: where F is file path, and L is line number
-				int index = path.lastIndexOf(':');
-				if (index == path.length() - 1) {
-					// remove trailing ':'
-					path = path.substring(0, index);
-					index = path.lastIndexOf(':');
-				}
-				// split file and line number
-				String fileName = path.substring(0, index);
-				IFile file = getFileForLocation(fileName);
-				if (file != null) {
-					try {
-						String lineNumber = path.substring(index + 1);
-						int line = Integer.parseInt(lineNumber);
-						return new FileLink(file, null, -1, -1, line);
-					} catch (NumberFormatException e) {
-					}
-				}
-			}
-		}
-		return null;
-	}	
-	
-	/**
-	 * Returns the associated Ant process, finding it if necessary, if not
-	 * already found.
-	 */
-	private AntProcess getAntProcess(String processId) {
-		if (fProcess == null && processId != null) {
-			IProcess[] all = DebugPlugin.getDefault().getLaunchManager().getProcesses();
-			for (int i = 0; i < all.length; i++) {
-				IProcess process = all[i];
-				if (process instanceof AntProcess && processId.equals(process.getAttribute(AntProcess.ATTR_ANT_PROCESS_ID))) {
-					fProcess = (AntProcess)process;
-					break;
-				}
-			}
-		}
-		return fProcess;
-	}
-
-	/**
-	 * Set the start time.
-	 * 
-	 * @see org.apache.tools.ant.BuildListener#buildStarted(org.apache.tools.ant.BuildEvent)
-	 */
-	public void buildStarted(BuildEvent event) {
-		fStartTime= System.currentTimeMillis();
-	}
-	
-	/**
-	 * @see org.apache.tools.ant.BuildListener#buildFinished(org.apache.tools.
-	 * ant.BuildEvent)
-	 */
-	public void buildFinished(BuildEvent event) {
-		handleException(event);
-		fHandledException= null;
-		fBuildFileParent= null;
-		logMessage(getTimeString(System.currentTimeMillis() - fStartTime), event, fMessageOutputLevel);
-		fProcess= null;
-		event.getProject().removeBuildListener(this);
-	}
-	
-	private String getTimeString(long milliseconds) {
-			long seconds = milliseconds / 1000;
-			long minutes = seconds / 60;
-			seconds= seconds % 60;
-		
-			StringBuffer result= new StringBuffer(AntSupportMessages.getString("AntProcessBuildLogger.Total_time")); //$NON-NLS-1$
-			if (minutes > 0) {
-				result.append(minutes);
-				if (minutes > 1) {
-					result.append(AntSupportMessages.getString("AntProcessBuildLogger._minutes_2")); //$NON-NLS-1$
-				} else {
-					result.append(AntSupportMessages.getString("AntProcessBuildLogger._minute_3")); //$NON-NLS-1$
-				}
-			}
-			if (seconds > 0) {
-				if (minutes > 0) {
-					result.append(' ');
-				}
-				result.append(seconds);
-			
-				if (seconds > 1) {
-					result.append(AntSupportMessages.getString("AntProcessBuildLogger._seconds_4")); //$NON-NLS-1$
-				} else {
-					result.append(AntSupportMessages.getString("AntProcessBuildLogger._second_5")); //$NON-NLS-1$
-				} 
-			}
-			if (seconds == 0 && minutes == 0) {
-				result.append(milliseconds);
-				result.append(AntSupportMessages.getString("AntProcessBuildLogger._milliseconds_6"));		 //$NON-NLS-1$
-			}
-			return result.toString();
-		}
-	
-	/**
-	 * @see BuildListener#messageLogged(BuildEvent)
-	 */
-	public void messageLogged(BuildEvent event) {
-		logMessage(event.getMessage(), event, -1);
-	}
-	
-	protected void handleException(BuildEvent event) {
-		Throwable exception = event.getException();
-		if (exception == null || exception == fHandledException
-		|| exception instanceof OperationCanceledException
-		|| exception instanceof AntSecurityException) {
-			return;
-		}
-		fHandledException= exception;
-		logMessage(MessageFormat.format(AntSupportMessages.getString("AntProcessBuildLogger.BUILD_FAILED__{0}_1"), new String[] { exception.toString()}), //$NON-NLS-1$
-					event, Project.MSG_ERR);	
-	}
-
-	/**
-	 * @see org.apache.tools.ant.BuildListener#targetStarted(org.apache.tools.ant.BuildEvent)
-	 */
-	public void targetStarted(BuildEvent event) {
-		if (Project.MSG_INFO > getMessageOutputLevel()) {
-			return;
-		}
-		StringBuffer msg= new StringBuffer(System.getProperty("line.separator")); //$NON-NLS-1$
-		msg.append(event.getTarget().getName());
-		msg.append(':');
-		logMessage(msg.toString(), event, Project.MSG_INFO);
-	}
-
-	/**
-	 * Returns the workspace file associated with the given absolute path in the
-	 * local file system, or <code>null</code> if none.
-	 *   
-	 * @param absolutePath
-	 * @return file or <code>null</code>
-	 */
-	private IFile getFileForLocation(String absolutePath) {
-		IPath filePath= new Path(absolutePath);
-		IFile file = ResourcesPlugin.getWorkspace().getRoot().getFileForLocation(filePath);
-		if (file == null) {
-			//relative path
-			File relativeFile= null;
-			try {
-				//this call is ok if fBuildFileParent is null
-				relativeFile= FileUtils.newFileUtils().resolveFile(fBuildFileParent, absolutePath);
-				filePath= new Path(relativeFile.getAbsolutePath());
-				file = ResourcesPlugin.getWorkspace().getRoot().getFileForLocation(filePath);
-				if (file == null) {
-					return null;
-				}
-			} catch (BuildException be) {
-				return null;
-			}
-		}
-		
-		if (file.exists()) {
-			return file;
-		}
-		return null;
-	}
-}
diff --git a/ant/org.eclipse.ant.ui/Ant Runner Support/org/eclipse/ant/ui/internal/antsupport/logger/NullBuildLogger.java b/ant/org.eclipse.ant.ui/Ant Runner Support/org/eclipse/ant/ui/internal/antsupport/logger/NullBuildLogger.java
deleted file mode 100644
index db55ab4..0000000
--- a/ant/org.eclipse.ant.ui/Ant Runner Support/org/eclipse/ant/ui/internal/antsupport/logger/NullBuildLogger.java
+++ /dev/null
@@ -1,165 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.ui.internal.antsupport.logger;
-
-
-import java.io.PrintStream;
-import java.text.MessageFormat;
-
-import org.apache.tools.ant.BuildEvent;
-import org.apache.tools.ant.BuildLogger;
-import org.apache.tools.ant.Project;
-import org.eclipse.ant.core.AntSecurityException;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.ant.ui.internal.antsupport.AntSupportMessages;
-
-public class NullBuildLogger implements BuildLogger {
-
-	protected int fMessageOutputLevel = Project.MSG_INFO;
-	private PrintStream fErr= null;
-	private PrintStream fOut= null;
-	protected boolean fEmacsMode= false;
-	
-	/**
-	 * An exception that has already been logged.
-	 */
-	protected Throwable fHandledException= null;
-	
-	/**
-	 * @see org.apache.tools.ant.BuildLogger#setMessageOutputLevel(int)
-	 */
-	public void setMessageOutputLevel(int level) {
-		fMessageOutputLevel= level;
-	}
-	
-	protected int getMessageOutputLevel() {
-		return fMessageOutputLevel;
-	}
-
-	/**
-	 * @see org.apache.tools.ant.BuildLogger#setEmacsMode(boolean)
-	 */
-	public void setEmacsMode(boolean emacsMode) {
-		fEmacsMode= emacsMode;
-	}
-
-	/**
-	 * @see org.apache.tools.ant.BuildListener#buildStarted(org.apache.tools.ant.BuildEvent)
-	 */
-	public void buildStarted(BuildEvent event) {
-	}
-
-	/**
-	 * @see org.apache.tools.ant.BuildListener#buildFinished(org.apache.tools.ant.BuildEvent)
-	 */
-	public void buildFinished(BuildEvent event) {
-		handleException(event);
-		fHandledException= null;
-	}
-
-	/**
-	 * @see org.apache.tools.ant.BuildListener#targetStarted(org.apache.tools.ant.BuildEvent)
-	 */
-	public void targetStarted(BuildEvent event) {
-	}
-
-	/**
-	 * @see org.apache.tools.ant.BuildListener#targetFinished(org.apache.tools.ant.BuildEvent)
-	 */
-	public void targetFinished(BuildEvent event) {
-		handleException(event);
-	}
-
-	/**
-	 * @see org.apache.tools.ant.BuildListener#taskStarted(org.apache.tools.ant.BuildEvent)
-	 */
-	public void taskStarted(BuildEvent event) {
-	}
-
-	/**
-	 * @see org.apache.tools.ant.BuildListener#taskFinished(org.apache.tools.ant.BuildEvent)
-	 */
-	public void taskFinished(BuildEvent event) {
-		handleException(event);
-	}
-
-	/**
-	 * @see BuildListener#messageLogged(BuildEvent)
-	 */
-	public void messageLogged(BuildEvent event) {
-		logMessage(event.getMessage(), event.getPriority());
-	}
-
-	protected PrintStream getErrorPrintStream() {
-		return fErr;
-	}
-	
-	protected PrintStream getOutputPrintStream() {
-		return fOut;
-	}
-	
-	/**
-	 * @see org.apache.tools.ant.BuildLogger#setErrorPrintStream(java.io.PrintStream)
-	 */
-	public void setErrorPrintStream(PrintStream err) {
-		//this build logger logs to "null" unless
-		//the user has explicitly set a logfile to use
-		if (err == System.err) {
-			fErr= null;
-		} else {
-			fErr= err;
-		}
-	}
-
-	/**
-	 * @see org.apache.tools.ant.BuildLogger#setOutputPrintStream(java.io.PrintStream)
-	 */
-	public void setOutputPrintStream(PrintStream output) {
-		//this build logger logs to "null" unless
-		//the user has explicitly set a logfile to use
-		if (output == System.out) {
-			fOut= null;
-		} else {
-			fOut= output;
-		}
-	}
-	
-	protected void logMessage(String message, int priority) {
-		if (priority > getMessageOutputLevel()) {
-			return;
-		}
-		
-		if (priority == Project.MSG_ERR) {
-			if (getErrorPrintStream() != null && getErrorPrintStream() != System.err) {
-				//user has designated to log to a logfile
-				getErrorPrintStream().println(message);
-			}
-		} else {
-			if (getOutputPrintStream() != null && getOutputPrintStream() != System.out) {
-				//user has designated to log to a logfile
-				getOutputPrintStream().println(message);
-			} 
-		}
-	}
-	
-	protected void handleException(BuildEvent event) {
-		Throwable exception = event.getException();
-		if (exception == null || exception == fHandledException
-		|| exception instanceof OperationCanceledException
-		|| exception instanceof AntSecurityException) {
-			return;
-		}
-		fHandledException= exception;
-		logMessage(MessageFormat.format(AntSupportMessages.getString("AntProcessBuildLogger.BUILD_FAILED__{0}_1"),  //$NON-NLS-1$
-					new String[] { exception.toString()}),
-					Project.MSG_ERR);	
-	}
-}
diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/console/BuildFailedTracker.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/console/BuildFailedTracker.java
deleted file mode 100644
index 3ea6e4d..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/console/BuildFailedTracker.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.ui.internal.console;
-
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.debug.ui.console.FileLink;
-import org.eclipse.debug.ui.console.IConsole;
-import org.eclipse.debug.ui.console.IConsoleLineTracker;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.ui.externaltools.internal.model.StringMatcher;
-
-/**
- * Generates hyperlinks for build failures resulting from XML syntax errors
- */
-public class BuildFailedTracker implements IConsoleLineTracker {
-	
-	private IConsole fConsole;
-	private StringMatcher fErrorMatcher;
-	
-	/**
-	 * @see org.eclipse.debug.ui.console.IConsoleLineTracker#init(org.eclipse.debug.ui.console.IConsole)
-	 */
-	public void init(IConsole console) {
-		fConsole = console;
-		//BUILD FAILED: file:c:/1115/test/buildFiles/23638.xml:12:
-		fErrorMatcher = new StringMatcher("*BUILD FAILED: file:*.xml*",false, false); //$NON-NLS-1$
-	}
-
-	/**
-	 * @see org.eclipse.debug.ui.console.IConsoleLineTracker#lineAppended(org.eclipse.jface.text.IRegion)
-	 */
-	public void lineAppended(IRegion line) {
-		try {
-			int lineOffset = line.getOffset();
-			int lineLength = line.getLength();
-			String text = fConsole.getDocument().get(lineOffset, lineLength);
-			String fileName = null;
-			String lineNumber = ""; //$NON-NLS-1$
-			int fileStart = -1;
-			if (fErrorMatcher.match(text)) {
-				int index = text.indexOf("file:"); //$NON-NLS-1$
-				if (index > 0) {
-					fileStart = index + 5;
-					index = text.indexOf(' ', index); //$NON-NLS-1$
-					if (index > 0) {
-						int fileEnd = index-3;
-						int numberStart = index - 2;
-						index = text.indexOf(':', numberStart);
-						if (index > 0) {
-							int numberEnd = index;
-							fileName = text.substring(fileStart, fileEnd).trim();
-							lineNumber = text.substring(numberStart, numberEnd).trim();
-						}
-					}
-				}
-			} 
-			if (fileName != null) {
-				int num = -1;
-				try {
-					num = Integer.parseInt(lineNumber);
-				} catch (NumberFormatException e) {
-				}
-				IFile file = ResourcesPlugin.getWorkspace().getRoot().getFileForLocation(new Path(fileName));
-				if (file != null && file.exists()) {
-					FileLink link = new FileLink(file, null, -1, -1, num);
-					fConsole.addLink(link, lineOffset + fileStart, lineLength - fileStart);
-				}
-			}
-		} catch (BadLocationException e) {
-		}
-	}
-
-	/**
-	 * @see org.eclipse.debug.ui.console.IConsoleLineTracker#dispose()
-	 */
-	public void dispose() {
-		fConsole = null;
-	}
-
-}
diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/console/JavacLineTracker.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/console/JavacLineTracker.java
deleted file mode 100644
index 27d932a..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/console/JavacLineTracker.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.ui.internal.console;
-
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.debug.ui.console.FileLink;
-import org.eclipse.debug.ui.console.IConsole;
-import org.eclipse.debug.ui.console.IConsoleLineTracker;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.ui.externaltools.internal.model.StringMatcher;
-
-/**
- * Generates hyperlinks for javac output
- */
-public class JavacLineTracker implements IConsoleLineTracker {
-	
-	private IConsole fConsole;
-	private IFile fLastFile;
-	private StringMatcher fEclipseCompilerMatcher;
-	private StringMatcher fJavacMatcher;
-	private StringMatcher fJikesMatcher;
-	
-	// trolling for errors after a Jikes error header was found
-	private boolean fTrolling = false;
-
-	/**
-	 * Constructor for JavacLineTracker.
-	 */
-	public JavacLineTracker() {
-		super();
-	}
-
-	/**
-	 * @see org.eclipse.debug.ui.console.IConsoleLineTracker#init(org.eclipse.debug.ui.console.IConsole)
-	 */
-	public void init(IConsole console) {
-		fConsole = console;
-		fEclipseCompilerMatcher = new StringMatcher("*[javac]*ERROR in*.java*(at line*)*",false, false); //$NON-NLS-1$
-		fJavacMatcher = new StringMatcher("*[javac] *.java:*:*",false, false); //$NON-NLS-1$
-		fJikesMatcher = new StringMatcher("*[javac] *\"*.java\":", false, false); //$NON-NLS-1$
-	}
-
-	/**
-	 * @see org.eclipse.debug.ui.console.IConsoleLineTracker#lineAppended(org.eclipse.jface.text.IRegion)
-	 */
-	public void lineAppended(IRegion line) {
-		try {
-			int lineOffset = line.getOffset();
-			int lineLength = line.getLength();
-			String text = fConsole.getDocument().get(lineOffset, lineLength);
-			String fileName = null;
-			String lineNumber = ""; //$NON-NLS-1$
-			int fileStart = -1;
-			if (fEclipseCompilerMatcher.match(text)) {
-				fTrolling = false;
-				int index = text.indexOf("ERROR in"); //$NON-NLS-1$
-				if (index > 0) {
-					fileStart = index + 9;
-					index = text.lastIndexOf("(at line "); //$NON-NLS-1$
-					if (index > 0) {
-						int fileEnd = index - 1;
-						int numberStart = index + 9;
-						index = text.lastIndexOf(')');
-						if (index > 0) {
-							int numberEnd = index;
-							fileName = text.substring(fileStart, fileEnd).trim();
-							lineNumber = text.substring(numberStart, numberEnd).trim();
-						}
-					}
-				}
-			} else if (fJavacMatcher.match(text)) {
-				fTrolling = false;
-				fileStart = text.indexOf("[javac] "); //$NON-NLS-1$
-				fileStart += 8;
-				int index = text.indexOf(".java:", fileStart); //$NON-NLS-1$
-				if (index > 0) {
-					int numberStart = index + 6;
-					fileName = text.substring(fileStart, numberStart - 1).trim();
-					index = text.indexOf(":", numberStart); //$NON-NLS-1$
-					if (index > numberStart) {
-						lineNumber = text.substring(numberStart, index);
-					}
-				}
-			} else if (fJikesMatcher.match(text)) {
-				fileStart = text.indexOf('"');
-				fileStart++;
-				int index = text.indexOf(".java\"", fileStart); //$NON-NLS-1$
-				if (index > 0) {
-					index += 5;
-					fileName = text.substring(fileStart, index).trim();
-					fTrolling = true;
-				}
-			} else if (fTrolling) {
-				int index = text.indexOf("[javac]"); //$NON-NLS-1$
-				if (index > 0) {
-					// look for a line number
-					index+=7; 
-					int numEnd = text.indexOf(".", index); //$NON-NLS-1$
-					if (numEnd > 0) {
-						String number = text.substring(index, numEnd).trim();
-						try {
-							int num = Integer.parseInt(number);
-							int numStart = text.indexOf(number, index);
-							if (fLastFile != null && fLastFile.exists()) {
-								FileLink link = new FileLink(fLastFile, null, -1, -1, num);
-								fConsole.addLink(link, lineOffset + numStart, lineLength - numStart);
-							}
-						} catch (NumberFormatException e) {
-							// not a line number
-						}
-					}
-				} else {
-					fTrolling = false;
-				}
-			}
-			if (fileName != null) {
-				int num = -1;
-				try {
-					num = Integer.parseInt(lineNumber);
-				} catch (NumberFormatException e) {
-				}
-				IFile file = ResourcesPlugin.getWorkspace().getRoot().getFileForLocation(new Path(fileName));
-				fLastFile = file;
-				if (file != null && file.exists()) {
-					FileLink link = new FileLink(file, null, -1, -1, num);
-					fConsole.addLink(link, lineOffset + fileStart, lineLength - fileStart);
-				}
-			}
-		} catch (BadLocationException e) {
-		}
-	}
-
-	/**
-	 * @see org.eclipse.debug.ui.console.IConsoleLineTracker#dispose()
-	 */
-	public void dispose() {
-		fConsole = null;
-	}
-
-}
diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/console/TaskLineTracker.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/console/TaskLineTracker.java
deleted file mode 100644
index f209960..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/console/TaskLineTracker.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.ui.internal.console;
- 
-import org.eclipse.ant.ui.internal.launchConfigurations.TaskLinkManager;
-import org.eclipse.debug.ui.console.IConsole;
-import org.eclipse.debug.ui.console.IConsoleLineTracker;
-import org.eclipse.jface.text.IRegion;
-
-/**
- * Processes task hyperlinks as lines are appended to the console
- */
-public class TaskLineTracker implements IConsoleLineTracker {
-	
-	private IConsole fConsole;
-
-	/**
-	 * Constructor for TaskLineTracker.
-	 */
-	public TaskLineTracker() {
-		super();
-	}
-
-	/**
-	 * @see org.eclipse.debug.ui.console.IConsoleLineTracker#init(org.eclipse.debug.ui.console.IConsole)
-	 */
-	public void init(IConsole console) {
-		fConsole = console;
-	}
-
-	/**
-	 * @see org.eclipse.debug.ui.console.IConsoleLineTracker#lineAppended(org.eclipse.jface.text.IRegion)
-	 */
-	public void lineAppended(IRegion line) {
-		TaskLinkManager.processNewLine(fConsole, line);
-	}
-
-	/**
-	 * @see org.eclipse.debug.ui.console.IConsoleLineTracker#dispose()
-	 */
-	public void dispose() {
-		TaskLinkManager.dispose(fConsole.getProcess());
-		fConsole = null;
-	}
-}
diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/launchConfigurations/AntBuilderTabGroup.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/launchConfigurations/AntBuilderTabGroup.java
deleted file mode 100644
index 1d3068f..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/launchConfigurations/AntBuilderTabGroup.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.ui.internal.launchConfigurations;
-
-import org.eclipse.debug.ui.AbstractLaunchConfigurationTabGroup;
-import org.eclipse.debug.ui.ILaunchConfigurationDialog;
-import org.eclipse.debug.ui.ILaunchConfigurationTab;
-import org.eclipse.debug.ui.launchVariables.RefreshTab;
-import org.eclipse.ui.externaltools.internal.launchConfigurations.ExternalToolsBuilderTab;
-
-public class AntBuilderTabGroup extends AbstractLaunchConfigurationTabGroup {
-
-	/**
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTabGroup#createTabs(org.eclipse.debug.ui.ILaunchConfigurationDialog, java.lang.String)
-	 */
-	public void createTabs(ILaunchConfigurationDialog dialog, String mode) {
-		ILaunchConfigurationTab[] tabs = new ILaunchConfigurationTab[] {
-			new AntMainTab(false),
-			new RefreshTab(),
-			new AntTargetsTab(),
-			new AntPropertiesTab(),
-			new ExternalToolsBuilderTab(),
-		};
-		setTabs(tabs);
-	}
-
-}
diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/launchConfigurations/AntClasspathProvider.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/launchConfigurations/AntClasspathProvider.java
deleted file mode 100644
index 2f1157a..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/launchConfigurations/AntClasspathProvider.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ant.ui.internal.launchConfigurations;
-
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.eclipse.ant.core.AntCorePlugin;
-import org.eclipse.ant.core.AntCorePreferences;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.jdt.launching.IRuntimeClasspathEntry;
-import org.eclipse.jdt.launching.IRuntimeClasspathProvider;
-import org.eclipse.jdt.launching.IVMInstall;
-import org.eclipse.jdt.launching.JavaRuntime;
-import org.eclipse.jdt.launching.LibraryLocation;
-import org.eclipse.ant.ui.internal.model.AntUtil;
-
-public class AntClasspathProvider implements IRuntimeClasspathProvider {
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.launching.IRuntimeClasspathProvider#computeUnresolvedClasspath(org.eclipse.debug.core.ILaunchConfiguration)
-	 */
-	public IRuntimeClasspathEntry[] computeUnresolvedClasspath(ILaunchConfiguration configuration) throws CoreException {
-		return new IRuntimeClasspathEntry[0];
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.launching.IRuntimeClasspathProvider#resolveClasspath(org.eclipse.jdt.launching.IRuntimeClasspathEntry[], org.eclipse.debug.core.ILaunchConfiguration)
-	 */
-	public IRuntimeClasspathEntry[] resolveClasspath(IRuntimeClasspathEntry[] entries, ILaunchConfiguration configuration) throws CoreException {
-		
-		URL[] antURLs= AntUtil.getCustomClasspath(configuration);
-		AntCorePreferences prefs= AntCorePlugin.getPlugin().getPreferences();
-		if (antURLs == null) {
-			antURLs = prefs.getURLs();
-		} else {
-			List fullClasspath= new ArrayList();
-			fullClasspath.addAll(Arrays.asList(antURLs));
-			fullClasspath.addAll(Arrays.asList(prefs.getExtraClasspathURLs()));
-			antURLs= (URL[])fullClasspath.toArray(new URL[fullClasspath.size()]);
-		}
-		
-		IVMInstall vm = JavaRuntime.computeVMInstall(configuration);
-		LibraryLocation[] libs = JavaRuntime.getLibraryLocations(vm);
-		IRuntimeClasspathEntry[] rtes = new IRuntimeClasspathEntry[libs.length + antURLs.length];
-		int i= 0;
-		for (; i < libs.length; i++) {
-			IRuntimeClasspathEntry r = JavaRuntime.newArchiveRuntimeClasspathEntry(libs[i].getSystemLibraryPath());
-			r.setSourceAttachmentPath(libs[i].getSystemLibrarySourcePath());
-			r.setSourceAttachmentRootPath(libs[i].getPackageRootPath());
-			r.setClasspathProperty(IRuntimeClasspathEntry.STANDARD_CLASSES);
-			rtes[i] = r;
-		}
-		
-		for (int j = 0; j < antURLs.length; j++) {
-			URL url = antURLs[j];
-			IPath path= new Path(url.getPath());
-			rtes[i] = JavaRuntime.newArchiveRuntimeClasspathEntry(path);
-			i++;
-		}
-		return rtes;		
-	}
-}
diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/launchConfigurations/AntClasspathTab.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/launchConfigurations/AntClasspathTab.java
deleted file mode 100644
index cbba29b..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/launchConfigurations/AntClasspathTab.java
+++ /dev/null
@@ -1,223 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.ui.internal.launchConfigurations;
-
-
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.ant.ui.internal.model.AntUtil;
-import org.eclipse.ant.ui.internal.model.IAntUIConstants;
-import org.eclipse.ant.ui.internal.model.IAntUIHelpContextIds;
-import org.eclipse.ant.ui.internal.preferences.AntClasspathBlock;
-import org.eclipse.ant.ui.internal.preferences.IAntBlockContainer;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.debug.ui.AbstractLaunchConfigurationTab;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.help.WorkbenchHelp;
-
-public class AntClasspathTab extends AbstractLaunchConfigurationTab implements IAntBlockContainer {
-
-	private Button useDefaultButton;
-	private AntClasspathBlock antClasspathBlock= new AntClasspathBlock();
-	
-	/**
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#createControl(org.eclipse.swt.widgets.Composite)
-	 */
-	public void createControl(Composite parent) {
-		Font font= parent.getFont();
-		Composite top = new Composite(parent, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 2;
-		layout.marginHeight = 2;
-		layout.marginWidth = 2;
-		top.setLayout(layout);
-		top.setLayoutData(new GridData(GridData.FILL_BOTH));
-		top.setFont(font);
-
-		setControl(top);
-		WorkbenchHelp.setHelp(top, IAntUIHelpContextIds.ANT_CLASSPATH_TAB);
-		
-		createChangeClasspath(top);
-		antClasspathBlock.setContainer(this);
-		antClasspathBlock.createContents(top);
-	}
-
-	private void createChangeClasspath(Composite top) {
-		Font font= top.getFont();
-		Composite changeClasspath = new Composite(top, SWT.NONE);
-		changeClasspath.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL));
-		GridLayout layout = new GridLayout();
-		layout.marginHeight = 0;
-		layout.marginWidth = 0;
-		changeClasspath.setLayout(layout);
-		changeClasspath.setFont(font);
-
-		useDefaultButton = new Button(changeClasspath, SWT.CHECK);
-		useDefaultButton.setFont(font);
-		useDefaultButton.setText(AntLaunchConfigurationMessages.getString("AntClasspathTab.Use_&global")); //$NON-NLS-1$
-		useDefaultButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent evt) {
-				toggleUseDefaultClasspath();
-				updateLaunchConfigurationDialog();
-			}
-
-		});
-	}
-
-	private void toggleUseDefaultClasspath() {
-		boolean enable = !useDefaultButton.getSelection();
-		antClasspathBlock.setEnabled(enable);
-	}
-	
-	/**
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#setDefaults(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy)
-	 */
-	public void setDefaults(ILaunchConfigurationWorkingCopy configuration) {
-	}
-
-	/**
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#initializeFrom(org.eclipse.debug.core.ILaunchConfiguration)
-	 */
-	public void initializeFrom(ILaunchConfiguration configuration) {
-		String urlStrings= null;
-		try {
-			urlStrings = configuration.getAttribute(IAntUIConstants.ATTR_ANT_CUSTOM_CLASSPATH, (String) null);
-		} catch (CoreException e) {
-		}
-		if (urlStrings == null) {
-			useDefaultButton.setSelection(true);
-			antClasspathBlock.setTablesEnabled(false);
-			antClasspathBlock.initializeAntHome(null);
-		} else {
-			String antHomeString= null;
-			try {
-				antHomeString= configuration.getAttribute(IAntUIConstants.ATTR_ANT_HOME, (String)null);
-			} catch (CoreException e) {
-			}
-			antClasspathBlock.initializeAntHome(antHomeString);
-			useDefaultButton.setSelection(false);
-
-			List userURLs= new ArrayList();
-			List antURLs= new ArrayList();
-			AntUtil.getCustomClasspaths(configuration, antURLs, userURLs);
-			antClasspathBlock.setUserTableInput(userURLs);
-			antClasspathBlock.setAntTableInput(antURLs);
-			antClasspathBlock.setTablesEnabled(true);
-		}
-
-		toggleUseDefaultClasspath();
-	}
-
-	/**
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#performApply(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy)
-	 */
-	public void performApply(ILaunchConfigurationWorkingCopy configuration) {
-		if (useDefaultButton.getSelection()) {
-			configuration.setAttribute(IAntUIConstants.ATTR_ANT_CUSTOM_CLASSPATH, (String)null);
-			configuration.setAttribute(IAntUIConstants.ATTR_ANT_HOME, (String)null);
-			return;
-		}
-		List antUrls= antClasspathBlock.getAntURLs();
-		List userUrls= antClasspathBlock.getUserURLs();
-		StringBuffer urlString= new StringBuffer();
-		Iterator antUrlsItr= antUrls.iterator();
-		while (antUrlsItr.hasNext()) {
-			URL url = (URL) antUrlsItr.next();
-			urlString.append(url.getFile());
-			urlString.append(',');
-		}
-		if (userUrls.size() > 0) {
-			urlString.append('*');
-		}
-		Iterator userUrlsItr= userUrls.iterator();
-		while (userUrlsItr.hasNext()) {
-			URL url = (URL) userUrlsItr.next();
-			urlString.append(url.getFile());
-			urlString.append(',');
-		}
-		if (urlString.length() > 0) {
-			configuration.setAttribute(IAntUIConstants.ATTR_ANT_CUSTOM_CLASSPATH, urlString.substring(0, urlString.length() - 1));
-		} else {
-			configuration.setAttribute(IAntUIConstants.ATTR_ANT_CUSTOM_CLASSPATH, (String)null);
-		}
-		
-		String antHomeText= antClasspathBlock.getAntHome();
-		configuration.setAttribute(IAntUIConstants.ATTR_ANT_HOME, antHomeText);
-	}
-
-	/**
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#getName()
-	 */
-	public String getName() {
-		return AntLaunchConfigurationMessages.getString("AntClasspathTab.Classpath_6"); //$NON-NLS-1$
-	}
-	
-	/**
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#getImage()
-	 */
-	public Image getImage() {
-		return antClasspathBlock.getClasspathImage();
-	}
-
-	/**
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#isValid(org.eclipse.debug.core.ILaunchConfiguration)
-	 */
-	public boolean isValid(ILaunchConfiguration launchConfig) {
-		setErrorMessage(null);
-		setMessage(null);
-		if (antClasspathBlock.isAntHomeEnabled()) {
-			return antClasspathBlock.validateAntHome();
-		} else {
-			return super.isValid(launchConfig);
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.AbstractLaunchConfigurationTab#setMessage(java.lang.String)
-	 */
-	public void setMessage(String message) {
-		super.setMessage(message);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.AbstractLaunchConfigurationTab#setErrorMessage(java.lang.String)
-	 */
-	public void setErrorMessage(String message) {
-		super.setErrorMessage(message);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ant.ui.internal.preferences.IAntBlockContainer#createPushButton(org.eclipse.swt.widgets.Composite, java.lang.String)
-	 */
-	public Button createPushButton(Composite parent, String buttonText) {
-		return super.createPushButton(parent, buttonText, null);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ant.ui.internal.preferences.IAntBlockContainer#update()
-	 */
-	public void update() {
-		updateLaunchConfigurationDialog();
-	}
-}
diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/launchConfigurations/AntConsoleColorProvider.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/launchConfigurations/AntConsoleColorProvider.java
deleted file mode 100644
index 53f4766..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/launchConfigurations/AntConsoleColorProvider.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.ui.internal.launchConfigurations;
-
-import org.eclipse.ant.ui.internal.model.AntUIPlugin;
-import org.eclipse.ant.ui.internal.model.IAntUIPreferenceConstants;
-import org.eclipse.debug.core.model.IProcess;
-import org.eclipse.debug.ui.IDebugUIConstants;
-import org.eclipse.debug.ui.console.ConsoleColorProvider;
-import org.eclipse.debug.ui.console.IConsole;
-import org.eclipse.swt.graphics.Color;
-
-public class AntConsoleColorProvider extends ConsoleColorProvider {
-	
-	/**
-	 * @see org.eclipse.debug.internal.ui.views.console.IConsoleColorProvider#getColor(java.lang.String)
-	 */
-	public Color getColor(String streamIdentifer) {
-		if (streamIdentifer.equals(IDebugUIConstants.ID_STANDARD_OUTPUT_STREAM)) {
-			return AntUIPlugin.getPreferenceColor(IAntUIPreferenceConstants.CONSOLE_INFO_RGB);
-		}
-		if (streamIdentifer.equals(IDebugUIConstants.ID_STANDARD_ERROR_STREAM)) {
-			return AntUIPlugin.getPreferenceColor(IAntUIPreferenceConstants.CONSOLE_ERROR_RGB);
-		}				
-		if (streamIdentifer.equals(AntStreamsProxy.ANT_DEBUG_STREAM)) {
-			return AntUIPlugin.getPreferenceColor(IAntUIPreferenceConstants.CONSOLE_DEBUG_RGB);
-		}
-		if (streamIdentifer.equals(AntStreamsProxy.ANT_VERBOSE_STREAM)) {
-			return AntUIPlugin.getPreferenceColor(IAntUIPreferenceConstants.CONSOLE_VERBOSE_RGB);
-		}
-		if (streamIdentifer.equals(AntStreamsProxy.ANT_WARNING_STREAM)) {
-			return AntUIPlugin.getPreferenceColor(IAntUIPreferenceConstants.CONSOLE_WARNING_RGB);
-		}
-		return super.getColor(streamIdentifer);
-	}
-
-	/**
-	 * @see org.eclipse.debug.internal.ui.views.console.IConsoleColorProvider#connect(org.eclipse.debug.core.model.IProcess, org.eclipse.debug.internal.ui.views.console.IConsole)
-	 */
-	public void connect(IProcess process, IConsole console) {
-		AntStreamsProxy proxy = (AntStreamsProxy)process.getStreamsProxy();
-		((AntProcess)process).setConsole(console);
-		console.connect(proxy.getDebugStreamMonitor(), AntStreamsProxy.ANT_DEBUG_STREAM);
-		console.connect(proxy.getWarningStreamMonitor(), AntStreamsProxy.ANT_WARNING_STREAM);
-		console.connect(proxy.getVerboseStreamMonitor(), AntStreamsProxy.ANT_VERBOSE_STREAM);		
-		super.connect(process, console);
-	}
-
-}
-
diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/launchConfigurations/AntJRETab.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/launchConfigurations/AntJRETab.java
deleted file mode 100644
index 1cdd447..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/launchConfigurations/AntJRETab.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ant.ui.internal.launchConfigurations;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.ant.ui.internal.model.AntUIPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.jdt.debug.ui.launchConfigurations.JavaJRETab;
-import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
-import org.eclipse.jdt.launching.VMStandin;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-
-public class AntJRETab extends JavaJRETab {
-	
-	private Button useSeparateVM;
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#createControl(org.eclipse.swt.widgets.Composite)
-	 */
-	public void createControl(Composite parent) {
-		
-		super.createControl(parent);
-		
-		useSeparateVM = new Button((Composite)getControl(), SWT.CHECK);
-		useSeparateVM.setFont(parent.getFont());
-		useSeparateVM.setText(AntLaunchConfigurationMessages.getString("AntJRETab.Run_&Ant_in_a_separate_Java_virtual_machine_1")); //$NON-NLS-1$
-		useSeparateVM.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent evt) {
-				toggleUseSeparateVM();
-				updateLaunchConfigurationDialog();
-			}
-		});
-		GridData gd = new GridData();
-		gd.horizontalSpan = 2;
-		useSeparateVM.setLayoutData(gd);
-		createVerticalSpacer((Composite)getControl(), 2);
-		
-		//mechanism to specify the working directory.
-	}
-	
-	private void toggleUseSeparateVM() {
-		boolean enable = useSeparateVM.getSelection();
-		fJREAddButton.setEnabled(enable);
-		fJRECombo.setEnabled(enable);
-		fJRELabel.setEnabled(enable);
-	}
-		
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#initializeFrom(org.eclipse.debug.core.ILaunchConfiguration)
-	 */
-	public void initializeFrom(ILaunchConfiguration configuration) {
-		super.initializeFrom(configuration);
-	
-		String vmTypeID= null;
-		try {
-			vmTypeID = configuration.getAttribute(IJavaLaunchConfigurationConstants.ATTR_VM_INSTALL_TYPE, (String)null);
-		} catch (CoreException ce) {
-			AntUIPlugin.log(ce);			
-		}
-		
-		useSeparateVM.setSelection(vmTypeID != null);
-		toggleUseSeparateVM();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#performApply(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy)
-	 */
-	public void performApply(ILaunchConfigurationWorkingCopy configuration) {
-		if (useSeparateVM.getSelection()) {
-			super.performApply(configuration);
-			configuration.setAttribute(IJavaLaunchConfigurationConstants.ATTR_MAIN_TYPE_NAME, "org.apache.tools.ant.Main"); //$NON-NLS-1$
-			configuration.setAttribute(IJavaLaunchConfigurationConstants.ATTR_CLASSPATH_PROVIDER, "org.eclipse.ant.ui.AntClasspathProvider"); //$NON-NLS-1$
-		} else {
-			configuration.setAttribute(IJavaLaunchConfigurationConstants.ATTR_VM_INSTALL_TYPE, (String)null);
-			configuration.setAttribute(IJavaLaunchConfigurationConstants.ATTR_MAIN_TYPE_NAME, (String)null);
-			configuration.setAttribute(IJavaLaunchConfigurationConstants.ATTR_CLASSPATH_PROVIDER, (String)null);
-			configuration.setAttribute(IJavaLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS, (String)null);
-		}
-	}
-	
-	/**
-	 * Set the available items on the JRE combo box
-	 */
-	protected void populateJREComboBox() {
-		int numVMs = fVMStandins.size();
-		
-		List vmNames = new ArrayList(numVMs);
-
-		// Add all installed VMs
-		Iterator iterator = fVMStandins.iterator();
-		while (iterator.hasNext()) {
-			VMStandin standin = (VMStandin)iterator.next();
-			String vmName = standin.getName();
-			vmNames.add(vmName);
-		}
-		Collections.sort(vmNames);
-		fJRECombo.setItems((String[])vmNames.toArray(new String[vmNames.size()]));
-	}
-}
diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/launchConfigurations/AntLaunchConfigurationMessages.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/launchConfigurations/AntLaunchConfigurationMessages.java
deleted file mode 100644
index 0d7e086..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/launchConfigurations/AntLaunchConfigurationMessages.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.ui.internal.launchConfigurations;
-
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-public class AntLaunchConfigurationMessages {
-
-	private static final String BUNDLE_NAME = "org.eclipse.ant.ui.internal.launchConfigurations.AntLaunchConfigurationMessages"; //$NON-NLS-1$
-
-	private static final ResourceBundle RESOURCE_BUNDLE =
-		ResourceBundle.getBundle(BUNDLE_NAME);
-
-	private AntLaunchConfigurationMessages() {
-	}
-
-	public static String getString(String key) {
-		try {
-			return RESOURCE_BUNDLE.getString(key);
-		} catch (MissingResourceException e) {
-			return '!' + key + '!';
-		}
-	}
-}
diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/launchConfigurations/AntLaunchConfigurationMessages.properties b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/launchConfigurations/AntLaunchConfigurationMessages.properties
deleted file mode 100644
index b94f8a1..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/launchConfigurations/AntLaunchConfigurationMessages.properties
+++ /dev/null
@@ -1,58 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2003 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Common Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/cpl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-AntLaunchDelegate.Launching_{0}_1=Launching {0}
-AntLaunchDelegate.Running_{0}_2=Running {0}
-AntLaunchDelegate.Build_In_Progress=Ant build {0} already in progress
-AntLaunchDelegate.Failure=Failure of Background Ant Build
-
-AntLaunchShortcut.Unable=Unable to find an Ant file to run.
-AntLaunchShortcut.An_exception_occurred_while_creating_a_default_Ant_launch_configuration_for_{0}_2=An exception occurred while creating a default Ant launch configuration for {0}
-AntLaunchShortcut.An_exception_occurred_while_retrieving_Ant_launch_configurations._3=An exception occurred while retrieving Ant launch configurations.
-AntLaunchShortcut.Ant_Configuration_Selection_4=Ant Configuration Selection
-AntLaunchShortcut.Choose_an_ant_configuration_to_run_5=&Choose an Ant configuration to run:
-AntLaunchShortcut.Ant_builds_only_support___run___mode._6=Ant builds only support \'run\' mode.
-AntLaunchShortcut.Error_7=Error
-AntLaunchShortcut.Build_Failed_2=Build Failed
-AntLaunchShortcut.Exception_launching=An exception occurred while launching {0}
-AntLaunchShortcut.12=Location of file could not be determined: {0}
-
-AntPropertiesTab.&Properties__6=&Properties:
-AntPropertiesTab.Property_f&iles__7=P&roperty files:
-AntPropertiesTab.P&roperties_8=Properties
-AntPropertiesTab.Error_reading_configuration_9=Error reading configuration
-
-AntTargetLabelProvider.default_target_1=default target
-
-AntClasspathTab.Use_&global=Use &global classpath as specified in the Ant runtime preferences
-AntClasspathTab.Classpath_6=Classpath
-
-AntJRETab.Run_&Ant_in_a_separate_Java_virtual_machine_1=Run &Ant in a separate Java virtual machine
-
-AntMainTab.&Select_a_build_file__1=&Select a buildfile:
-AntMainTab.Base_&Directory__3=Base &Directory:
-AntMainTab.Capture_&output_1=Capture &output
-
-AntTargetsTab.Check_targets_to_e&xecute__1=Check targets to e&xecute:
-AntTargetsTab.0_out_of_0_selected_2=0 out of 0 selected
-AntTargetsTab.Target_execution_order__3=Target execution order:
-AntTargetsTab.&Order..._4=&Order...
-AntTargetsTab.Name_5=Name
-AntTargetsTab.Description_6=Description
-AntTargetsTab.{0}_out_of_{1}_selected_7={0} out of {1} selected
-AntTargetsTab.Tar&gets_14=Targets
-AntTargetsTab.No_targets=No targets selected for build
-AntTargetsTab.Error_reading_configuration_12=Error reading configuration
-
-TargetOrderDialog.Order_Targets_1=Order Targets
-TargetOrderDialog.&Specify_target_execution_order__2=&Specify target execution order:
-TargetOrderDialog.&Up_3=&Up
-TargetOrderDialog.&Down_4=&Down
diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/launchConfigurations/AntLaunchDelegate.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/launchConfigurations/AntLaunchDelegate.java
deleted file mode 100644
index 5a63a61..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/launchConfigurations/AntLaunchDelegate.java
+++ /dev/null
@@ -1,327 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.ui.internal.launchConfigurations;
-
-
-import java.net.URL;
-import java.text.MessageFormat;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
-import org.eclipse.ant.core.AntCorePlugin;
-import org.eclipse.ant.core.AntCorePreferences;
-import org.eclipse.ant.core.AntRunner;
-import org.eclipse.ant.core.Property;
-import org.eclipse.ant.ui.internal.model.AntUIPlugin;
-import org.eclipse.ant.ui.internal.model.AntUtil;
-import org.eclipse.ant.ui.internal.model.IAntUIConstants;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.debug.core.ILaunch;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.debug.core.ILaunchManager;
-import org.eclipse.debug.core.model.ILaunchConfigurationDelegate;
-import org.eclipse.debug.core.model.IProcess;
-import org.eclipse.debug.core.variables.LaunchVariableUtil;
-import org.eclipse.debug.ui.launchVariables.RefreshTab;
-import org.eclipse.jdt.internal.launching.JavaLocalApplicationLaunchConfigurationDelegate;
-import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
-import org.eclipse.jface.dialogs.ErrorDialog;
-import org.eclipse.ui.externaltools.internal.launchConfigurations.ExternalToolsUtil;
-import org.eclipse.ui.externaltools.internal.program.launchConfigurations.BackgroundResourceRefresher;
-
-/**
- * Launch delegate for ant builds
- */
-public class AntLaunchDelegate implements ILaunchConfigurationDelegate {
-	
-	private static final String ANT_LOGGER_CLASS = "org.eclipse.ant.ui.internal.antsupport.logger.AntProcessBuildLogger"; //$NON-NLS-1$
-	private static final String NULL_LOGGER_CLASS = "org.eclipse.ant.ui.internal.antsupport.logger.NullBuildLogger"; //$NON-NLS-1$
-	private static final String BASE_DIR_PREFIX = "-Dbasedir="; //$NON-NLS-1$
-	private static final String INPUT_HANDLER_CLASS = "org.eclipse.ant.ui.internal.antsupport.inputhandler.AntInputHandler"; //$NON-NLS-1$	
-
-	/**
-	 * @see org.eclipse.debug.core.model.ILaunchConfigurationDelegate#launch(org.eclipse.debug.core.ILaunchConfiguration, java.lang.String, org.eclipse.debug.core.ILaunch, org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	public void launch(ILaunchConfiguration configuration, String mode, ILaunch launch, IProgressMonitor monitor) throws CoreException {
-		if (monitor.isCanceled()) {
-			return;
-		}
-		
-		String vmTypeID= null;
-		try {
-			vmTypeID = configuration.getAttribute(IJavaLaunchConfigurationConstants.ATTR_VM_INSTALL_TYPE, (String)null);
-		} catch (CoreException ce) {
-			AntUIPlugin.log(ce);			
-		}
-		
-		if (ExternalToolsUtil.isBackground(configuration)) {
-			monitor.beginTask(MessageFormat.format(AntLaunchConfigurationMessages.getString("AntLaunchDelegate.Launching_{0}_1"), new String[] {configuration.getName()}), 10); //$NON-NLS-1$
-		} else {
-			monitor.beginTask(MessageFormat.format(AntLaunchConfigurationMessages.getString("AntLaunchDelegate.Running_{0}_2"), new String[] {configuration.getName()}), 100); //$NON-NLS-1$
-		}
-		
-		// resolve location
-		IPath location = ExternalToolsUtil.getLocation(configuration);
-		monitor.worked(1);
-		
-		if (monitor.isCanceled()) {
-			return;
-		}
-		
-		if (vmTypeID == null && AntRunner.isBuildRunning()) {
-			IStatus status= new Status(IStatus.ERROR, IAntUIConstants.PLUGIN_ID, 1, MessageFormat.format(AntLaunchConfigurationMessages.getString("AntLaunchDelegate.Build_In_Progress"), new String[]{location.toOSString()}), null); //$NON-NLS-1$
-			throw new CoreException(status);
-		}		
-		
-		// resolve working directory
-		IPath workingDirectory = ExternalToolsUtil.getWorkingDirectory(configuration);
-		String baseDir = null;
-		if (workingDirectory != null) {
-			baseDir = workingDirectory.toOSString();
-		}
-		monitor.worked(1);
-		
-		if (monitor.isCanceled()) {
-			return;
-		}
-
-		// link the process to its build logger via a timestamp
-		long timeStamp = System.currentTimeMillis();
-		String idStamp = Long.toString(timeStamp);
-		String idProperty = "-D" + AntProcess.ATTR_ANT_PROCESS_ID + "=" + idStamp; //$NON-NLS-1$ //$NON-NLS-2$
-		
-		// resolve arguments
-		String[] arguments = ExternalToolsUtil.getArguments(configuration);
-		int argLength = 1; // at least one user property - timestamp
-		if (arguments != null) {
-			argLength += arguments.length;
-		}		
-		if (baseDir != null && baseDir.length() > 0) {
-			argLength++;
-		}
-		String[] runnerArgs = new String[argLength];
-		if (arguments != null) {
-			System.arraycopy(arguments, 0, runnerArgs, 0, arguments.length);
-		}
-		if (baseDir != null && baseDir.length() > 0) {
-			runnerArgs[runnerArgs.length - 2] = BASE_DIR_PREFIX + baseDir;
-		}
-		runnerArgs[runnerArgs.length -1] = idProperty;
-		
-		Map userProperties= AntUtil.getProperties(configuration);
-		String[] propertyFiles= AntUtil.getPropertyFiles(configuration);
-		String[] targets = AntUtil.getTargetsFromConfig(configuration);
-		URL[] customClasspath= AntUtil.getCustomClasspath(configuration);
-		String antHome= AntUtil.getAntHome(configuration);
-		
-		AntRunner runner= null;
-		if (vmTypeID == null) {
-			runner= new AntRunner();
-			runner.setBuildFileLocation(location.toOSString());
-			if (ExternalToolsUtil.getCaptureOutput(configuration)) {
-				runner.addBuildLogger(ANT_LOGGER_CLASS);
-			} else {
-				runner.addBuildLogger(NULL_LOGGER_CLASS);
-			}
-			runner.setInputHandler(INPUT_HANDLER_CLASS);
-			runner.setArguments(runnerArgs);
-			if (userProperties != null) {
-				runner.addUserProperties(userProperties);
-			}
-
-			if (propertyFiles != null) {
-				runner.setPropertyFiles(propertyFiles);
-			}
-
-			if (targets != null) {
-				runner.setExecutionTargets(targets);
-			}
-
-			if (customClasspath != null) {
-				runner.setCustomClasspath(customClasspath);
-			}
-
-			if (antHome != null) {
-				runner.setAntHome(antHome);
-			}
-		}
-		 
-		monitor.worked(1);
-								
-		if (monitor.isCanceled()) {
-			return;
-		}
-		StringBuffer commandLine= generateCommandLine(location, arguments, userProperties, propertyFiles, targets, antHome, vmTypeID != null);
-		if (vmTypeID != null) {
-			monitor.beginTask(MessageFormat.format(AntLaunchConfigurationMessages.getString("AntLaunchDelegate.Launching_{0}_1"), new String[] {configuration.getName()}), 10); //$NON-NLS-1$
-			runInSeparateVM(configuration, launch, monitor, idStamp, commandLine);
-			return;
-		}
-		Map attributes= new HashMap();
-		attributes.put(IProcess.ATTR_PROCESS_TYPE, IAntUIConstants.ID_ANT_PROCESS_TYPE);
-		attributes.put(AntProcess.ATTR_ANT_PROCESS_ID, idStamp);
-				
-		final AntProcess process = new AntProcess(location.toOSString(), launch, attributes);
-		setProcessAttributes(process, idStamp, commandLine);
-		
-		if (ExternalToolsUtil.isBackground(configuration)) {
-			final AntRunner finalRunner= runner;
-			Runnable r = new Runnable() {
-				public void run() {
-					try {
-						finalRunner.run(process);
-					} catch (final CoreException e) {
-						AntUIPlugin.getStandardDisplay().asyncExec(new Runnable() {
-							public void run() {
-								ErrorDialog.openError(null, AntLaunchConfigurationMessages.getString("AntLaunchDelegate.Failure"), null, e.getStatus()); //$NON-NLS-1$
-							}
-						});
-					}
-					process.terminated();
-				}
-			};
-			Thread background = new Thread(r);
-			background.start();
-			monitor.worked(1);
-			// refresh resources after process finishes
-			if (LaunchVariableUtil.getRefreshScope(configuration) != null) {
-				BackgroundResourceRefresher refresher = new BackgroundResourceRefresher(configuration, process);
-				refresher.startBackgroundRefresh();
-			}				
-		} else {
-			// execute the build 
-			try {
-				runner.run(monitor);
-			} catch (CoreException e) {
-				process.terminated();
-				throw e;
-			}
-			process.terminated();
-			
-			// refresh resources
-			RefreshTab.refreshResources(configuration, monitor);
-		}	
-		
-		monitor.done();	
-	}
-
-	private void setProcessAttributes(IProcess process, String idStamp, StringBuffer commandLine) {
-		// link the process to its build logger via a timestamp
-		process.setAttribute(IProcess.ATTR_PROCESS_TYPE, IAntUIConstants.ID_ANT_PROCESS_TYPE);
-		process.setAttribute(AntProcess.ATTR_ANT_PROCESS_ID, idStamp);
-		
-		// create "fake" command line for the process
-		if (commandLine != null) {
-			process.setAttribute(IProcess.ATTR_CMDLINE, commandLine.toString());
-		}
-	}
-
-	private StringBuffer generateCommandLine(IPath location, String[] arguments, Map userProperties, String[] propertyFiles, String[] targets, String antHome, boolean separateVM) {
-		StringBuffer commandLine= new StringBuffer();
-
-		if (!separateVM) {
-			commandLine.append("ant"); //$NON-NLS-1$
-		}
-		
-		if (arguments != null) {
-			for (int i = 0; i < arguments.length; i++) {
-				String arg = arguments[i];
-				commandLine.append(' ');
-				commandLine.append(arg);
-			}
-		}
-		
-		AntCorePreferences prefs= AntCorePlugin.getPlugin().getPreferences();
-		//global 
-		String[] files= prefs.getCustomPropertyFiles();
-		for (int i = 0; i < files.length; i++) {
-			String path = files[i];
-			commandLine.append(" -propertyfile "); //$NON-NLS-1$
-			commandLine.append(path);
-		}
-		//"local" configuration 
-		if (propertyFiles != null) {
-			for (int i = 0; i < propertyFiles.length; i++) {
-				String path = propertyFiles[i];
-				commandLine.append(" -propertyfile "); //$NON-NLS-1$
-				commandLine.append(path);
-			}
-		}
-		//"local" configuration
-		if (userProperties != null) {
-			Iterator keys = userProperties.keySet().iterator();
-			String key;
-			while (keys.hasNext()) {
-				key= (String)keys.next();
-				appendProperty(commandLine, key, (String)userProperties.get(key));
-			}
-		}
-		
-		//global
-		Property[] properties= prefs.getCustomProperties();
-		String key;
-		for (int i = 0; i < properties.length; i++) {
-			Property property = properties[i];
-			key= property.getName();
-			if (userProperties == null || userProperties.get(key) == null) {
-				appendProperty(commandLine, key, property.getValue());
-			}
-		}
-		
-		if (antHome != null) {
-			commandLine.append(" -Dant.home="); //$NON-NLS-1$
-			commandLine.append(antHome);
-		}
-		
-		if (!separateVM) {
-			commandLine.append(" -inputhandler "); //$NON-NLS-1$
-			commandLine.append(INPUT_HANDLER_CLASS);
-		
-			commandLine.append(" -logger "); //$NON-NLS-1$
-			commandLine.append(ANT_LOGGER_CLASS);
-		}
-		commandLine.append(" -buildfile \""); //$NON-NLS-1$
-		commandLine.append(location.toOSString() + "\""); //$NON-NLS-1$
-		
-		if (targets != null) {
-			for (int i = 0; i < targets.length; i++) {
-				commandLine.append(" "); //$NON-NLS-1$
-				commandLine.append(targets[i]);
-			}
-		}
-		return commandLine;
-	}
-	
-	private void appendProperty(StringBuffer commandLine, String name, String value){
-		commandLine.append(" -D"); //$NON-NLS-1$
-		commandLine.append(name);
-		commandLine.append('='); 
-		commandLine.append(value);
-	}
-	
-	private void runInSeparateVM(ILaunchConfiguration configuration, ILaunch launch, IProgressMonitor monitor, String idStamp, StringBuffer commandLine) throws CoreException {
-		ILaunchConfigurationWorkingCopy copy= configuration.getWorkingCopy();
-		copy.setAttribute(IJavaLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS, commandLine.toString());
-		JavaLocalApplicationLaunchConfigurationDelegate delegate= new JavaLocalApplicationLaunchConfigurationDelegate();
-		delegate.launch(copy, ILaunchManager.RUN_MODE, launch, monitor);
-		IProcess[] processes= launch.getProcesses();
-		for (int i = 0; i < processes.length; i++) {
-			IProcess process = processes[i];
-			setProcessAttributes(process, idStamp, null);
-		}
-	}
-}
diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/launchConfigurations/AntLaunchShortcut.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/launchConfigurations/AntLaunchShortcut.java
deleted file mode 100644
index 14cf019..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/launchConfigurations/AntLaunchShortcut.java
+++ /dev/null
@@ -1,344 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.ui.internal.launchConfigurations;
-
-
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.ant.ui.internal.model.AntUIPlugin;
-import org.eclipse.ant.ui.internal.model.AntUtil;
-import org.eclipse.ant.ui.internal.model.IAntUIConstants;
-import org.eclipse.ant.ui.internal.model.IAntUIPreferenceConstants;
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.debug.core.DebugPlugin;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationType;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.debug.core.ILaunchManager;
-import org.eclipse.debug.core.variables.ILaunchVariableConstants;
-import org.eclipse.debug.core.variables.LaunchVariableUtil;
-import org.eclipse.debug.ui.CommonTab;
-import org.eclipse.debug.ui.DebugUITools;
-import org.eclipse.debug.ui.ILaunchShortcut;
-import org.eclipse.jface.dialogs.ErrorDialog;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.dialogs.ElementListSelectionDialog;
-import org.eclipse.ui.externaltools.internal.launchConfigurations.ExternalToolsUtil;
-import org.eclipse.ui.externaltools.internal.model.IExternalToolConstants;
-
-/**
- *
- */
-public class AntLaunchShortcut implements ILaunchShortcut {
-
-	private boolean fShowDialog= false;
-
-	/**
-	 * Constructor for AntLaunchShortcut.
-	 */
-	public AntLaunchShortcut() {
-		super();
-	}
-
-	/**
-	 * @see org.eclipse.debug.ui.ILaunchShortcut#launch(org.eclipse.jface.viewers.ISelection, java.lang.String)
-	 */
-	public void launch(ISelection selection, String mode) {
-		if (selection instanceof IStructuredSelection) {
-			IStructuredSelection structuredSelection = (IStructuredSelection)selection;
-			Object object = structuredSelection.getFirstElement();
-			if (object instanceof IAdaptable) {
-				IResource resource = (IResource)((IAdaptable)object).getAdapter(IResource.class);
-				if (resource != null) {
-					launch(resource, mode);
-					return;
-				}
-			}
-		}
-		antFileNotFound();
-	}
-	
-	/**
-	 * Inform the user that an ant file was not found to run.
-	 */
-	private void antFileNotFound() {
-		reportError(AntLaunchConfigurationMessages.getString("AntLaunchShortcut.Unable"), null); //$NON-NLS-1$	
-	}
-	
-	/**
-	 * Launch the given file in the specified mode.
-	 * 
-	 * @param resource either a build file (*.xml file) to execute or a resource
-	 * from whose location a build file should be searched for. If the given
-	 * resource is a file that does not end in ".xml", a search will begin at
-	 * the resource's enclosing folder. The given resource must be of type IFile
-	 * or IContainer.
-	 * @param mode the mode in which the build file should be executed
-	 */
-	protected void launch(IResource resource, String mode) {
-		if (!("xml".equalsIgnoreCase(resource.getFileExtension()))) { //$NON-NLS-1$
-			if (resource.getType() == IResource.FILE) {
-				resource= resource.getParent();
-			}
-			resource= findBuildFile((IContainer)resource);
-		} 
-		if (resource != null) {
-			launch((IFile)resource, mode, null);
-		} else {
-		 	antFileNotFound();
-		 }
-	}
-	
-	/**
-	 * Launch the given targets in the given build file. The targets are
-	 * launched in the given mode.
-	 * 
-	 * @param file the build file to launch
-	 * @param mode the mode in which the build file should be executed
-	 * @param targetAttribute the targets to launch, in the form of the launch
-	 * configuration targets attribute.
-	 */
-	public void launch(IFile file, String mode, String targetAttribute) {
-		ILaunchConfiguration configuration= null;
-		if (verifyMode(mode)) {
-			List configurations = findExistingLaunchConfigurations(file);
-			if (configurations.isEmpty()) {
-				configuration = createDefaultLaunchConfiguration(file);
-			} else {
-				if (configurations.size() == 1) {
-					configuration= (ILaunchConfiguration)configurations.get(0);
-				} else {
-					configuration= chooseConfig(configurations);
-					if (configuration == null) {
-						// User cancelled selection
-						return;
-					}
-				}
-			}
-		}
-
-		if (configuration != null) {
-			if (fShowDialog) {
-				IStatus status = new Status(IStatus.INFO, IAntUIConstants.PLUGIN_ID, IAntUIConstants.STATUS_INIT_RUN_ANT, "", null); //$NON-NLS-1$
-				DebugUITools.openLaunchConfigurationDialog(AntUIPlugin.getActiveWorkbenchWindow().getShell(), configuration, IExternalToolConstants.ID_EXTERNAL_TOOLS_LAUNCH_GROUP, status);
-			} else {
-				if (targetAttribute != null) {
-					String newName= DebugPlugin.getDefault().getLaunchManager().generateUniqueLaunchConfigurationNameFrom(configuration.getName());
-					try {
-						configuration= configuration.copy(newName);
-						((ILaunchConfigurationWorkingCopy) configuration).setAttribute(IAntUIConstants.ATTR_ANT_TARGETS, targetAttribute);
-					} catch (CoreException exception) {
-						reportError(MessageFormat.format(AntLaunchConfigurationMessages.getString("AntLaunchShortcut.Exception_launching"), new String[] {file.getName()}), exception); //$NON-NLS-1$
-						return;
-					}
-				}
-				DebugUITools.launch(configuration, mode);
-			}
-			return;
-		}
-		
-		antFileNotFound();
-	}
-	
-	/**
-	 * Walks the file hierarchy looking for a build file.
-	 * Returns the first build file found that matches the 
-	 * search criteria.
-	 */
-	private IFile findBuildFile(IContainer parent) {
-		String[] names= getBuildFileNames();
-		if (names == null) {
-			return null;
-		}
-		IResource file= null;
-		while (file == null || file.getType() != IFile.FILE) {		
-			for (int i = 0; i < names.length; i++) {
-				String string = names[i];
-				file= parent.findMember(string);
-				if (file != null && file.getType() == IFile.FILE) {
-					break;
-				}
-			}
-			parent = parent.getParent();
-			if (parent == null) {
-				return null;
-			}
-		}
-		return (IFile)file;
-	}
-	
-	private String[] getBuildFileNames() {
-		IPreferenceStore prefs= AntUIPlugin.getDefault().getPreferenceStore();
-		String buildFileNames= prefs.getString(IAntUIPreferenceConstants.ANT_FIND_BUILD_FILE_NAMES);
-		if (buildFileNames.length() == 0) {
-			//the user has not specified any names to look for
-			return null;
-		}
-		return AntUtil.parseString(buildFileNames, ","); //$NON-NLS-1$
-	}
-	
-	/**
-	 * Creates and returns a default launch configuration for the given file.
-	 * 
-	 * @param file
-	 * @return default launch configuration
-	 */
-	public static ILaunchConfiguration createDefaultLaunchConfiguration(IFile file) {
-		ILaunchManager manager = DebugPlugin.getDefault().getLaunchManager();
-		ILaunchConfigurationType type = manager.getLaunchConfigurationType(IAntUIConstants.ID_ANT_LAUNCH_CONFIGURATION_TYPE);
-		StringBuffer buffer = new StringBuffer(file.getProject().getName());
-		buffer.append(' ');
-		buffer.append(file.getName());
-		String name = buffer.toString().trim();
-		name= manager.generateUniqueLaunchConfigurationNameFrom(name);
-		try {
-			ILaunchConfigurationWorkingCopy workingCopy = type.newInstance(null, name);
-			StringBuffer buf = new StringBuffer();
-			LaunchVariableUtil.buildVariableTag(ILaunchVariableConstants.VAR_WORKSPACE_LOC, file.getFullPath().toString(), buf);
-			workingCopy.setAttribute(IExternalToolConstants.ATTR_LOCATION, buf.toString());
-			
-			// set default for common settings
-			CommonTab tab = new CommonTab();
-			tab.setDefaults(workingCopy);
-			tab.dispose();
-			
-			return workingCopy.doSave();
-		} catch (CoreException e) {
-			reportError(MessageFormat.format(AntLaunchConfigurationMessages.getString("AntLaunchShortcut.An_exception_occurred_while_creating_a_default_Ant_launch_configuration_for_{0}_2"), new String[]{file.toString()}), e); //$NON-NLS-1$
-		}
-		return null;
-	}
-	
-	/**
-	 * Returns a list of existing launch configuration for the given file.
-	 * 
-	 * @param file
-	 * @return list of launch configurations
-	 */
-	public static List findExistingLaunchConfigurations(IFile file) {
-		ILaunchManager manager = DebugPlugin.getDefault().getLaunchManager();
-		ILaunchConfigurationType type = manager.getLaunchConfigurationType(IAntUIConstants.ID_ANT_LAUNCH_CONFIGURATION_TYPE);
-		List validConfigs= new ArrayList();
-		if (type != null) {
-			ILaunchConfiguration[] configs = null;
-			try {
-				configs = manager.getLaunchConfigurations(type);
-			} catch (CoreException e) {
-				reportError(AntLaunchConfigurationMessages.getString("AntLaunchShortcut.An_exception_occurred_while_retrieving_Ant_launch_configurations._3"), e); //$NON-NLS-1$
-			}
-			if (configs != null && configs.length > 0) {
-				IPath filePath = file.getLocation();
-				if (filePath == null) {
-					reportError(MessageFormat.format(AntLaunchConfigurationMessages.getString("AntLaunchShortcut.12"), new String[] { file.getName() }), null); //$NON-NLS-1$
-				} else {
-					for (int i = 0; i < configs.length; i++) {
-						ILaunchConfiguration configuration = configs[i];
-						IPath location;
-						try {
-							location = ExternalToolsUtil.getLocation(configuration);
-							if (filePath.equals(location)) {
-								validConfigs.add(configuration);
-							}
-						} catch (CoreException e) {
-							// error occurred in variable expand - ignore
-						}
-					}
-				}
-			}
-		}
-		return validConfigs;
-	}
-	
-	/**
-	 * Prompts the user to choose from the list of given launch configurations
-	 * and returns the config the user choose of <code>null</code> if the user
-	 * pressed Cancel or if the given list is empty.
-	 */
-	public static ILaunchConfiguration chooseConfig(List configs) {
-		if (configs.isEmpty()) {
-			return null;
-		}
-		ILabelProvider labelProvider = DebugUITools.newDebugModelPresentation();
-		ElementListSelectionDialog dialog= new ElementListSelectionDialog(Display.getDefault().getActiveShell(), labelProvider);
-		dialog.setElements((ILaunchConfiguration[]) configs.toArray(new ILaunchConfiguration[configs.size()]));
-		dialog.setTitle(AntLaunchConfigurationMessages.getString("AntLaunchShortcut.Ant_Configuration_Selection_4")); //$NON-NLS-1$
-		dialog.setMessage(AntLaunchConfigurationMessages.getString("AntLaunchShortcut.Choose_an_ant_configuration_to_run_5")); //$NON-NLS-1$
-		dialog.setMultipleSelection(false);
-		int result = dialog.open();
-		labelProvider.dispose();
-		if (result == ElementListSelectionDialog.OK) {
-			return (ILaunchConfiguration) dialog.getFirstResult();
-		}
-		return null;
-	}
-	
-	/**
-	 * Verifies the mode is supported
-	 * 
-	 * @param mode
-	 * @return boolean
-	 */
-	protected boolean verifyMode(String mode) {
-		if (!mode.equals(ILaunchManager.RUN_MODE)) {
-			reportError(AntLaunchConfigurationMessages.getString("AntLaunchShortcut.Ant_builds_only_support___run___mode._6"), null); //$NON-NLS-1$
-			return false;
-		}
-		return true;
-	}
-
-	/**
-	 * @see org.eclipse.debug.ui.ILaunchShortcut#launch(org.eclipse.ui.IEditorPart, java.lang.String)
-	 */
-	public void launch(IEditorPart editor, String mode) {
-		IEditorInput input = editor.getEditorInput();
-		IFile file = (IFile)input.getAdapter(IFile.class);
-		if (file != null) {
-			launch(file, mode);
-			return;
-		}
-		antFileNotFound();
-	}
-	
-	protected static void reportError(String message, Throwable throwable) {
-		IStatus status = null;
-		if (throwable instanceof CoreException) {
-			status = ((CoreException)throwable).getStatus();
-		} else {
-			status = new Status(IStatus.ERROR, IAntUIConstants.PLUGIN_ID, 0, message, throwable);
-		}
-		ErrorDialog.openError(AntUIPlugin.getActiveWorkbenchWindow().getShell(), AntLaunchConfigurationMessages.getString("AntLaunchShortcut.Error_7"), AntLaunchConfigurationMessages.getString("AntLaunchShortcut.Build_Failed_2"), status); //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * Sets whether to show the external tools launch configuration dialog
-	 * 
-	 * @param showDialog If true the launch configuration dialog will always be
-	 * 			shown
-	 */
-	public void setShowDialog(boolean showDialog) {
-		fShowDialog = showDialog;
-	}
-}
diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/launchConfigurations/AntMainTab.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/launchConfigurations/AntMainTab.java
deleted file mode 100644
index 0bcbd8e..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/launchConfigurations/AntMainTab.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.ui.internal.launchConfigurations;
-
-import org.eclipse.ant.ui.internal.model.AntUIPlugin;
-import org.eclipse.ant.ui.internal.model.IAntUIHelpContextIds;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.debug.core.variables.ILaunchVariableConstants;
-import org.eclipse.debug.core.variables.LaunchVariableUtil;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.externaltools.internal.launchConfigurations.ExternalToolsLaunchConfigurationMessages;
-import org.eclipse.ui.externaltools.internal.launchConfigurations.ExternalToolsMainTab;
-import org.eclipse.ui.externaltools.internal.model.IExternalToolConstants;
-import org.eclipse.ui.externaltools.internal.ui.FileSelectionDialog;
-import org.eclipse.ui.help.WorkbenchHelp;
-
-public class AntMainTab extends ExternalToolsMainTab {
-
-	protected Button captureOutputButton;
-	
-	public AntMainTab(boolean runInBackgroundDefaultValue) {
-		super(runInBackgroundDefaultValue);
-	}
-
-	/**
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#initializeFrom(org.eclipse.debug.core.ILaunchConfiguration)
-	 */
-	public void initializeFrom(ILaunchConfiguration configuration) {
-		super.initializeFrom(configuration);
-		updateCaptureOutput(configuration);
-	}
-	
-	/**
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#performApply(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy)
-	 */
-	public void performApply(ILaunchConfigurationWorkingCopy configuration) {
-		super.performApply(configuration);
-		setAttribute(IExternalToolConstants.ATTR_CAPTURE_OUTPUT, configuration, captureOutputButton.getSelection(), true);
-	}
-
-	/**
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#createControl(org.eclipse.swt.widgets.Composite)
-	 */
-	public void createControl(Composite parent) {
-		Composite mainComposite = new Composite(parent, SWT.NONE);
-		setControl(mainComposite);
-		WorkbenchHelp.setHelp(mainComposite, IAntUIHelpContextIds.ANT_MAIN_TAB);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 2;
-		GridData gridData = new GridData(GridData.FILL_HORIZONTAL);
-		mainComposite.setLayout(layout);
-		mainComposite.setLayoutData(gridData);
-		mainComposite.setFont(parent.getFont());
-		createLocationComponent(mainComposite);
-		createWorkDirectoryComponent(mainComposite);
-		createArgumentComponent(mainComposite);
-		createVerticalSpacer(mainComposite, 2);
-		createRunBackgroundComponent(mainComposite);
-		createCaptureOutputComponent(mainComposite);
-	}
-	
-	/**
-	 * Creates the controls needed to edit the capture output attribute of an
-	 * external tool
-	 *
-	 * @param parent the composite to create the controls in
-	 */
-	protected void createCaptureOutputComponent(Composite parent) {
-		captureOutputButton = new Button(parent, SWT.CHECK);
-		captureOutputButton.setText(AntLaunchConfigurationMessages.getString("AntMainTab.Capture_&output_1")); //$NON-NLS-1$
-		GridData data = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
-		data.horizontalSpan = 2;
-		captureOutputButton.setLayoutData(data);
-		captureOutputButton.setFont(parent.getFont());
-		captureOutputButton.addSelectionListener(getSelectionAdapter());
-	}
-	
-	protected void updateCaptureOutput(ILaunchConfiguration configuration) {
-		boolean captureOutput= true;
-		try {
-			captureOutput= configuration.getAttribute(IExternalToolConstants.ATTR_CAPTURE_OUTPUT, true);
-		} catch (CoreException ce) {
-			AntUIPlugin.log(ExternalToolsLaunchConfigurationMessages.getString("ExternalToolsMainTab.Error_reading_configuration_7"), ce); //$NON-NLS-1$
-		}
-		captureOutputButton.setSelection(captureOutput);
-	}
-
-	/**
-	 * Prompts the user for a workspace location within the workspace and sets
-	 * the location as a String containing the workspace_loc variable or
-	 * <code>null</code> if no location was obtained from the user.
-	 */
-	protected void handleWorkspaceLocationButtonSelected() {
-		FileSelectionDialog dialog;
-		dialog = new FileSelectionDialog(getShell(), ResourcesPlugin.getWorkspace().getRoot(), AntLaunchConfigurationMessages.getString("AntMainTab.&Select_a_build_file__1")); //$NON-NLS-1$
-		dialog.setFileFilter("*.xml", true); //$NON-NLS-1$
-		dialog.open();
-		IFile file = dialog.getResult();
-		if (file == null) {
-			return;
-		}
-		StringBuffer buf = new StringBuffer();
-		LaunchVariableUtil.buildVariableTag(ILaunchVariableConstants.VAR_WORKSPACE_LOC, file.getFullPath().toString(), buf);
-		String text= buf.toString();
-		if (text != null) {
-			locationField.setText(text);
-		}
-	}
-
-	/**
-	 * @see org.eclipse.ui.externaltools.launchConfigurations.ExternalToolsMainTab#getWorkingDirectoryLabel()
-	 */
-	protected String getWorkingDirectoryLabel() {
-		return AntLaunchConfigurationMessages.getString("AntMainTab.Base_&Directory__3"); //$NON-NLS-1$
-	}
-}
diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/launchConfigurations/AntProcess.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/launchConfigurations/AntProcess.java
deleted file mode 100644
index 979f192..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/launchConfigurations/AntProcess.java
+++ /dev/null
@@ -1,208 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.ui.internal.launchConfigurations;
-
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.ant.ui.internal.model.IAntUIConstants;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.debug.core.DebugEvent;
-import org.eclipse.debug.core.DebugException;
-import org.eclipse.debug.core.DebugPlugin;
-import org.eclipse.debug.core.ILaunch;
-import org.eclipse.debug.core.model.IProcess;
-import org.eclipse.debug.core.model.IStreamsProxy;
-import org.eclipse.debug.ui.console.IConsole;
-
-/**
- * 
- */
-public class AntProcess implements IProcess, IProgressMonitor {
-	
-	/**
-	 * Process attribute with process identifier - links the ant process build
-	 * logger to a process.
-	 */
-	public static final String ATTR_ANT_PROCESS_ID = IAntUIConstants.PLUGIN_ID + ".ATTR_ANT_PROCESS_ID"; //$NON-NLS-1$
-	
-	private AntStreamsProxy fProxy = new AntStreamsProxy();
-	private String fLabel = null;
-	private ILaunch fLaunch = null;
-	private Map fAttributes = null;
-	private boolean fTerminated = false;
-	private boolean fCancelled = false;
-	private IConsole fConsole = null;
-	
-	public AntProcess(String label, ILaunch launch, Map attributes) {
-		fLabel = label;
-		fLaunch = launch;
-		if (attributes == null) {
-			fAttributes = new HashMap();
-		} else {
-			fAttributes = attributes;
-		}
-		launch.addProcess(this);
-	}
-
-	/**
-	 * @see org.eclipse.debug.core.model.IProcess#getLabel()
-	 */
-	public String getLabel() {
-		return fLabel;
-	}
-
-	/**
-	 * @see org.eclipse.debug.core.model.IProcess#getLaunch()
-	 */
-	public ILaunch getLaunch() {
-		return fLaunch;
-	}
-
-	/**
-	 * @see org.eclipse.debug.core.model.IProcess#getStreamsProxy()
-	 */
-	public IStreamsProxy getStreamsProxy() {
-		return fProxy;
-	}
-
-	/**
-	 * @see org.eclipse.debug.core.model.IProcess#setAttribute(java.lang.String, java.lang.String)
-	 */
-	public void setAttribute(String key, String value) {
-		fAttributes.put(key, value);
-	}
-
-	/**
-	 * @see org.eclipse.debug.core.model.IProcess#getAttribute(java.lang.String)
-	 */
-	public String getAttribute(String key) {
-		return (String)fAttributes.get(key);
-	}
-
-	/**
-	 * @see org.eclipse.debug.core.model.IProcess#getExitValue()
-	 */
-	public int getExitValue() throws DebugException {
-		return 0;
-	}
-
-	/**
-	 * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
-	 */
-	public Object getAdapter(Class adapter) {
-		return null;
-	}
-
-	/**
-	 * @see org.eclipse.debug.core.model.ITerminate#canTerminate()
-	 */
-	public boolean canTerminate() {
-		return !isCanceled() && !isTerminated();
-	}
-
-	/**
-	 * @see org.eclipse.debug.core.model.ITerminate#isTerminated()
-	 */
-	public boolean isTerminated() {
-		return fTerminated;
-	}
-	
-	protected void terminated() {
-		if (!fTerminated) {
-			fTerminated = true;
-			if (DebugPlugin.getDefault() != null) {
-				DebugPlugin.getDefault().fireDebugEventSet(new DebugEvent[] {new DebugEvent(this, DebugEvent.TERMINATE)});
-			}
-		}
-	}
-
-	/**
-	 * @see org.eclipse.debug.core.model.ITerminate#terminate()
-	 */
-	public void terminate() throws DebugException {
-		setCanceled(true);
-	}
-
-	/**
-	 * Returns the console associated with this process, or <code>null</code> if
-	 * none.
-	 * 
-	 * @return console, or <code>null</code>
-	 */
-	public IConsole getConsole() {
-		return fConsole;
-	}
-	
-	/**
-	 * Sets the console associated with this process.
-	 * 
-	 * @param console
-	 */
-	protected void setConsole(IConsole console) {
-		fConsole = console;
-	}
-	
-	// IProgressMontior implemented to support termination.
-	
-	/**
-	 * @see org.eclipse.core.runtime.IProgressMonitor#beginTask(java.lang.String, int)
-	 */
-	public void beginTask(String name, int totalWork) {
-	}
-
-	/**
-	 * @see org.eclipse.core.runtime.IProgressMonitor#done()
-	 */
-	public void done() {
-	}
-
-	/**
-	 * @see org.eclipse.core.runtime.IProgressMonitor#internalWorked(double)
-	 */
-	public void internalWorked(double work) {
-	}
-
-	/**
-	 * @see org.eclipse.core.runtime.IProgressMonitor#isCanceled()
-	 */
-	public boolean isCanceled() {
-		return fCancelled;
-	}
-
-	/**
-	 * @see org.eclipse.core.runtime.IProgressMonitor#setCanceled(boolean)
-	 */
-	public void setCanceled(boolean value) {
-		fCancelled = value;
-	}
-
-	/**
-	 * @see org.eclipse.core.runtime.IProgressMonitor#setTaskName(java.lang.String)
-	 */
-	public void setTaskName(String name) {
-	}
-
-	/**
-	 * @see org.eclipse.core.runtime.IProgressMonitor#subTask(java.lang.String)
-	 */
-	public void subTask(String name) {
-	}
-
-	/**
-	 * @see org.eclipse.core.runtime.IProgressMonitor#worked(int)
-	 */
-	public void worked(int work) {
-	}
-
-}
-
diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/launchConfigurations/AntPropertiesTab.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/launchConfigurations/AntPropertiesTab.java
deleted file mode 100644
index 6ac4062..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/launchConfigurations/AntPropertiesTab.java
+++ /dev/null
@@ -1,167 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.ui.internal.launchConfigurations;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.ant.core.Property;
-import org.eclipse.ant.ui.internal.model.AntUIImages;
-import org.eclipse.ant.ui.internal.model.AntUIPlugin;
-import org.eclipse.ant.ui.internal.model.AntUtil;
-import org.eclipse.ant.ui.internal.model.IAntUIConstants;
-import org.eclipse.ant.ui.internal.model.IAntUIHelpContextIds;
-import org.eclipse.ant.ui.internal.preferences.AntPropertiesBlock;
-import org.eclipse.ant.ui.internal.preferences.IAntBlockContainer;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.debug.ui.AbstractLaunchConfigurationTab;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.help.WorkbenchHelp;
-
-/**
- * Tab for setting Ant user properties per launch configuration. All properties
- * specified here will be set as user properties on the project for the
- * specified Ant build
- */
-public class AntPropertiesTab extends AbstractLaunchConfigurationTab implements IAntBlockContainer {
-	
-	private AntPropertiesBlock antPropertiesBlock= new AntPropertiesBlock(this);
-	
-	public void createControl(Composite parent) {
-		Composite top = new Composite(parent, SWT.NONE);
-		top.setFont(parent.getFont());
-		setControl(top);
-		WorkbenchHelp.setHelp(getControl(), IAntUIHelpContextIds.ANT_PROPERTIES_TAB);
-
-		GridLayout layout = new GridLayout();
-		layout.numColumns= 2;
-		top.setLayout(layout);
-		GridData gridData = new GridData(GridData.FILL_HORIZONTAL);
-		top.setLayoutData(gridData);
-		antPropertiesBlock.createControl(top, AntLaunchConfigurationMessages.getString("AntPropertiesTab.&Properties__6"), AntLaunchConfigurationMessages.getString("AntPropertiesTab.Property_f&iles__7")); //$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	/**
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#getImage()
-	 */
-	public Image getImage() {
-		return AntUIImages.getImage(IAntUIConstants.IMG_PROPERTY);
-	}
-
-	/**
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#getName()
-	 */
-	public String getName() {
-		return AntLaunchConfigurationMessages.getString("AntPropertiesTab.P&roperties_8"); //$NON-NLS-1$
-	}
-
-	/**
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#initializeFrom(org.eclipse.debug.core.ILaunchConfiguration)
-	 */
-	public void initializeFrom(ILaunchConfiguration configuration) {
-		setErrorMessage(null);
-		setMessage(null);
-		Map properties= null;
-		try {
-			properties= configuration.getAttribute(IAntUIConstants.ATTR_ANT_PROPERTIES, (Map)null);
-		} catch (CoreException ce) {
-			AntUIPlugin.log(AntLaunchConfigurationMessages.getString("AntPropertiesTab.Error_reading_configuration_9"), ce); //$NON-NLS-1$
-		}
-		
-		String propertyFiles= null;
-		try {
-			propertyFiles= configuration.getAttribute(IAntUIConstants.ATTR_ANT_PROPERTY_FILES, (String)null);
-		} catch (CoreException ce) {
-			AntUIPlugin.log(AntLaunchConfigurationMessages.getString("AntPropertiesTab.Error_reading_configuration_9"), ce); //$NON-NLS-1$
-		}
-		
-		antPropertiesBlock.populatePropertyViewer(properties);
-		
-		String[] files= AntUtil.parseString(propertyFiles, ","); //$NON-NLS-1$
-		antPropertiesBlock.setPropertyFilesInput(files);
-		
-		antPropertiesBlock.update();
-	}
-	
-	
-	/**
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#performApply(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy)
-	 */
-	public void performApply(ILaunchConfigurationWorkingCopy configuration) {
-		
-		Object[] items= antPropertiesBlock.getProperties();
-		Map properties= null;
-		if (items.length > 0) {
-			properties= new HashMap(items.length);
-			for (int i = 0; i < items.length; i++) {
-				Property property = (Property)items[i];
-				properties.put(property.getName(), property.getValue());
-			}
-		}
-		
-		configuration.setAttribute(IAntUIConstants.ATTR_ANT_PROPERTIES, properties);
-		
-		items= antPropertiesBlock.getPropertyFiles();
-		String files= null;
-		if (items.length > 0) {
-			StringBuffer buff= new StringBuffer();
-			for (int i = 0; i < items.length; i++) {
-				String path = (String)items[i];
-				buff.append(path);
-				buff.append(',');
-			}
-			files= buff.toString();
-		}
-		
-		configuration.setAttribute(IAntUIConstants.ATTR_ANT_PROPERTY_FILES, files);
-	}
-
-	/**
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#setDefaults(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy)
-	 */
-	public void setDefaults(ILaunchConfigurationWorkingCopy configuration) {
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ant.ui.internal.preferences.IAntBlockContainer#createPushButton(org.eclipse.swt.widgets.Composite, java.lang.String)
-	 */
-	public void setMessage(String message) {
-		super.setMessage(message);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ant.ui.internal.preferences.IAntBlockContainer#createPushButton(org.eclipse.swt.widgets.Composite, java.lang.String)
-	 */
-	public void setErrorMessage(String message) {
-		super.setErrorMessage(message);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ant.ui.internal.preferences.IAntBlockContainer#createPushButton(org.eclipse.swt.widgets.Composite, java.lang.String)
-	 */
-	public Button createPushButton(Composite parent, String buttonText) {
-		return super.createPushButton(parent, buttonText, null);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ant.ui.internal.preferences.IAntBlockContainer#createPushButton(org.eclipse.swt.widgets.Composite, java.lang.String)
-	 */
-	public void update() {
-		updateLaunchConfigurationDialog();
-	}
-}
diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/launchConfigurations/AntRunActionDelegate.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/launchConfigurations/AntRunActionDelegate.java
deleted file mode 100644
index 3e56085..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/launchConfigurations/AntRunActionDelegate.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.ui.internal.launchConfigurations;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.debug.core.ILaunchManager;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ui.IObjectActionDelegate;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.actions.ActionDelegate;
-
-/**
- * Action delegate to launch Ant on a build file.
- */
-public class AntRunActionDelegate extends ActionDelegate implements IObjectActionDelegate {
-	private IFile selectedFile;
-	private IWorkbenchPart part;
-
-	/* (non-Javadoc)
-	 * Method declared on IActionDelegate.
-	 */
-	public void run(IAction action) {
-		if (part != null && selectedFile != null) {
-			AntLaunchShortcut shortcut = new AntLaunchShortcut();
-			shortcut.setShowDialog(true);
-			shortcut.launch(selectedFile, ILaunchManager.RUN_MODE);
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * Method declared on IActionDelegate.
-	 */
-	public void selectionChanged(IAction action, ISelection selection) {
-		selectedFile = null;
-		if (selection instanceof IStructuredSelection) {
-			IStructuredSelection structuredSelection = (IStructuredSelection) selection;
-			if (structuredSelection.size() == 1) {
-				Object selectedResource = structuredSelection.getFirstElement();
-				if (selectedResource instanceof IFile)
-					selectedFile = (IFile) selectedResource;
-			}
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * Method declared on IObjectActionDelegate.
-	 */
-	public void setActivePart(IAction action, IWorkbenchPart targetPart) {
-		this.part = targetPart;
-	}
-}
diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/launchConfigurations/AntStreamMonitor.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/launchConfigurations/AntStreamMonitor.java
deleted file mode 100644
index c1362c3..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/launchConfigurations/AntStreamMonitor.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.ui.internal.launchConfigurations;
-
-
-import org.eclipse.debug.core.IStreamListener;
-import org.eclipse.debug.core.model.IFlushableStreamMonitor;
-import org.eclipse.debug.internal.core.ListenerList;
-
-/**
- * Stream monitor implementation for an Ant build process.
- */
-public class AntStreamMonitor implements IFlushableStreamMonitor {
-
-	private StringBuffer fContents = new StringBuffer();
-	private ListenerList fListeners = new ListenerList(1);
-	private boolean fBuffered = true;
-	
-	/**
-	 * @see org.eclipse.debug.core.model.IStreamMonitor#addListener(org.eclipse.debug.core.IStreamListener)
-	 */
-	public void addListener(IStreamListener listener) {
-		fListeners.add(listener);
-	}
-
-	/**
-	 * @see org.eclipse.debug.core.model.IStreamMonitor#getContents()
-	 */
-	public String getContents() {
-		return fContents.toString();
-	}
-
-	/**
-	 * @see org.eclipse.debug.core.model.IStreamMonitor#removeListener(org.eclipse.debug.core.IStreamListener)
-	 */
-	public void removeListener(IStreamListener listener) {
-		fListeners.remove(listener);
-	}
-
-	/**
-	 * Appends the given message to this stream, and notifies listeners.
-	 * 
-	 * @param message
-	 */
-	public void append(String message) {
-		if (isBuffered()) {
-			fContents.append(message);
-		}
-		Object[] listeners = fListeners.getListeners();
-		for (int i = 0; i < listeners.length; i++) {
-			IStreamListener listener = (IStreamListener)listeners[i];
-			listener.streamAppended(message, this);
-		}
-	}
-	/**
-	 * @see org.eclipse.debug.core.model.IFlushableStreamMonitor#flushContents()
-	 */
-	public void flushContents() {
-		fContents.setLength(0);
-	}
-
-	/**
-	 * @see org.eclipse.debug.core.model.IFlushableStreamMonitor#isBuffered()
-	 */
-	public boolean isBuffered() {
-		return fBuffered;
-	}
-
-	/**
-	 * @see org.eclipse.debug.core.model.IFlushableStreamMonitor#setBuffered(boolean)
-	 */
-	public void setBuffered(boolean buffer) {
-		fBuffered = buffer;
-	}
-}
-
diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/launchConfigurations/AntStreamsProxy.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/launchConfigurations/AntStreamsProxy.java
deleted file mode 100644
index a214815..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/launchConfigurations/AntStreamsProxy.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.ui.internal.launchConfigurations;
-
-
-import java.io.IOException;
-
-import org.eclipse.ant.ui.internal.model.IAntUIConstants;
-import org.eclipse.debug.core.model.IStreamMonitor;
-import org.eclipse.debug.core.model.IStreamsProxy;
-
-/**
- * 
- */
-public class AntStreamsProxy implements IStreamsProxy {
-	
-	private AntStreamMonitor fErrorMonitor = new AntStreamMonitor();
-	private AntStreamMonitor fOutputMonitor = new AntStreamMonitor();
-	
-	public static final String ANT_DEBUG_STREAM = IAntUIConstants.PLUGIN_ID + ".ANT_DEBUG_STREAM"; //$NON-NLS-1$
-	public static final String ANT_VERBOSE_STREAM = IAntUIConstants.PLUGIN_ID + ".ANT_VERBOSE_STREAM"; //$NON-NLS-1$
-	public static final String ANT_WARNING_STREAM = IAntUIConstants.PLUGIN_ID + ".ANT_WARNING_STREAM"; //$NON-NLS-1$
-	
-	private AntStreamMonitor fDebugMonitor = new AntStreamMonitor();
-	private AntStreamMonitor fVerboseMonitor = new AntStreamMonitor();
-	private AntStreamMonitor fWarningMonitor = new AntStreamMonitor();
-
-	/**
-	 * @see org.eclipse.debug.core.model.IStreamsProxy#getErrorStreamMonitor()
-	 */
-	public IStreamMonitor getErrorStreamMonitor() {
-		return fErrorMonitor;
-	}
-
-	/**
-	 * @see org.eclipse.debug.core.model.IStreamsProxy#getOutputStreamMonitor()
-	 */
-	public IStreamMonitor getOutputStreamMonitor() {
-		return fOutputMonitor;
-	}
-
-	/**
-	 * @see org.eclipse.debug.core.model.IStreamsProxy#write(java.lang.String)
-	 */
-	public void write(String input) throws IOException {
-	}
-
-	public IStreamMonitor getWarningStreamMonitor() {
-		return fWarningMonitor;
-	}
-	
-	public IStreamMonitor getDebugStreamMonitor() {
-		return fDebugMonitor;
-	}	
-	
-	public IStreamMonitor getVerboseStreamMonitor() {
-		return fVerboseMonitor;
-	}	
-}
diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/launchConfigurations/AntTabGroup.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/launchConfigurations/AntTabGroup.java
deleted file mode 100644
index 5692b3c..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/launchConfigurations/AntTabGroup.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.ui.internal.launchConfigurations;
-
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.debug.core.DebugPlugin;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.debug.core.variables.ExpandVariableContext;
-import org.eclipse.debug.core.variables.ILaunchVariableConstants;
-import org.eclipse.debug.core.variables.LaunchVariableUtil;
-import org.eclipse.debug.ui.AbstractLaunchConfigurationTabGroup;
-import org.eclipse.debug.ui.CommonTab;
-import org.eclipse.debug.ui.ILaunchConfigurationDialog;
-import org.eclipse.debug.ui.ILaunchConfigurationTab;
-import org.eclipse.debug.ui.launchVariables.RefreshTab;
-import org.eclipse.debug.ui.launchVariables.LaunchVariableContextManager;
-import org.eclipse.ui.externaltools.internal.model.IExternalToolConstants;
-
-
-public class AntTabGroup extends AbstractLaunchConfigurationTabGroup {
-
-	/**
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTabGroup#createTabs(org.eclipse.debug.ui.ILaunchConfigurationDialog, java.lang.String)
-	 */
-	public void createTabs(ILaunchConfigurationDialog dialog, String mode) {
-		ILaunchConfigurationTab[] tabs = new ILaunchConfigurationTab[] {
-			new AntMainTab(true),
-			new RefreshTab(),
-			new AntTargetsTab(),
-			new AntClasspathTab(),
-			new AntPropertiesTab(),
-			new AntJRETab(),
-			new CommonTab()
-		};
-		setTabs(tabs);
-	}
-	
-	/**
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTabGroup#setDefaults(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy)
-	 */
-	public void setDefaults(ILaunchConfigurationWorkingCopy configuration) {
-		super.setDefaults(configuration);
-		// set default name for script
-		LaunchVariableContextManager manager = LaunchVariableContextManager.getDefault();
-		ExpandVariableContext context = manager.getVariableContext();
-		IResource resource = context.getSelectedResource();
-		if (resource != null && resource instanceof IFile) {
-			IFile file = (IFile)resource;
-			String extension = file.getFileExtension();
-			if (extension != null && extension.equalsIgnoreCase("xml")) { //$NON-NLS-1$
-				StringBuffer buffer = new StringBuffer(file.getProject().getName());
-				buffer.append(" "); //$NON-NLS-1$
-				buffer.append(file.getName());
-				String name = buffer.toString().trim();
-				name= DebugPlugin.getDefault().getLaunchManager().generateUniqueLaunchConfigurationNameFrom(name);
-				configuration.rename(name);
-				
-				StringBuffer buf = new StringBuffer();
-				LaunchVariableUtil.buildVariableTag(ILaunchVariableConstants.VAR_WORKSPACE_LOC, file.getFullPath().toString(), buf);
-				String text= buf.toString();
-				if (text != null) {
-					configuration.setAttribute(IExternalToolConstants.ATTR_LOCATION, text);
-				}
-			}		
-		}
-	}	
-}
diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/launchConfigurations/AntTargetContentProvider.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/launchConfigurations/AntTargetContentProvider.java
deleted file mode 100644
index a0d5d38..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/launchConfigurations/AntTargetContentProvider.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.ui.internal.launchConfigurations;
-
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.Viewer;
-
-public class AntTargetContentProvider implements IStructuredContentProvider {
-
-	protected List elements = new ArrayList();
-	protected TableViewer viewer;
-
-	public void add(Object o) {
-		elements.add(o);
-		viewer.add(o);
-	}
-	
-	public void addAll(List list) {
-		elements.addAll(list);
-		viewer.add(list.toArray());
-	}
-
-	public void dispose() {
-	}
-
-	public Object[] getElements(Object inputElement) {
-		if (elements.isEmpty()) {
-			return new Object[0];
-		} else {
-			return (Object[]) elements.toArray(new Object[elements.size()]);
-		}
-	}
-
-	public void inputChanged(Viewer newViewer, Object oldInput, Object newInput) {
-		this.viewer = (TableViewer) newViewer;
-		elements.clear();
-		if (newInput != null && ((Object[]) newInput).length != 0) {
-			elements.addAll(Arrays.asList((Object[]) newInput));
-		}
-	}
-	
-	/**
-	 * Removes the given target from the list of targets. Has no effect if the
-	 * given target does not exist in the list.
-	 * 
-	 * @param target the target to remove
-	 */
-	public void removeTarget(Object target) {
-		elements.remove(target);
-		viewer.remove(target);
-	}
-
-	/**
-	 * Moves the given target up in the list of active targets. Has no effect if
-	 * the given target is already the first target in the list or the given
-	 * index is invalid.
-	 * 
-	 * @param index the index of the target to move up
-	 */
-	public void moveUpTarget(int index) {
-		Object target = elements.get(index);
-		if (index == 0 || target == null) {
-			return;
-		}
-		elements.set(index, elements.get(index - 1));
-		elements.set(index - 1, target);
-	}
-
-	/**
-	 * Moves the given target down in the list of active targets. Has no effect
-	 * if the given target is already the last target in the list or the given
-	 * index is invalid.
-	 *
-	 * @param index the index of the target to move down
-	 */
-	public void moveDownTarget(int index) {
-		Object target = elements.get(index);
-		if (index == elements.size() - 1 || target == null) {
-			return;
-		}
-		elements.set(index, elements.get(index + 1));
-		elements.set(index + 1, target);
-	}
-}
diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/launchConfigurations/AntTargetsTab.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/launchConfigurations/AntTargetsTab.java
deleted file mode 100644
index d64d29e..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/launchConfigurations/AntTargetsTab.java
+++ /dev/null
@@ -1,421 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.ui.internal.launchConfigurations;
-
-
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Comparator;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.ant.core.TargetInfo;
-import org.eclipse.ant.ui.internal.model.AntUIImages;
-import org.eclipse.ant.ui.internal.model.AntUIPlugin;
-import org.eclipse.ant.ui.internal.model.AntUtil;
-import org.eclipse.ant.ui.internal.model.IAntUIConstants;
-import org.eclipse.ant.ui.internal.model.IAntUIHelpContextIds;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.MultiStatus;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.debug.core.variables.LaunchVariableUtil;
-import org.eclipse.debug.ui.AbstractLaunchConfigurationTab;
-import org.eclipse.debug.ui.launchVariables.LaunchVariableContextManager;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.viewers.CheckStateChangedEvent;
-import org.eclipse.jface.viewers.CheckboxTableViewer;
-import org.eclipse.jface.viewers.ColumnWeightData;
-import org.eclipse.jface.viewers.DoubleClickEvent;
-import org.eclipse.jface.viewers.ICheckStateListener;
-import org.eclipse.jface.viewers.IDoubleClickListener;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.TableLayout;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.externaltools.internal.launchConfigurations.ExternalToolsUtil;
-import org.eclipse.ui.externaltools.internal.model.IExternalToolConstants;
-import org.eclipse.ui.help.WorkbenchHelp;
-
-public class AntTargetsTab extends AbstractLaunchConfigurationTab {
-	
-	private TargetInfo fDefaultTarget = null;
-	private TargetInfo[] fAllTargets= null;
-	private List fOrderedTargets = null;
-	
-	private String fLocation= null;
-	
-	private CheckboxTableViewer fTableViewer = null;
-	private Label fSelectionCountLabel = null;
-	private Text fTargetOrderText = null;
-	private Button fOrderButton = null;
-	
-	private ILaunchConfiguration fLaunchConfiguration;
-	
-	/**
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#createControl(org.eclipse.swt.widgets.Composite)
-	 */
-	public void createControl(Composite parent) {
-		Font font = parent.getFont();
-		
-		Composite comp = new Composite(parent, SWT.NONE);
-		setControl(comp);
-		WorkbenchHelp.setHelp(getControl(), IAntUIHelpContextIds.ANT_TARGETS_TAB);
-		 
-		GridLayout topLayout = new GridLayout();
-		comp.setLayout(topLayout);		
-		GridData gd = new GridData(GridData.FILL_BOTH);
-		comp.setLayoutData(gd);
-		comp.setFont(font);
-		
-		Label label = new Label(comp, SWT.NONE);
-		label.setFont(font);
-		label.setText(AntLaunchConfigurationMessages.getString("AntTargetsTab.Check_targets_to_e&xecute__1")); //$NON-NLS-1$
-				
-		createTargetsTable(comp);
-		
-		fSelectionCountLabel = new Label(comp, SWT.NONE);
-		fSelectionCountLabel.setFont(font);
-		fSelectionCountLabel.setText(AntLaunchConfigurationMessages.getString("AntTargetsTab.0_out_of_0_selected_2")); //$NON-NLS-1$
-		gd = new GridData(GridData.FILL_HORIZONTAL);
-		fSelectionCountLabel.setLayoutData(gd);
-		
-		// spacer
-		label = new Label(comp, SWT.NONE);
-		label.setFont(font);
-		
-		label = new Label(comp, SWT.NONE);
-		label.setText(AntLaunchConfigurationMessages.getString("AntTargetsTab.Target_execution_order__3")); //$NON-NLS-1$
-		label.setFont(font);
-		
-		Composite orderComposite = new Composite(comp, SWT.NONE);
-		gd = new GridData(GridData.FILL_HORIZONTAL);
-		orderComposite.setLayoutData(gd);
-		GridLayout layout = new GridLayout(2, false);
-		layout.marginHeight = 0;
-		layout.marginWidth = 0;
-		orderComposite.setLayout(layout);
-		orderComposite.setFont(font);
-				
-		fTargetOrderText = new Text(orderComposite, SWT.MULTI | SWT.WRAP | SWT.BORDER | SWT.V_SCROLL | SWT.READ_ONLY);
-		fTargetOrderText.setFont(font);
-		gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.heightHint = 40;
-		gd.widthHint = IDialogConstants.ENTRY_FIELD_WIDTH;
-		fTargetOrderText.setLayoutData(gd);
-
-		fOrderButton = createPushButton(orderComposite, AntLaunchConfigurationMessages.getString("AntTargetsTab.&Order..._4"), null); //$NON-NLS-1$
-		gd = (GridData)fOrderButton.getLayoutData();
-		gd.verticalAlignment = GridData.BEGINNING;
-		fOrderButton.setFont(font);
-		fOrderButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				handleOrderPressed();
-			}
-		});
-	}
-	
-	private void handleOrderPressed() {
-		TargetOrderDialog dialog = new TargetOrderDialog(getShell(), fOrderedTargets.toArray());
-		int ok = dialog.open();
-		if (ok == Dialog.OK) {
-			fOrderedTargets.clear();
-			Object[] targets = dialog.getTargets();
-			for (int i = 0; i < targets.length; i++) {
-				fOrderedTargets.add(targets[i]);
-				updateSelectionCount();
-				updateLaunchConfigurationDialog();
-			}
-		}
-	}
-	
-	private void createTargetsTable(Composite parent) {
-		Table table= new Table(parent, SWT.CHECK | SWT.BORDER | SWT.FULL_SELECTION | SWT.RESIZE);
-		
-		GridData data= new GridData(GridData.FILL_BOTH);
-		data.heightHint = 200;
-		data.widthHint = 250;
-		table.setLayoutData(data);
-		table.setFont(parent.getFont());
-				
-		table.setHeaderVisible(true);
-		table.setLinesVisible(true);		
-
-		TableLayout tableLayout= new TableLayout();
-		ColumnWeightData weightData = new ColumnWeightData(30, true);
-		tableLayout.addColumnData(weightData);
-		weightData = new ColumnWeightData(70, true);
-		tableLayout.addColumnData(weightData);		
-		table.setLayout(tableLayout);
-
-		TableColumn column1= new TableColumn(table, SWT.NULL);
-		column1.setText(AntLaunchConfigurationMessages.getString("AntTargetsTab.Name_5")); //$NON-NLS-1$
-			
-		TableColumn column2= new TableColumn(table, SWT.NULL);
-		column2.setText(AntLaunchConfigurationMessages.getString("AntTargetsTab.Description_6")); //$NON-NLS-1$
-		
-		fTableViewer = new CheckboxTableViewer(table);
-		fTableViewer.setLabelProvider(new TargetTableLabelProvider());
-		fTableViewer.setContentProvider(new AntTargetContentProvider());
-		
-		fTableViewer.addDoubleClickListener(new IDoubleClickListener() {
-			public void doubleClick(DoubleClickEvent event) {
-				ISelection selection= event.getSelection();
-				if (selection instanceof IStructuredSelection) {
-					IStructuredSelection ss= (IStructuredSelection)selection;
-					Object element= ss.getFirstElement();
-					boolean checked= !fTableViewer.getChecked(element);
-					fTableViewer.setChecked(element, checked);
-					updateOrderedTargets(element , checked);
-				}
-			}
-		});
-		
-		fTableViewer.addCheckStateListener(new ICheckStateListener() {
-			public void checkStateChanged(CheckStateChangedEvent event) {
-				updateOrderedTargets(event.getElement(), event.getChecked());
-			}
-		});
-	}
-	
-	private void updateOrderedTargets(Object element , boolean checked) {
-		if (checked) {
-			 fOrderedTargets.add(element);
-		} else {
-			fOrderedTargets.remove(element);
-		}	 
-		updateSelectionCount();
-		updateLaunchConfigurationDialog();	
-	}
-	
-	private void updateSelectionCount() {
-		Object[] checked = fTableViewer.getCheckedElements();
-		String numSelected = Integer.toString(checked.length);
-		int length= 0;
-		if (fAllTargets != null) {
-			length= fAllTargets.length;
-		}
-		String total = Integer.toString(length);
-		fSelectionCountLabel.setText(MessageFormat.format(AntLaunchConfigurationMessages.getString("AntTargetsTab.{0}_out_of_{1}_selected_7"), new String[]{numSelected, total})); //$NON-NLS-1$
-		
-		fOrderButton.setEnabled(checked.length > 1);
-		
-		StringBuffer buffer = new StringBuffer();
-		Iterator iter = fOrderedTargets.iterator();
-		while (iter.hasNext()) {
-			buffer.append(((TargetInfo)iter.next()).getName());
-			buffer.append(", "); //$NON-NLS-1$
-		}
-		if (buffer.length() > 2) {
-			// remove trailing comma
-			buffer.setLength(buffer.length() - 2);
-		}
-		fTargetOrderText.setText(buffer.toString());
-	}
-	
-	private TargetInfo[] getTargets() {
-		if (fAllTargets == null) {
-			setErrorMessage(null);
-			MultiStatus status = new MultiStatus(IAntUIConstants.PLUGIN_ID, 0, "", null); //$NON-NLS-1$
-			String expandedLocation = LaunchVariableUtil.expandVariables(fLocation, status, LaunchVariableContextManager.getDefault().getVariableContext());
-			if (expandedLocation != null && status.isOK()) {
-				try {
-					String[] arguments = ExternalToolsUtil.getArguments(fLaunchConfiguration);
-					fAllTargets = AntUtil.getTargets(expandedLocation, arguments, fLaunchConfiguration);
-				} catch (CoreException ce) {
-					IStatus exceptionStatus= ce.getStatus();
-					IStatus[] children= exceptionStatus.getChildren();
-					StringBuffer message= new StringBuffer(ce.getMessage());
-					for (int i = 0; i < children.length; i++) {
-						message.append(' ');
-						IStatus childStatus = children[i];
-						message.append(childStatus.getMessage());
-					}
-					setErrorMessage(message.toString());
-					fAllTargets= null;
-					return fAllTargets;
-				}
-				for (int i=0; i < fAllTargets.length; i++) {
-					if (fAllTargets[i].isDefault()) {
-						fDefaultTarget = fAllTargets[i];
-						break;
-					}
-				}
-			}
-				
-			if (fAllTargets != null) {
-				Arrays.sort(fAllTargets, new Comparator() {
-					public int compare(Object o1, Object o2) {
-						TargetInfo t1= (TargetInfo)o1;
-						TargetInfo t2= (TargetInfo)o2;
-						return t1.getName().compareToIgnoreCase(t2.getName());
-					}
-					public boolean equals(Object obj) {
-						return false;
-					}
-				});
-			}
-		}
-		return fAllTargets;
-	}
-	
-	/**
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#setDefaults(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy)
-	 */
-	public void setDefaults(ILaunchConfigurationWorkingCopy configuration) {
-	}
-
-	/**
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#initializeFrom(org.eclipse.debug.core.ILaunchConfiguration)
-	 */
-	public void initializeFrom(ILaunchConfiguration configuration) {
-		fLaunchConfiguration= configuration;
-		setErrorMessage(null);
-		setMessage(null);
-		String configTargets= null;
-		String newLocation= null;
-		fOrderedTargets = new ArrayList();
-		try {
-			configTargets= configuration.getAttribute(IAntUIConstants.ATTR_ANT_TARGETS, (String)null);
-			newLocation= configuration.getAttribute(IExternalToolConstants.ATTR_LOCATION, (String)null);
-		} catch (CoreException ce) {
-			AntUIPlugin.log(AntLaunchConfigurationMessages.getString("AntTargetsTab.Error_reading_configuration_12"), ce); //$NON-NLS-1$
-		}
-		
-		if (newLocation == null) {
-			fAllTargets= null;
-			fLocation= newLocation;
-			setExecuteInput(new TargetInfo[0]);
-			fTableViewer.setInput(new TargetInfo[0]);
-			return; 
-		}
-		
-		if (!newLocation.equals(fLocation)) {
-			fAllTargets= null;
-			fLocation= newLocation;
-		}
-		
-		TargetInfo[] allInfos= getTargets();
-		if (allInfos == null) {
-			setExecuteInput(new TargetInfo[0]);
-			fTableViewer.setInput(new TargetInfo[0]);
-			return; 
-		}
-		
-		String[] targetNames= AntUtil.parseRunTargets(configTargets);
-		if (targetNames.length == 0) {
-			fOrderedTargets.add(fDefaultTarget);
-			fTableViewer.setAllChecked(false);
-			setExecuteInput(allInfos);
-			if (fDefaultTarget != null) {
-				fTableViewer.setChecked(fDefaultTarget, true);
-			}
-			updateSelectionCount();
-			return;
-		}
-		
-		setExecuteInput(allInfos);
-		fTableViewer.setAllChecked(false);
-		for (int i = 0; i < targetNames.length; i++) {
-			for (int j = 0; j < fAllTargets.length; j++) {
-				if (targetNames[i].equals(fAllTargets[j].getName())) {
-					fOrderedTargets.add(fAllTargets[j]);
-					fTableViewer.setChecked(fAllTargets[j], true);
-				}
-			}
-		}
-		updateSelectionCount();
-	}
-	
-	/**
-	 * Sets the execute table's input to the given input.
-	 */
-	private void setExecuteInput(Object input) {
-		fTableViewer.setInput(input);
-		updateSelectionCount();
-	}
-
-	/**
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#performApply(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy)
-	 */
-	public void performApply(ILaunchConfigurationWorkingCopy configuration) {		
-		if (fOrderedTargets.size() == 1) {
-			TargetInfo item = (TargetInfo)fOrderedTargets.get(0);
-			if (item.isDefault()) {
-				configuration.setAttribute(IAntUIConstants.ATTR_ANT_TARGETS, (String)null);
-				return;
-			}
-		} else if (fOrderedTargets.size() == 0) {
-			return;
-		}
-		
-		StringBuffer buff= new StringBuffer();
-		Iterator iter = fOrderedTargets.iterator();
-		String targets = null;
-		while (iter.hasNext()) {
-			TargetInfo item = (TargetInfo)iter.next();
-			buff.append(item.getName());
-			buff.append(',');
-		}
-		if (buff.length() > 0) {
-			targets= buff.toString();
-		}  
-
-		configuration.setAttribute(IAntUIConstants.ATTR_ANT_TARGETS, targets);
-	}
-
-	/**
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#getName()
-	 */
-	public String getName() {
-		return AntLaunchConfigurationMessages.getString("AntTargetsTab.Tar&gets_14"); //$NON-NLS-1$
-	}
-		
-	/**
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#getImage()
-	 */
-	public Image getImage() {
-		return AntUIImages.getImage(IAntUIConstants.IMG_TAB_ANT_TARGETS);
-	}
-
-	/**
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#isValid(org.eclipse.debug.core.ILaunchConfiguration)
-	 */
-	public boolean isValid(ILaunchConfiguration launchConfig) {
-		if (fAllTargets == null && getErrorMessage() != null) {
-			//error in parsing;
-			return false;
-		}
-		setErrorMessage(null);
-		setMessage(null);
-		
-		if (fAllTargets != null && fTableViewer.getCheckedElements().length == 0) {
-			setErrorMessage(AntLaunchConfigurationMessages.getString("AntTargetsTab.No_targets")); //$NON-NLS-1$
-			return false;
-		}
-		return super.isValid(launchConfig);
-	}
-}
diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/launchConfigurations/RunAntStatusHandler.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/launchConfigurations/RunAntStatusHandler.java
deleted file mode 100644
index b1b964f..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/launchConfigurations/RunAntStatusHandler.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.ui.internal.launchConfigurations;
-
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.debug.core.IStatusHandler;
-import org.eclipse.debug.ui.ILaunchConfigurationDialog;
-
-/**
- * Status handler called when the launch dialog is opened via the "Run Ant..."
- * action. This allows us to set the initial tab.
- */
-public class RunAntStatusHandler implements IStatusHandler {
-
-	/**
-	 * @see org.eclipse.debug.core.IStatusHandler#handleStatus(org.eclipse.core.runtime.IStatus, java.lang.Object)
-	 */
-	public Object handleStatus(IStatus status, Object source) throws CoreException {
-		ILaunchConfigurationDialog dialog = (ILaunchConfigurationDialog)source;
-		dialog.setActiveTab(2);
-		return null;
-	}
-
-}
diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/launchConfigurations/TargetOrderDialog.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/launchConfigurations/TargetOrderDialog.java
deleted file mode 100644
index 63c9109..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/launchConfigurations/TargetOrderDialog.java
+++ /dev/null
@@ -1,201 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.ui.internal.launchConfigurations;
-
-
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.ui.externaltools.internal.model.IExternalToolsHelpContextIds;
-import org.eclipse.ui.help.WorkbenchHelp;
-
-/**
- * Dialog to specify target execution order
- */
-public class TargetOrderDialog extends Dialog implements ISelectionChangedListener {
-	
-	private Button fUp;
-	private Button fDown;
-	private TableViewer fViewer;
-	private AntTargetContentProvider fContentProvider;
-	private Object[] fTargets;
-
-	/**
-	 * Constructs the dialog.
-	 * 
-	 * @param parentShell
-	 */
-	public TargetOrderDialog(Shell parentShell, Object[] targets) {
-		super(parentShell);
-		fTargets = targets;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite)
-	 */
-	protected Control createDialogArea(Composite parent) {
-		getShell().setText(AntLaunchConfigurationMessages.getString("TargetOrderDialog.Order_Targets_1")); //$NON-NLS-1$
-		
-		Composite comp = new Composite(parent, SWT.NONE);
-		GridLayout layout = new GridLayout(2, false);
-		comp.setLayout(layout);
-		GridData gd = new GridData(GridData.FILL_BOTH);
-		comp.setLayoutData(gd);
-		
-		Label label = new Label(comp, SWT.NONE);
-		label.setText(AntLaunchConfigurationMessages.getString("TargetOrderDialog.&Specify_target_execution_order__2")); //$NON-NLS-1$
-		label.setFont(comp.getFont());
-		gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.horizontalSpan = 2;
-		label.setLayoutData(gd);		
-		
-		createTargetList(comp);
-		
-		createButtons(comp);
-		
-		updateButtons();
-		
-		return comp;
-	}
-
-	/**
-	 * Create button area & buttons
-	 * 
-	 * @param comp
-	 */
-	private void createButtons(Composite parent) {
-		Composite comp = new Composite(parent, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		GridData gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
-		gd.verticalAlignment = GridData.BEGINNING;
-		comp.setLayout(layout);
-		comp.setLayoutData(gd);
-		
-		fUp = new Button(comp, SWT.PUSH);
-		fUp.setFont(parent.getFont());
-		fUp.setText(AntLaunchConfigurationMessages.getString("TargetOrderDialog.&Up_3")); //$NON-NLS-1$
-		setButtonLayoutData(fUp);
-		fUp.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				handleUpPressed();
-			}
-		});
-		
-		fDown = new Button(comp, SWT.PUSH);
-		fDown.setFont(parent.getFont());
-		fDown.setText(AntLaunchConfigurationMessages.getString("TargetOrderDialog.&Down_4")); //$NON-NLS-1$
-		setButtonLayoutData(fDown);
-		fDown.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				handleDownPressed();
-			}
-		});
-		
-	}
-
-	/**
-	 * Down
-	 */
-	protected void handleDownPressed() {
-		int[] selections = fViewer.getTable().getSelectionIndices();
-		for (int i = 0; i < selections.length; i++) {
-			fContentProvider.moveDownTarget(selections[i]);
-		}
-		fTargets = fContentProvider.getElements(null);
-		fViewer.refresh();
-		updateButtons();
-	}
-
-	/**
-	 * Up
-	 */
-	protected void handleUpPressed() {
-		int[] selections = fViewer.getTable().getSelectionIndices();
-		for (int i = 0; i < selections.length; i++) {
-			fContentProvider.moveUpTarget(selections[i]);
-		}		
-		fTargets = fContentProvider.getElements(null);
-		fViewer.refresh();
-		updateButtons();
-	}
-
-	/**
-	 * Creates a list viewer for the targets
-	 * 
-	 * @param comp
-	 */
-	private void createTargetList(Composite comp) {
-		fViewer = new TableViewer(comp, SWT.MULTI | SWT.FULL_SELECTION | SWT.BORDER);
-		fViewer.setLabelProvider(new TargetTableLabelProvider());
-		fContentProvider = new AntTargetContentProvider();
-		fViewer.setContentProvider(fContentProvider);
-		fViewer.setInput(fTargets);
-		fViewer.addSelectionChangedListener(this);
-		Table table = fViewer.getTable();
-		GridData gd = new GridData(GridData.FILL_BOTH);
-		gd.heightHint = 200;
-		gd.widthHint = 250;		
-		table.setLayoutData(gd);
-	}
-	
-	/**
-	 * Returns the ordered targets
-	 */
-	public Object[] getTargets() {
-		return fTargets;
-	}
-	
-	/**
-	 * Update button enablement
-	 * 
-	 * @see org.eclipse.jface.viewers.ISelectionChangedListener#selectionChanged(org.eclipse.jface.viewers.SelectionChangedEvent)
-	 */
-	public void selectionChanged(SelectionChangedEvent event) {
-		updateButtons();
-	}
-	
-	private void updateButtons() {
-		int[] selections = fViewer.getTable().getSelectionIndices();
-		int last = fTargets.length - 1;
-		boolean up = true && selections.length > 0;
-		boolean down = true && selections.length > 0;
-		for (int i = 0; i < selections.length; i++) {
-			if (selections[i] == 0) {
-				up = false;
-			}
-			if (selections[i] == last) {
-				down = false;
-			}
-		}
-		fUp.setEnabled(up);
-		fDown.setEnabled(down);		
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.window.Window#configureShell(org.eclipse.swt.widgets.Shell)
-	 */
-	protected void configureShell(Shell shell) {
-		super.configureShell(shell);
-		WorkbenchHelp.setHelp(shell, IExternalToolsHelpContextIds.TARGET_ORDER_DIALOG);
-	}
-}
diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/launchConfigurations/TargetTableLabelProvider.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/launchConfigurations/TargetTableLabelProvider.java
deleted file mode 100644
index ec2c1af..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/launchConfigurations/TargetTableLabelProvider.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.ui.internal.launchConfigurations;
-
-import org.eclipse.ant.core.TargetInfo;
-import org.eclipse.ant.ui.internal.model.AntImageDescriptor;
-import org.eclipse.ant.ui.internal.model.AntUIImages;
-import org.eclipse.ant.ui.internal.model.IAntUIConstants;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.IColorProvider;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-
-/**
- * Ant target label provider
- */
-public class TargetTableLabelProvider extends LabelProvider implements ITableLabelProvider, IColorProvider {
-
-	public TargetTableLabelProvider() {
-		super();
-	}
-	
-	/* (non-Javadoc)
-	 * Method declared on ILabelProvider.
-	 */
-	public String getText(Object model) {
-		TargetInfo target = (TargetInfo) model;
-		StringBuffer result = new StringBuffer(target.getName());
-		if (target.isDefault()) {
-			result.append(" ("); //$NON-NLS-1$;
-			result.append(AntLaunchConfigurationMessages.getString("AntTargetLabelProvider.default_target_1")); //$NON-NLS-1$
-			result.append(")"); //$NON-NLS-1$;
-		}
-		return result.toString();
-	}
-
-	/**
-	 * @see org.eclipse.jface.viewers.ILabelProvider#getImage(java.lang.Object)
-	 */
-	public Image getImage(Object element) {
-		TargetInfo target = (TargetInfo)element;
-		ImageDescriptor base = null;
-		int flags = 0;
-		if (target.isDefault()) {
-			flags = flags | AntImageDescriptor.DEFAULT_TARGET;
-			base = AntUIImages.getImageDescriptor(IAntUIConstants.IMG_ANT_DEFAULT_TARGET);
-		} else if (target.getDescription() == null) {
-			base = AntUIImages.getImageDescriptor(IAntUIConstants.IMG_ANT_TARGET_PRIVATE);
-		} else {
-			base = AntUIImages.getImageDescriptor(IAntUIConstants.IMG_ANT_TARGET);
-		}
-		return AntUIImages.getImage(new AntImageDescriptor(base, flags));
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnImage(java.lang.Object, int)
-	 */
-	public Image getColumnImage(Object element, int columnIndex) {
-		if (columnIndex == 0) {
-			return getImage(element);
-		}
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnText(java.lang.Object, int)
-	 */
-	public String getColumnText(Object element, int columnIndex) {
-		if (columnIndex == 0){
-			return getText(element);
-		}
-		String desc = ((TargetInfo)element).getDescription();
-		if (desc == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return desc;
-	}
-
-	public Color getForeground(Object element) {
-		if (!(element instanceof TargetInfo)) {
-			return null;
-		}
-		TargetInfo info = (TargetInfo) element;
-		if (info.isDefault()) {
-			return Display.getDefault().getSystemColor(SWT.COLOR_BLUE);
-		}
-		return null;
-	}
-
-	public Color getBackground(Object element) {
-		return null;
-	}
-
-}
diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/launchConfigurations/TaskLinkManager.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/launchConfigurations/TaskLinkManager.java
deleted file mode 100644
index 949f558..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/launchConfigurations/TaskLinkManager.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.ui.internal.launchConfigurations;
-
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.debug.core.model.IProcess;
-import org.eclipse.debug.ui.console.IConsole;
-import org.eclipse.debug.ui.console.IConsoleHyperlink;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IRegion;
-
-/**
- * Manages task links per process. As messages are logged to the console from
- * build events, hyperlinks are created to link task names to the associated ant
- * script. The build logger registers a task hyperlink with this manager for
- * each build event associated with a task. When the associated line is later
- * appended to the console, the corresponding text region in the console
- * document is determined (as the length of a console document can not be
- * determined beforehand), and the hyperlink is added to the document.
- */
-public class TaskLinkManager {
-	
-	/**
-	 * A map of processes to lists of queued task hyperlink entries
-	 */
-	private static Map fgProcessTable;
-	
-	private static class HyperlinkEntry {
-		private IConsoleHyperlink fLink;
-		private IRegion fRegion;
-		private String fTaskName;
-		
-		public HyperlinkEntry(IConsoleHyperlink link, IRegion region, String taskName) {
-			fLink = link;
-			fRegion = region;	
-			fTaskName = taskName;
-		}
-		
-		public IRegion getRegion() {
-			return fRegion;
-		}
-		
-		public IConsoleHyperlink getLink() {
-			return fLink;
-		}
-		
-		public String getTaskName() {
-			return fTaskName;
-		}
-	}
-
-	/**
-	 * Not to be called.
-	 */
-	private TaskLinkManager() {
-		super();
-	}
-	
-	/**
-	 * Registers a hyperlink for the given process and task name. The given
-	 * region is relative to the beginning of the line (not the document).
-	 * 
-	 * @param process
-	 * @param link
-	 * @param region
-	 * @param taskName
-	 */
-	public static void addTaskHyperlink(IProcess process, IConsoleHyperlink link, IRegion region, String taskName) {
-		if (fgProcessTable == null) {
-			fgProcessTable = new HashMap(10);
-			
-		}
-		List queue = (List)fgProcessTable.get(process);
-		if (queue == null) {
-			queue = new ArrayList(10);
-			fgProcessTable.put(process, queue);
-		}
-		synchronized (queue) {
-			queue.add(new HyperlinkEntry(link, region, taskName));
-		}
-	}
-
-	/**
-	 * A new line has been added to the given console. Adds any task hyperlink
-	 * associated with the line, to the console.
-	 * 
-	 * @param console
-	 * @param newLine
-	 */
-	public static void processNewLine(IConsole console, IRegion newLine) {
-		if (fgProcessTable == null) {
-			return;
-		}
-		IProcess process = console.getProcess();
-		List queue = (List)fgProcessTable.get(process);
-		if (queue == null) {
-			return;
-		}
-		synchronized (queue) {
-			for (int i = 0; i < queue.size(); i++) {
-				HyperlinkEntry entry = (HyperlinkEntry)queue.get(i);
-				IRegion region = entry.getRegion();
-				int offset = newLine.getOffset() + region.getOffset();
-				int length = region.getLength();
-				String text;
-				try {
-					text = console.getDocument().get(offset, length);
-				} catch (BadLocationException e) {
-					return;
-				}
-				if (text.equals(entry.getTaskName())) {
-					console.addLink(entry.getLink(), offset, length);
-					queue.remove(i);
-					return;
-				}
-			}
-		}
-	}
-	
-	/**
-	 * Disposes any information stored for the given process.
-	 * 
-	 * @param process
-	 */
-	public static void dispose(IProcess process) {
-		if (fgProcessTable != null) {
-			fgProcessTable.remove(process);
-		}
-	}
-	
-}
diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/model/AntImageDescriptor.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/model/AntImageDescriptor.java
deleted file mode 100644
index 0672fa4..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/model/AntImageDescriptor.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.ui.internal.model;
-
-import org.eclipse.jface.resource.CompositeImageDescriptor;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.swt.graphics.ImageData;
-import org.eclipse.swt.graphics.Point;
-
-/**
- * A image descriptor consisting of a main icon and several adornments. The adornments
- * are computed according to flags set on creation of the descriptor.
- */
-public class AntImageDescriptor extends CompositeImageDescriptor {
-	
-	/**
-	 * Flag to render the default target adornment. Not used anymore,
-	 * but left in case we want to add an adornment.
-	 */
-	public final static int DEFAULT_TARGET=	 			0x0001;
-	/** Flag to render the may be out of synch adornment */
-	public final static int HAS_ERRORS= 					0x0002;
-
-	private ImageDescriptor fBaseImage;
-	private int fFlags;
-	private Point fSize;
-	
-	/**
-	 * Create a new JDIImageDescriptor.
-	 * 
-	 * @param baseImage an image descriptor used as the base image
-	 * @param flags flags indicating which adornments are to be rendered
-	 * 
-	 */
-	public AntImageDescriptor(ImageDescriptor baseImage, int flags) {
-		setBaseImage(baseImage);
-		setFlags(flags);
-	}
-	
-	/**
-	 * @see CompositeImageDescriptor#getSize()
-	 */
-	protected Point getSize() {
-		if (fSize == null) {
-			ImageData data= getBaseImage().getImageData();
-			setSize(new Point(data.width, data.height));
-		}
-		return fSize;
-	}
-	
-	/**
-	 * @see Object#equals(java.lang.Object)
-	 */
-	public boolean equals(Object object) {
-		if (!(object instanceof AntImageDescriptor)){
-			return false;
-		}
-			
-		AntImageDescriptor other= (AntImageDescriptor)object;
-		return (getBaseImage().equals(other.getBaseImage()) && getFlags() == other.getFlags());
-	}
-	
-	/**
-	 * @see Object#hashCode()
-	 */
-	public int hashCode() {
-		return getBaseImage().hashCode() | getFlags();
-	}
-	
-	/**
-	 * @see CompositeImageDescriptor#drawCompositeImage(int, int)
-	 */
-	protected void drawCompositeImage(int width, int height) {
-		ImageData bg= getBaseImage().getImageData();
-		if (bg == null) {
-			bg= DEFAULT_IMAGE_DATA;
-		}
-		drawImage(bg, 0, 0);
-		drawOverlays();
-	}
-
-	/**
-	 * Add any overlays to the image as specified in the flags.
-	 */
-	protected void drawOverlays() {
-		int flags= getFlags();
-		int x= 0;
-		int y= 0;
-		ImageData data= null;
-		if ((flags & HAS_ERRORS) != 0) {
-			x= getSize().x;
-			y= 0;
-			data= AntUIImages.getImageDescriptor(IAntUIConstants.IMG_OVR_ERROR).getImageData();
-			x -= data.width;
-			drawImage(data, x, y);
-		}
-	}
-	
-	protected ImageDescriptor getBaseImage() {
-		return fBaseImage;
-	}
-
-	protected void setBaseImage(ImageDescriptor baseImage) {
-		fBaseImage = baseImage;
-	}
-
-	protected int getFlags() {
-		return fFlags;
-	}
-
-	protected void setFlags(int flags) {
-		fFlags = flags;
-	}
-
-	protected void setSize(Point size) {
-		fSize = size;
-	}
-}
diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/model/AntUIImages.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/model/AntUIImages.java
deleted file mode 100644
index 415856d..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/model/AntUIImages.java
+++ /dev/null
@@ -1,246 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.ui.internal.model;
-
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.resource.CompositeImageDescriptor;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.resource.ImageRegistry;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * The images provided by the external tools plugin.
- */
-public class AntUIImages {
-
-	/** 
-	 * The image registry containing <code>Image</code>s.
-	 */
-	private static ImageRegistry imageRegistry;
-	
-	/**
-	 * The registry for composite images
-	 */
-	private static ImageDescriptorRegistry imageDescriptorRegistry;
-	
-	/**
-	 * A table of all the <code>ImageDescriptor</code>s.
-	 */
-	private static Map imageDescriptors;
-
-	/* Declare Common paths */
-	private static URL ICON_BASE_URL= null;
-
-	static {
-		String pathSuffix = "icons/full/"; //$NON-NLS-1$
-			
-		try {
-			ICON_BASE_URL= new URL(AntUIPlugin.getDefault().getDescriptor().getInstallURL(), pathSuffix);
-		} catch (MalformedURLException e) {
-			// do nothing
-		}
-	}
-
-	// Use IPath and toOSString to build the names to ensure they have the slashes correct
-	private final static String LOCALTOOL= "clcl16/"; //basic colors - size 16x16 //$NON-NLS-1$
-	private final static String OBJECT= "obj16/"; //basic colors - size 16x16 //$NON-NLS-1$
-	private final static String OVR= "ovr16/"; //basic colors - size 7x8 //$NON-NLS-1$
-	
-	/**
-	 * Declare all images
-	 */
-	private static void declareImages() {
-		// Ant Editor images
-		declareRegistryImage(IAntUIConstants.IMG_PROPERTY, OBJECT + "property_obj.gif"); //$NON-NLS-1$
-		declareRegistryImage(IAntUIConstants.IMG_TASK_PROPOSAL, OBJECT + "task_obj.gif"); //$NON-NLS-1$
-		// Ant View Actions
-		declareRegistryImage(IAntUIConstants.IMG_REMOVE, LOCALTOOL + "remove_co.gif"); //$NON-NLS-1$
-		declareRegistryImage(IAntUIConstants.IMG_REMOVE_ALL, LOCALTOOL + "removeAll_co.gif"); //$NON-NLS-1$
-		declareRegistryImage(IAntUIConstants.IMG_ADD, LOCALTOOL + "add_co.gif"); //$NON-NLS-1$
-		declareRegistryImage(IAntUIConstants.IMG_RUN, LOCALTOOL + "run_tool.gif"); //$NON-NLS-1$
-		declareRegistryImage(IAntUIConstants.IMG_SEARCH, LOCALTOOL + "search.gif"); //$NON-NLS-1$
-		declareRegistryImage(IAntUIConstants.IMG_TOGGLE, LOCALTOOL + "toggle.gif"); //$NON-NLS-1$
-		// Ant View Labels
-		declareRegistryImage(IAntUIConstants.IMG_ANT_PROJECT, OBJECT + "ant_buildfile.gif"); //$NON-NLS-1$
-		declareRegistryImage(IAntUIConstants.IMG_ANT_TARGET, OBJECT + "targetpublic_obj.gif"); //$NON-NLS-1$
-		declareRegistryImage(IAntUIConstants.IMG_ANT_TARGET_PRIVATE, OBJECT + "targetprivate_obj.gif"); //$NON-NLS-1$
-		declareRegistryImage(IAntUIConstants.IMG_ANT_DEFAULT_TARGET, OBJECT + "defaulttarget_obj.gif"); //$NON-NLS-1$
-		declareRegistryImage(IAntUIConstants.IMG_ANT_TARGET_ERROR, OBJECT + "ant_target_err.gif"); //$NON-NLS-1$
-		
-		//ANT object
-		declareRegistryImage(IAntUIConstants.IMG_TAB_ANT_TARGETS, LOCALTOOL + "ant_targets.gif"); //$NON-NLS-1$
-		declareRegistryImage(IAntUIConstants.IMG_TAB_CLASSPATH, OBJECT + "classpath.gif"); //$NON-NLS-1$
-		declareRegistryImage(IAntUIConstants.IMG_JAR_FILE, OBJECT + "jar_l_obj.gif"); //$NON-NLS-1$
-		declareRegistryImage(IAntUIConstants.IMG_ANT_TYPE, OBJECT + "type.gif"); //$NON-NLS-1$
-		
-		// Overlays
-		declareRegistryImage(IAntUIConstants.IMG_OVR_ERROR, OVR + "error_co.gif"); //$NON-NLS-1$
-	}
-
-	/**
-	 * Declare an Image in the registry table.
-	 * @param key 	The key to use when registering the image
-	 * @param path	The path where the image can be found. This path is relative to where
-	 *				this plugin class is found (i.e. typically the packages directory)
-	 */
-	private final static void declareRegistryImage(String key, String path) {
-		ImageDescriptor desc= ImageDescriptor.getMissingImageDescriptor();
-		try {
-			desc= ImageDescriptor.createFromURL(makeIconFileURL(path));
-		} catch (MalformedURLException me) {
-		}
-		imageRegistry.put(key, desc);
-		imageDescriptors.put(key, desc);
-	}
-	
-	/**
-	 * Returns the ImageRegistry.
-	 */
-	public static ImageRegistry getImageRegistry() {
-		if (imageRegistry == null) {
-			initializeImageRegistry();
-		}
-		return imageRegistry;
-	}
-
-	/**
-	 *	Initialize the image registry by declaring all of the required
-	 *	graphics. This involves creating JFace image descriptors describing
-	 *	how to create/find the image should it be needed.
-	 *	The image is not actually allocated until requested.
-	 *
-	 * 	Prefix conventions
-	 *		Wizard Banners			WIZBAN_
-	 *		Preference Banners		PREF_BAN_
-	 *		Property Page Banners	PROPBAN_
-	 *		Color toolbar			CTOOL_
-	 *		Enable toolbar			ETOOL_
-	 *		Disable toolbar			DTOOL_
-	 *		Local enabled toolbar	ELCL_
-	 *		Local Disable toolbar	DLCL_
-	 *		Object large			OBJL_
-	 *		Object small			OBJS_
-	 *		View 					VIEW_
-	 *		Product images			PROD_
-	 *		Misc images				MISC_
-	 *
-	 *	Where are the images?
-	 *		The images (typically gifs) are found in the same location as this plugin class.
-	 *		This may mean the same package directory as the package holding this class.
-	 *		The images are declared using this.getClass() to ensure they are looked up via
-	 *		this plugin class.
-	 *	@see JFace's ImageRegistry
-	 */
-	public static ImageRegistry initializeImageRegistry() {
-		imageRegistry= new ImageRegistry(AntUIPlugin.getStandardDisplay());
-		imageDescriptors = new HashMap(30);
-		declareImages();
-		return imageRegistry;
-	}
-
-	/**
-	 * Returns the <code>Image<code> identified by the given key,
-	 * or <code>null</code> if it does not exist.
-	 */
-	public static Image getImage(String key) {
-		return getImageRegistry().get(key);
-	}
-	
-	/**
-	 * Returns the <code>ImageDescriptor<code> identified by the given key,
-	 * or <code>null</code> if it does not exist.
-	 */
-	public static ImageDescriptor getImageDescriptor(String key) {
-		if (imageDescriptors == null) {
-			initializeImageRegistry();
-		}
-		return (ImageDescriptor)imageDescriptors.get(key);
-	}
-	
-	private static URL makeIconFileURL(String iconPath) throws MalformedURLException {
-		if (ICON_BASE_URL == null) {
-			throw new MalformedURLException();
-		}
-			
-		return new URL(ICON_BASE_URL, iconPath);
-	}
-	
-	/**
-	 * Sets the three image descriptors for enabled, disabled, and hovered to an action. The actions
-	 * are retrieved from the *lcl16 folders.
-	 */
-	public static void setLocalImageDescriptors(IAction action, String iconName) {
-		setImageDescriptors(action, "lcl16", iconName); //$NON-NLS-1$
-	}
-	
-	private static void setImageDescriptors(IAction action, String type, String relPath) {
-		
-		try {
-			ImageDescriptor id= ImageDescriptor.createFromURL(makeIconFileURL("d" + type, relPath)); //$NON-NLS-1$
-			if (id != null)
-				action.setDisabledImageDescriptor(id);
-		} catch (MalformedURLException e) {
-			AntUIPlugin.log(e);
-		}
-
-		try {
-			ImageDescriptor id= ImageDescriptor.createFromURL(makeIconFileURL("c" + type, relPath)); //$NON-NLS-1$
-			if (id != null)
-				action.setHoverImageDescriptor(id);
-		} catch (MalformedURLException e) {
-			AntUIPlugin.log(e);
-		}
-
-		action.setImageDescriptor(create("e" + type, relPath)); //$NON-NLS-1$
-	}
-	
-	private static URL makeIconFileURL(String prefix, String name) throws MalformedURLException {
-		if (ICON_BASE_URL == null) {
-			throw new MalformedURLException();
-		}
-		
-		StringBuffer buffer= new StringBuffer(prefix);
-		buffer.append('/');
-		buffer.append(name);
-		return new URL(ICON_BASE_URL, buffer.toString());
-	}
-	
-	private static ImageDescriptor create(String prefix, String name) {
-		try {
-			return ImageDescriptor.createFromURL(makeIconFileURL(prefix, name));
-		} catch (MalformedURLException e) {
-			AntUIPlugin.log(e);
-			return ImageDescriptor.getMissingImageDescriptor();
-		}
-	}
-	
-	/** 
-	 * Returns the image for the given composite descriptor. 
-	 */
-	public static Image getImage(CompositeImageDescriptor imageDescriptor) {
-		if (imageDescriptorRegistry == null) {
-			imageDescriptorRegistry = new ImageDescriptorRegistry();	
-		}
-		return imageDescriptorRegistry.get(imageDescriptor);
-	}
-	
-	public static void disposeImageDescriptorRegistry() {
-		if (imageDescriptorRegistry != null) {
-			imageDescriptorRegistry.dispose(); 
-		}
-	}
-}
\ No newline at end of file
diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/model/AntUIModelMessages.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/model/AntUIModelMessages.java
deleted file mode 100644
index dffae27..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/model/AntUIModelMessages.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.ui.internal.model;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-public class AntUIModelMessages {
-
-	private static final String BUNDLE_NAME = "org.eclipse.ant.ui.internal.model.AntUIModelMessages"; //$NON-NLS-1$
-
-	private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME);
-
-	private AntUIModelMessages() {
-	}
-
-	public static String getString(String key) {
-		try {
-			return RESOURCE_BUNDLE.getString(key);
-		} catch (MissingResourceException e) {
-			return '!' + key + '!';
-		}
-	}
-}
diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/model/AntUIModelMessages.properties b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/model/AntUIModelMessages.properties
deleted file mode 100644
index 75d6860..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/model/AntUIModelMessages.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2003 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Common Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/cpl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-ImageDescriptorRegistry.Allocating_image_for_wrong_display_1=Allocating image for wrong display
-
diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/model/AntUIPlugin.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/model/AntUIPlugin.java
deleted file mode 100644
index 496aa9f..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/model/AntUIPlugin.java
+++ /dev/null
@@ -1,185 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.ui.internal.model;
-
-
-import org.eclipse.ant.ui.internal.editor.text.IAntEditorColorConstants;
-import org.eclipse.ant.ui.internal.preferences.AntEditorPreferenceConstants;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPluginDescriptor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.preference.PreferenceConverter;
-import org.eclipse.jface.resource.ImageRegistry;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.RGB;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-
-/**
- * The plug-in runtime class for the Ant Core plug-in.
- */
-public class AntUIPlugin extends AbstractUIPlugin {
-
-	/**
-	 * Status code indicating an unexpected internal error.
-	 * @since 2.1
-	 */
-	public static final int INTERNAL_ERROR = 120;		
-	
-	/**
-	 * The single instance of this plug-in runtime class.
-	 */
-	private static AntUIPlugin plugin;
-
-	/**
-	 * Unique identifier constant (value <code>"org.eclipse.ant.ui"</code>)
-	 * for the Ant UI plug-in.
-	 */
-	public static final String PI_ANTUI = "org.eclipse.ant.ui"; //$NON-NLS-1$
-	
-	private static final String EMPTY_STRING= ""; //$NON-NLS-1$
-
-	/** 
-	 * Constructs an instance of this plug-in runtime class.
-	 * <p>
-	 * An instance of this plug-in runtime class is automatically created 
-	 * when the facilities provided by the Ant Core plug-in are required.
-	 * <b>Clients must never explicitly instantiate a plug-in runtime class.</b>
-	 * </p>
-	 * 
-	 * @param pluginDescriptor the plug-in descriptor for the
-	 *   Ant UI plug-in
-	 */
-	public AntUIPlugin(IPluginDescriptor descriptor) {
-		super(descriptor);
-		plugin = this;
-	}
-
-	/**
-	 * @see org.eclipse.core.runtime.Plugin#shutdown()
-	 */
-	public void shutdown() throws CoreException {
-		super.shutdown();
-		ColorManager.getDefault().dispose();
-		AntUIImages.disposeImageDescriptorRegistry();
-	}
-
-	/**
-	 * Returns this plug-in instance.
-	 *
-	 * @return the single instance of this plug-in runtime class
-	 */
-	public static AntUIPlugin getDefault() {
-		return plugin;
-	}
-	
-	/**
-	 * Logs the specified throwable with this plug-in's log.
-	 * 
-	 * @param t throwable to log 
-	 */
-	public static void log(Throwable t) {
-		IStatus status= new Status(IStatus.ERROR, PI_ANTUI, INTERNAL_ERROR, "Error logged from Ant Core: ", t); //$NON-NLS-1$
-		getDefault().getLog().log(status);
-	}
-	
-	/**
-	 * Writes the message to the plug-in's log
-	 * 
-	 * @param message the text to write to the log
-	 */
-	public static void log(String message, Throwable exception) {
-		IStatus status = newErrorStatus(message, exception);
-		getDefault().getLog().log(status);
-	}
-	
-	/**
-	 * Returns a new <code>IStatus</code> for this plug-in
-	 */
-	public static IStatus newErrorStatus(String message, Throwable exception) {
-		if (message == null) {
-			message= EMPTY_STRING; 
-		}		
-		return new Status(Status.ERROR, IAntUIConstants.PLUGIN_ID, 0, message, exception);
-	}
-	
-	/* (non-Javadoc)
-	 * Method declared in AbstractUIPlugin.
-	 */
-	protected void initializeDefaultPreferences(IPreferenceStore prefs) {
-		prefs.setDefault(IAntUIPreferenceConstants.ANT_FIND_BUILD_FILE_NAMES, "build.xml"); //$NON-NLS-1$
-	
-		// Ant Editor color preferences
-		PreferenceConverter.setDefault(prefs, IAntEditorColorConstants.P_DEFAULT, IAntEditorColorConstants.DEFAULT);
-		PreferenceConverter.setDefault(prefs, IAntEditorColorConstants.P_PROC_INSTR, IAntEditorColorConstants.PROC_INSTR);
-		PreferenceConverter.setDefault(prefs, IAntEditorColorConstants.P_STRING, IAntEditorColorConstants.STRING);
-		PreferenceConverter.setDefault(prefs, IAntEditorColorConstants.P_TAG, IAntEditorColorConstants.TAG);
-		PreferenceConverter.setDefault(prefs, IAntEditorColorConstants.P_XML_COMMENT, IAntEditorColorConstants.XML_COMMENT);
-		
-		PreferenceConverter.setDefault(prefs, IAntUIPreferenceConstants.CONSOLE_ERROR_RGB, new RGB(255, 0, 0)); // red - exactly the same as debug Consol
-		PreferenceConverter.setDefault(prefs, IAntUIPreferenceConstants.CONSOLE_WARNING_RGB, new RGB(255, 100, 0)); // orange
-		PreferenceConverter.setDefault(prefs, IAntUIPreferenceConstants.CONSOLE_INFO_RGB, new RGB(0, 0, 255)); // blue
-		PreferenceConverter.setDefault(prefs, IAntUIPreferenceConstants.CONSOLE_VERBOSE_RGB, new RGB(0, 200, 125)); // green
-		PreferenceConverter.setDefault(prefs, IAntUIPreferenceConstants.CONSOLE_DEBUG_RGB, new RGB(0, 0, 0)); // black
-				
-		
-		AntEditorPreferenceConstants.initializeDefaultValues(prefs);
-	}
-	
-	/**
-	 * Returns the standard display to be used. The method first checks, if
-	 * the thread calling this method has an associated display. If so, this
-	 * display is returned. Otherwise the method returns the default display.
-	 */
-	public static Display getStandardDisplay() {
-		Display display = Display.getCurrent();
-		if (display == null) {
-			display = Display.getDefault();
-		}
-		return display;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#createImageRegistry()
-	 */
-	protected ImageRegistry createImageRegistry() {
-		return AntUIImages.initializeImageRegistry();
-	}
-	
-	/**
-	 * Returns the preference color, identified by the given preference.
-	 */
-	public static Color getPreferenceColor(String pref) {
-		return ColorManager.getDefault().getColor(PreferenceConverter.getColor(getDefault().getPreferenceStore(), pref));
-	}	
-	
-	/**
-	* Returns the active workbench page or <code>null</code> if none.
-	*/
-   public static IWorkbenchPage getActivePage() {
-	   IWorkbenchWindow window= getActiveWorkbenchWindow();
-	   if (window != null) {
-		   return window.getActivePage();
-	   }
-	   return null;
-   }
-
-   /**
-	* Returns the active workbench window or <code>null</code> if none
-	*/
-   public static IWorkbenchWindow getActiveWorkbenchWindow() {
-	   return getDefault().getWorkbench().getActiveWorkbenchWindow();
-   }
-}
diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/model/AntUtil.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/model/AntUtil.java
deleted file mode 100644
index 310f030..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/model/AntUtil.java
+++ /dev/null
@@ -1,310 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.ui.internal.model;
-
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.StringTokenizer;
-
-import org.eclipse.ant.core.AntRunner;
-import org.eclipse.ant.core.TargetInfo;
-import org.eclipse.ant.ui.internal.views.AntView;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * General utility class dealing with Ant build files
- */
-public final class AntUtil {
-	public static final String RUN_TARGETS_ATTRIBUTE = IAntUIConstants.TOOL_TYPE_ANT_BUILD + ".runTargets"; //$NON-NLS-1$;
-	public static final String ATTRIBUTE_SEPARATOR = ","; //$NON-NLS-1$;
-	
-	/**
-	 * No instances allowed
-	 */
-	private AntUtil() {
-		super();
-	}
-	
-	/**
-	 * Returns a single-string of the strings for storage.
-	 * 
-	 * @param targets the array of strings
-	 * @return a single-string representation of the strings or
-	 * <code>null</code> if the array is empty.
-	 */
-	public static String combineStrings(String[] strings) {
-		if (strings.length == 0)
-			return null;
-
-		if (strings.length == 1)
-			return strings[0];
-
-		StringBuffer buf = new StringBuffer();
-		for (int i = 0; i < strings.length - 1; i++) {
-			buf.append(strings[i]);
-			buf.append(ATTRIBUTE_SEPARATOR);
-		}
-		buf.append(strings[strings.length - 1]);
-		return buf.toString();
-	}
-
-	/**
-	 * Returns an array of targets to be run, or <code>null</code> if none are
-	 * specified (indicating the default target should be run).
-	 *
-	 * @param configuration launch configuration
-	 * @return array of target names, or <code>null</code>
-	 * @throws CoreException if unable to access the associated attribute
-	 */
-	public static String[] getTargetsFromConfig(ILaunchConfiguration configuration) throws CoreException {
-		String attribute = configuration.getAttribute(IAntUIConstants.ATTR_ANT_TARGETS, (String) null);
-		if (attribute == null) {
-			return null;
-		} else {
-			return AntUtil.parseRunTargets(attribute);
-		}
-	}
-	
-	/**
-	 * Returns a map of properties to be defined for the build, or
-	 * <code>null</code> if none are specified (indicating no additional
-	 * properties specified for the build).
-	 *
-	 * @param configuration launch configuration
-	 * @return map of properties (name --> value), or <code>null</code>
-	 * @throws CoreException if unable to access the associated attribute
-	 */
-	public static Map getProperties(ILaunchConfiguration configuration) throws CoreException {
-		Map map = configuration.getAttribute(IAntUIConstants.ATTR_ANT_PROPERTIES, (Map) null);
-		return map;
-	}
-	
-	/**
-	 * Returns a String specifying the Ant home to use for the build, or
-	 * <code>null</code> if none is specified.
-	 *
-	 * @param configuration launch configuration
-	 * @return String specifying Ant home to use, or <code>null</code>
-	 * @throws CoreException if unable to access the associated attribute
-	 */
-	public static String getAntHome(ILaunchConfiguration configuration) throws CoreException {
-		return configuration.getAttribute(IAntUIConstants.ATTR_ANT_HOME, (String) null);
-	}
-
-	/**
-	 * Returns an array of property files to be used for the build, or
-	 * <code>null</code> if none are specified (indicating no additional
-	 * property files specified for the build).
-	 *
-	 * @param configuration launch configuration
-	 * @return array of property file names, or <code>null</code>
-	 * @throws CoreException if unable to access the associated attribute
-	 */
-	public static String[] getPropertyFiles(ILaunchConfiguration configuration) throws CoreException {
-		String attribute = configuration.getAttribute(IAntUIConstants.ATTR_ANT_PROPERTY_FILES, (String) null);
-		if (attribute == null) {
-			return null;
-		} else {
-			return AntUtil.parseString(attribute, ","); //$NON-NLS-1$
-		}
-	}
-	
-	/**
-	 * Returns the list of all targets for the Ant build file specified by
-	 * the provided IPath, or <code>null</code> if no targets found.
-	 * 
-	 * @param path the location of the Ant build file to get the targets from
-	 * @return a list of <code>TargetInfo</code>
-	 * 
-	 * @throws CoreException if file does not exist, IO problems, or invalid format.
-	 */
-	public static TargetInfo[] getTargets(String path) throws CoreException {
-		AntRunner runner = new AntRunner();
-		runner.setBuildFileLocation(path);
-	 	return runner.getAvailableTargets();
-	}
-	
-	/**
-	 * Returns the list of all targets for the Ant build file specified by
-	 * the provided IPath, arguments and ILaunchConfiguration, or <code>null</code> if no targets found.
-	 * 
-	 * @param path the location of the Ant build file to get the targets from
-	 * @param arguments command line arguments for the Ant build
-	 * @param config the launch configuration for the Ant build
-	 * @return a list of <code>TargetInfo</code>
-	 * 
-	 * @throws CoreException if file does not exist, IO problems, or invalid format.
-	 */
-	public static TargetInfo[] getTargets(String path, String[] arguments, ILaunchConfiguration config) throws CoreException {
-		Map properties=getProperties(config);
-		String[] propertyFiles= getPropertyFiles(config);
-		AntRunner runner = new AntRunner();
-		runner.setBuildFileLocation(path);
-		if (properties != null){
-			runner.addUserProperties(properties);
-		}
-		if (propertyFiles != null && propertyFiles.length > 0) {
-			runner.setPropertyFiles(propertyFiles);
-		}
-		if (arguments != null && arguments.length > 0) {
-			runner.setArguments(arguments);
-		}
-		runner.setCustomClasspath(getCustomClasspath(config));
-		
-		return runner.getAvailableTargets();
-	}
-	
-	/**
-	 * Returns the list of urls that define the custom classpath for the Ant
-	 * build , or <code>null</code> if the global classpath is to be used.
-	 *
-	 * @param configuration launch configuration
-	 * @return a list of <code>URL</code>
-	 *
-	 * @throws CoreException if file does not exist, IO problems, or invalid format.
-	 */
-	public static URL[] getCustomClasspath(ILaunchConfiguration config) throws CoreException {
-		String classpathString= config.getAttribute(IAntUIConstants.ATTR_ANT_CUSTOM_CLASSPATH, (String)null);
-		if (classpathString == null) {
-			return null;
-		}
-		List antURLs= new ArrayList();
-		List userURLs= new ArrayList();
-		getCustomClasspaths(config, antURLs, userURLs);
-		URL[] custom= new URL[antURLs.size() + userURLs.size()];
-		antURLs.addAll(userURLs);
-		return (URL[])antURLs.toArray(custom);
-	}
-	
-	public static void getCustomClasspaths(ILaunchConfiguration config, List antURLs, List userURLs) {
-		String classpathString= null;
-		try {
-			classpathString = config.getAttribute(IAntUIConstants.ATTR_ANT_CUSTOM_CLASSPATH, (String) null);
-		} catch (CoreException e) {
-		}
-		if (classpathString == null) {
-			return;
-		}
-		String antString= null;
-		String userString= null;
-		int delim= classpathString.indexOf('*');
-
-		if (delim == -1) {
-			antString= classpathString;
-		} else {
-			antString= classpathString.substring(0, delim);
-			userString= classpathString.substring(delim+1);
-		}
-
-		String[] antStrings= AntUtil.parseString(antString, AntUtil.ATTRIBUTE_SEPARATOR);
-		for (int i = 0; i < antStrings.length; i++) {
-			String string = antStrings[i];
-			try {
-				antURLs.add(new URL("file:" + string)); //$NON-NLS-1$
-			} catch (MalformedURLException e) {
-			}
-		}
-		if (userString != null) {
-			String[] userStrings=AntUtil.parseString(userString, AntUtil.ATTRIBUTE_SEPARATOR);
-			for (int i = 0; i < userStrings.length; i++) {
-				String string = userStrings[i];
-				try {
-					userURLs.add(new URL("file:" + string)); //$NON-NLS-1$
-				} catch (MalformedURLException e) {
-				}
-			}
-
-		}
-	}
-	
-	/**
-	 * Returns the currently displayed Ant View if it is open.
-	 * 
-	 * @return the Ant View open in the current workbench page or
-	 * <code>null</code> if there is none.
-	 */
-	public static AntView getAntView() {
-		IWorkbenchWindow window= PlatformUI.getWorkbench().getActiveWorkbenchWindow();
-		if (window != null) {
-			IWorkbenchPage page= window.getActivePage(); 
-			if (page != null) {
-				return (AntView) page.findView(IAntUIConstants.ANT_VIEW_ID);
-			}
-		}
-		return null;
-	}
-	
-	/**
-	 * Returns whether the target described by the given
-	 * <code>TargetInfo</code> is a sub-target.
-	 * 
-	 * @param info the info of the target in question
-	 * @return <code>true</code> if the target is a sub-target,
-	 * 		<code>false</code> otherwise
-	 */
-	public static boolean isSubTarget(TargetInfo info) {
-		return info.getDescription() == null;
-	}
-	
-	/**
-	 * Returns the list of target names to run
-	 * 
-	 * @param extraAttibuteValue the external tool's extra attribute value
-	 * 		for the run targets key.
-	 * @return a list of target names
-	 */
-	public static String[] parseRunTargets(String extraAttibuteValue) {
-		return parseString(extraAttibuteValue, ATTRIBUTE_SEPARATOR);
-	}
-	
-	/**
-	 * Returns the list of Strings that were delimiter separated.
-	 * 
-	 * @param extraAttibuteValue the external tool's extra attribute value
-	 * @return a list of Strings
-	 */
-	public static String[] parseString(String attibuteValue, String delim) {
-		if (attibuteValue == null) {
-			return new String[0];
-		}
-		
-		// Need to handle case where separator character is
-		// actually part of the target name!
-		StringTokenizer tokenizer = new StringTokenizer(attibuteValue, delim);
-		String[] results = new String[tokenizer.countTokens()];
-		for (int i = 0; i < results.length; i++) {
-			results[i] = tokenizer.nextToken();
-		}
-		
-		return results;
-	}
-	
-	/**
-	 * Returns an IFile with the given fully qualified path. The returned IFile
-	 * may or may not exist.
-	 */
-	public static IFile getFile(String fullPath) {
-		IWorkspaceRoot root= ResourcesPlugin.getWorkspace().getRoot();
-		return root.getFile(new Path(fullPath));
-	}
-}
diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/model/ColorManager.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/model/ColorManager.java
deleted file mode 100644
index 1ce9673..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/model/ColorManager.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.ui.internal.model;
-
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
-import org.eclipse.jface.text.source.ISharedTextColors;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.RGB;
-import org.eclipse.swt.widgets.Display;
-
-/**
- * Generic color manager.
- */
-public class ColorManager implements ISharedTextColors {	
-	
-	private static ColorManager fgColorManager;
-	
-	private ColorManager() {
-	}
-	
-	public static ColorManager getDefault() {
-		if (fgColorManager == null) {
-			fgColorManager= new ColorManager();
-		}
-		return fgColorManager;
-	}
-	
-	protected Map fColorTable= new HashMap(10);
-	
-	public Color getColor(RGB rgb) {
-		Color color= (Color) fColorTable.get(rgb);
-		if (color == null) {
-			color= new Color(Display.getCurrent(), rgb);
-			fColorTable.put(rgb, color);
-		}
-		return color;
-	}
-	
-	public void dispose() {
-		Iterator e= fColorTable.values().iterator();
-		while (e.hasNext()) {
-			((Color) e.next()).dispose();
-		}
-	}
-}
-
-
diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/model/IAntUIConstants.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/model/IAntUIConstants.java
deleted file mode 100644
index 6c93425..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/model/IAntUIConstants.java
+++ /dev/null
@@ -1,155 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.ui.internal.model;
-
-import org.eclipse.ui.externaltools.internal.model.IExternalToolConstants;
-
-/**
- * Defines the constants available for client use.
- * <p>
- * This interface is not intended to be extended or implemented by clients.
- * </p>
- */
-public interface IAntUIConstants {
-	/**
-	 * Plugin identifier for Ant ui(value <code>org.eclipse.ant.ui</code>).
-	 */
-	public static final String PLUGIN_ID = "org.eclipse.ant.ui"; //$NON-NLS-1$;
-	
-
-	// ------- Views -------
-
-	/**
-	 * Ant View identifier (value <code>org.eclipse.ant.ui.AntView</code>).
-	 */
-	public static final String ANT_VIEW_ID = PLUGIN_ID + ".AntView"; //$NON-NLS-1$
-
-	/**
-	 * External tool type for Ant build files (value <code>antBuildType</code>).
-	 */
-	public static final String TOOL_TYPE_ANT_BUILD = "antBuildType"; //$NON-NLS-1$;
-
-	// ------- Images -------
-	/**
-	 * Refresh action image
-	 */
-	public static final String IMG_ACTION_REFRESH = PLUGIN_ID + ".IMG_ACTION_REFRESH"; //$NON-NLS-1$
-
-	/**
-	 * Main tab image.
-	 */
-	public static final String IMG_TAB_MAIN = PLUGIN_ID + ".IMG_TAB_MAIN"; //$NON-NLS-1$
-
-	/**
-	 * Property image
-	 */
-	public static final String IMG_PROPERTY = PLUGIN_ID + ".IMG_PROPERTY"; //$NON-NLS-1$
-	
-	/**
-	 * Ant Targets tab image.
-	 */
-	public static final String IMG_TAB_ANT_TARGETS = PLUGIN_ID + ".IMG_TAB_ANT_TARGETS"; //$NON-NLS-1$
-	public static final String IMG_TAB_CLASSPATH = PLUGIN_ID + ".IMG_TAB_CLASSPATH"; //$NON-NLS-1$;
-	public static final String IMG_JAR_FILE = PLUGIN_ID + ".IMG_JAR_FILE"; //$NON-NLS-1$;
-	
-	//	Label images
-	 public static final String IMG_ANT_PROJECT= PLUGIN_ID + ".antProject"; //$NON-NLS-1$
-	 public static final String IMG_ANT_TARGET= PLUGIN_ID + ".antTarget"; //$NON-NLS-1$
-	 public static final String IMG_ANT_TARGET_PRIVATE = PLUGIN_ID + ".antPrivateTarget"; //$NON-NLS-1$
-	 public static final String IMG_ANT_DEFAULT_TARGET= PLUGIN_ID + ".antDefaultTarget"; //$NON-NLS-1$
-	 public static final String IMG_ANT_TARGET_ERROR = PLUGIN_ID + ".antTargetError"; //$NON-NLS-1$
-	 
-	/**
-	 * Icon for task proposal.
-	 */
-	public static final String IMG_TASK_PROPOSAL = PLUGIN_ID + ".html_tab_obj"; //$NON-NLS-1$
-	
-	// Action images
-	public static final String IMG_REMOVE= PLUGIN_ID + ".remove"; //$NON-NLS-1$
-	public static final String IMG_REMOVE_ALL= PLUGIN_ID + ".removeAll"; //$NON-NLS-1$
-	public static final String IMG_ADD= PLUGIN_ID + ".add"; //$NON-NLS-1$
-	public static final String IMG_RUN= PLUGIN_ID + ".run"; //$NON-NLS-1$
-	public static final String IMG_SEARCH= PLUGIN_ID + ".search"; //$NON-NLS-1$
-	public static final String IMG_TOGGLE= PLUGIN_ID + ".toggle"; //$NON-NLS-1$
-	 
-	//	Overlays
-	 public static final String IMG_OVR_ERROR = PLUGIN_ID + ".ovrError";  //$NON-NLS-1$
-	
-	public static final String IMG_ANT_TYPE= PLUGIN_ID + ".type"; //$NON-NLS-1$
-
-	// ------- Launch configuration types --------
-	/**
-	 * Ant launch configuration type identifier.
-	 */
-	public static final String ID_ANT_LAUNCH_CONFIGURATION_TYPE = "org.eclipse.ant.AntLaunchConfigurationType"; //$NON-NLS-1$
-	
-	/**
-	 * Ant builder launch configuration type identifier. Ant project builders
-	 * are of this type.
-	 */
-	public static final String ID_ANT_BUILDER_LAUNCH_CONFIGURATION_TYPE = "org.eclipse.ant.AntBuilderLaunchConfigurationType"; //$NON-NLS-1$
-
-	// ------- Common Ant Launch Configuration Attributes -------
-	/**
-	 * String attribute indicating the Ant targets to execute. Default value is
-	 * <code>null</code> which indicates that the default target is to be
-	 * executed. Format is a comma separated listing of targets.
-	 */
-	public static final String ATTR_ANT_TARGETS = IExternalToolConstants.PLUGIN_ID + ".ATTR_ANT_TARGETS"; //$NON-NLS-1$
-
-	/**
-	 * Map attribute indicating the Ant properties to be defined during the
-	 * build. Default value is <code>null</code> which indicates no additional
-	 * properties will be defined.
-	 */
-	public static final String ATTR_ANT_PROPERTIES = IExternalToolConstants.PLUGIN_ID + ".ATTR_ANT_PROPERTIES"; //$NON-NLS-1$					
-
-	/**
-	 * String attribute indicating the Ant targets to execute. Default value is
-	 * <code>null</code> which indicates that no additional property files
-	 * will be defined. Format is a comma separated listing of property files.
-	 */
-	public static final String ATTR_ANT_PROPERTY_FILES = IExternalToolConstants.PLUGIN_ID + ".ATTR_ANT_PROPERTY_FILES"; //$NON-NLS-1$
-	
-	/**
- 	* String attribute indicating the custom runtime classpath to use for an Ant
- 	* build. Default value is <code>null</code> which indicates that the global
- 	* classpath is to be used. Format is a comma separated listing of URLs.
-  	*/
-	public static final String ATTR_ANT_CUSTOM_CLASSPATH = IExternalToolConstants.PLUGIN_ID + ".ATTR_ANT_CUSTOM_CLASSPATH"; //$NON-NLS-1$
-	
-	/**
-	 * String attribute indicating the custom Ant home to use for an Ant build.
-	 * Default value is <code>null</code> which indicates that no Ant home is to
-	 * be set 
-	 */
-	public static final String ATTR_ANT_HOME = IExternalToolConstants.PLUGIN_ID + ".ATTR_ANT_HOME"; //$NON-NLS-1$
-	
-	/**
-	 * Identifier for Ant processes (value <code>org.eclipse.ant.ui.antProcess</code>). This identifier is
-	 * set as the value for the <code>IProcess.ATTR_PROCESS_TYPE</code>
-	 * attribute in processes create by the Ant launch delegate.
-	 */
-	public static final String ID_ANT_PROCESS_TYPE = "org.eclipse.ant.ui.antProcess"; //$NON-NLS-1$	
-	
-	// -------- Status Codes -------------
-	
-	/**
-	 * Status code used by the 'Run Ant' status handler which is invoked when
-	 * the launch dialog is opened by the 'Run Ant' action.
-	 */
-	public static final int STATUS_INIT_RUN_ANT = 1000;
-	
-	public static final String DIALOGSTORE_LASTEXTJAR= PLUGIN_ID + ".lastextjar"; //$NON-NLS-1$
-	public static final String DIALOGSTORE_LASTEXTFILE= PLUGIN_ID + ".lastextfile"; //$NON-NLS-1$
-	public static final String DIALOGSTORE_LASTFOLDER= PLUGIN_ID + ".lastfolder"; //$NON-NLS-1$
-	public static final String DIALOGSTORE_LASTANTHOME= PLUGIN_ID + ".lastanthome"; //$NON-NLS-1$						
-}
diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/model/IAntUIHelpContextIds.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/model/IAntUIHelpContextIds.java
deleted file mode 100644
index 441bc61..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/model/IAntUIHelpContextIds.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.ui.internal.model;
-
-
-/**
- * Help context ids for the Ant ui
- * <p>
- * This interface contains constants only; it is not intended to be implemented
- * or extended.
- * </p>
- */
-public interface IAntUIHelpContextIds {
-	public static final String PREFIX = "org.eclipse.ant.ui."; //$NON-NLS-1$
-
-	// Actions
-	public static final String REMOVE_ALL_ACTION = PREFIX + "remove_all_action_context"; //$NON-NLS-1$
-	public static final String TARGET_MOVE_UP_ACTION = PREFIX + "target_move_up_action_context"; //$NON-NLS-1$
-	public static final String TARGET_MOVE_DOWN_ACTION = PREFIX + "target_move_down_action_context"; //$NON-NLS-1$
-	public static final String SEARCH_FOR_BUILDFILES_ACTION = PREFIX + "search_for_buildfiles_action_context"; //$NON-NLS-1$
-
-	public static final String EDIT_LAUNCH_CONFIGURATION_ACTION = PREFIX + "edit_launch_configuration_action_context"; //$NON-NLS-1$
-	public static final String RUN_TARGET_ACTION = PREFIX + "run_target_action_context"; //$NON-NLS-1$
-	public static final String REMOVE_PROJECT_ACTION = PREFIX + "remove_project_action_context"; //$NON-NLS-1$
-	public static final String ADD_BUILDFILE_ACTION = PREFIX + "add_buildfile_action_context"; //$NON-NLS-1$
-	public static final String REFRESH_BUILDFILE_ACTION = PREFIX + "refresh_buildfile_action_context"; //$NON-NLS-1$
-
-	// Dialogs
-	public static final String FILE_SELECTION_DIALOG = PREFIX + "file_selection_dialog_context"; //$NON-NLS-1$
-	public static final String ADD_CUSTOM_DIALOG = PREFIX + "add_custom_dialog_context"; //$NON-NLS-1$
-	public static final String ADD_PROPERTY_DIALOG = PREFIX + "add_property_dialog_context"; //$NON-NLS-1$
-	public static final String SEARCH_FOR_BUILDFILES_DIALOG = PREFIX + "search_for_buildfiles_dialog_context"; //$NON-NLS-1$
-	public static final String STATUS_DIALOG = PREFIX + "status_dialog_context"; //$NON-NLS-1$
-	public static final String MESSAGE_WITH_TOGGLE_DIALOG = PREFIX + "message_with_toggle_dialog_context"; //$NON-NLS-1$
-	public static final String TARGET_ORDER_DIALOG = PREFIX + "target_order_dialog_context"; //$NON-NLS-1$
-	public static final String VARIABLE_SELECTION_DIALOG = PREFIX + "variable_selection_dialog_context"; //$NON-NLS-1$
-	
-	// Preference Pages
-	public static final String ANT_PREFERENCE_PAGE = PREFIX + "ant_preference_page_context"; //$NON-NLS-1$
-	public static final String ANT_RUNTIME_PREFERENCE_PAGE = PREFIX + "ant_runtime_preference_page_context"; //$NON-NLS-1$
-	public static final String ANT_EDITOR_PREFERENCE_PAGE = PREFIX + "ant_editor_preference_page_context"; //$NON-NLS-1$
-	public static final String ANT_TYPES_PAGE = PREFIX + "ant_types_page_context"; //$NON-NLS-1$
-	public static final String ANT_CLASSPATH_PAGE = PREFIX + "ant_classpath_page_context"; //$NON-NLS-1$
-	
-	public static final String ANT_PROPERTIES_PAGE = PREFIX + "ant_properties_page_context"; //$NON-NLS-1$
-	public static final String ANT_TASKS_PAGE = PREFIX + "ant_tasks_page_context"; //$NON-NLS-1$
-	
-	// Views
-	public static final String ANT_VIEW = PREFIX + "ant_view_context"; //$NON-NLS-1$
-	
-	// Editor
-	public static final String ANT_EDITOR = PREFIX + "ant_editor_context"; //$NON-NLS-1$
-
-	//Launch configuration dialog tabs
-	public static final String ANT_MAIN_TAB = PREFIX + "ant_main_tab_context"; //$NON-NLS-1$
-	public static final String ANT_TARGETS_TAB = PREFIX + "ant_targets_tab_context"; //$NON-NLS-1$
-	public static final String ANT_PROPERTIES_TAB = PREFIX + "ant_properties_tab_context"; //$NON-NLS-1$
-	public static final String ANT_CLASSPATH_TAB = PREFIX + "ant_classpath_tab_context"; //$NON-NLS-1$
-}
diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/model/IAntUIPreferenceConstants.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/model/IAntUIPreferenceConstants.java
deleted file mode 100644
index 3aad1bd..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/model/IAntUIPreferenceConstants.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.ui.internal.model;
-
-/**
- * Constants used to identify user preferences.
- */
-public interface IAntUIPreferenceConstants {
-
-	public static final String ANTVIEW_INCLUDE_ERROR_SEARCH_RESULTS = "antview.includeErrorSearchResults"; //$NON-NLS-1$
-	public static final String ANTVIEW_LAST_SEARCH_STRING = "antview.lastSearchString"; //$NON-NLS-1$
-	public static final String ANTVIEW_LAST_WORKINGSET_SEARCH_SCOPE = "antview.lastSearchScope"; //$NON-NLS-1$
-	public static final String ANTVIEW_USE_WORKINGSET_SEARCH_SCOPE = "antview.useWorkingSetSearchScope"; //$NON-NLS-1$
-	
-	public static final String ANT_FIND_BUILD_FILE_NAMES = "ant.findBuildFileNames"; //$NON-NLS-1$
-	
-	public static final String CONSOLE_ERROR_RGB = "console.errorColor"; //$NON-NLS-1$
-	public static final String CONSOLE_WARNING_RGB = "console.warningColor"; //$NON-NLS-1$
-	public static final String CONSOLE_INFO_RGB = "console.infoColor"; //$NON-NLS-1$
-	public static final String CONSOLE_VERBOSE_RGB = "console.verboseColor"; //$NON-NLS-1$
-	public static final String CONSOLE_DEBUG_RGB = "console.debugColor"; //$NON-NLS-1$	
-}
diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/model/ImageDescriptorRegistry.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/model/ImageDescriptorRegistry.java
deleted file mode 100644
index a8bdbb4..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/model/ImageDescriptorRegistry.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.ui.internal.model;
-
- 
-import java.util.HashMap;
-import java.util.Iterator;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.util.Assert;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-
-/**
- * A registry that maps <code>ImageDescriptors</code> to <code>Image</code>.
- */
-public class ImageDescriptorRegistry {
-
-	private HashMap fRegistry= new HashMap(10);
-	private Display fDisplay;
-	
-	/**
-	 * Creates a new image descriptor registry for the current or default display,
-	 * respectively.
-	 */
-	public ImageDescriptorRegistry() {
-		this(AntUIPlugin.getStandardDisplay());
-	}
-	
-	/**
-	 * Creates a new image descriptor registry for the given display. All images
-	 * managed by this registry will be disposed when the display gets disposed.
-	 * 
-	 * @param diaplay the display the images managed by this registry are allocated for 
-	 */
-	public ImageDescriptorRegistry(Display display) {
-		fDisplay= display;
-		Assert.isNotNull(fDisplay);
-		hookDisplay();
-	}
-	
-	/**
-	 * Returns the image associated with the given image descriptor.
-	 * 
-	 * @param descriptor the image descriptor for which the registry manages an image
-	 * @return the image associated with the image descriptor or <code>null</code>
-	 *  if the image descriptor can't create the requested image.
-	 */
-	public Image get(ImageDescriptor descriptor) {
-		if (descriptor == null)
-			descriptor= ImageDescriptor.getMissingImageDescriptor();
-			
-		Image result= (Image)fRegistry.get(descriptor);
-		if (result != null)
-			return result;
-	
-		Assert.isTrue(fDisplay == AntUIPlugin.getStandardDisplay(), AntUIModelMessages.getString("ImageDescriptorRegistry.Allocating_image_for_wrong_display_1")); //$NON-NLS-1$
-		result= descriptor.createImage();
-		if (result != null)
-			fRegistry.put(descriptor, result);
-		return result;
-	}
-
-	/**
-	 * Disposes all images managed by this registry.
-	 */	
-	public void dispose() {
-		for (Iterator iter= fRegistry.values().iterator(); iter.hasNext(); ) {
-			Image image= (Image)iter.next();
-			image.dispose();
-		}
-		fRegistry.clear();
-	}
-	
-	private void hookDisplay() {
-		fDisplay.disposeExec(new Runnable() {
-			public void run() {
-				dispose();
-			}	
-		});
-	}
-}
-
diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/preferences/AddCustomDialog.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/preferences/AddCustomDialog.java
deleted file mode 100644
index c9d1d19..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/preferences/AddCustomDialog.java
+++ /dev/null
@@ -1,625 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.ui.internal.preferences;
-
-
-import java.io.File;
-import java.io.IOException;
-import java.net.URL;
-import java.text.MessageFormat;
-import java.util.Iterator;
-import java.util.List;
-import java.util.StringTokenizer;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipException;
-import java.util.zip.ZipFile;
-
-import org.eclipse.ant.ui.internal.model.AntUIPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.viewers.DoubleClickEvent;
-import org.eclipse.jface.viewers.IDoubleClickListener;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.events.FocusAdapter;
-import org.eclipse.swt.events.FocusEvent;
-import org.eclipse.swt.events.KeyAdapter;
-import org.eclipse.swt.events.KeyEvent;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.dialogs.FileSystemElement;
-import org.eclipse.ui.externaltools.internal.model.IExternalToolsHelpContextIds;
-import org.eclipse.ui.externaltools.internal.ui.TreeAndListGroup;
-import org.eclipse.ui.help.WorkbenchHelp;
-import org.eclipse.ui.model.WorkbenchContentProvider;
-import org.eclipse.ui.model.WorkbenchLabelProvider;
-import org.eclipse.ui.model.WorkbenchViewerSorter;
-import org.eclipse.ui.wizards.datatransfer.FileSystemStructureProvider;
-import org.eclipse.ui.wizards.datatransfer.IImportStructureProvider;
-import org.eclipse.ui.wizards.datatransfer.ZipFileStructureProvider;
-
-public class AddCustomDialog extends StatusDialog {
-	
-	private ZipFileStructureProvider providerCache;
-	private IImportStructureProvider currentProvider;
-	
-	//A boolean to indicate if the user has typed anything
-	private boolean entryChanged = false;
-
-	private Combo sourceNameField;
-	private List libraryUrls;
-	private List existingNames;
-	
-	private String noNameErrorMsg;
-	private String alreadyExistsErrorMsg;
-	
-	private TreeAndListGroup selectionGroup;
-	
-	private Text nameField;
-	
-	private String name=""; //$NON-NLS-1$
-	private URL library= null;
-	private String className=""; //$NON-NLS-1$
-	
-	private boolean editing= false;
-
-	/**
-	 * Creates a new dialog with the given shell and title.
-	 */
-	public AddCustomDialog(Shell parent, List libraryUrls, List existingNames) {
-		super(parent);
-		this.libraryUrls = libraryUrls;
-		this.existingNames= existingNames;
-	}
-	
-	/* (non-Javadoc)
-	 * Method declared on Dialog.
-	 */
-	protected Control createDialogArea(Composite parent) {
-		Composite topComposite = new Composite(parent, SWT.NULL);
-		topComposite.setLayout(new GridLayout());
-		topComposite.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_FILL | GridData.HORIZONTAL_ALIGN_FILL));
-		topComposite.setSize(topComposite.computeSize(SWT.DEFAULT, SWT.DEFAULT));
-		topComposite.setFont(parent.getFont());
-
-		createNameGroup(topComposite);
-		new Label(topComposite, SWT.NULL);
-		createRootDirectoryGroup(topComposite);
-		createFileSelectionGroup(topComposite);
-		
-		if (library != null) {
-			setSourceName(library.getFile());
-		}
-		return topComposite;
-	}
-	
-	private void createNameGroup(Composite topComposite) {
-		Composite nameContainerGroup = new Composite(topComposite, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 2;
-		layout.marginHeight= 0;
-		layout.marginWidth= 0;
-		nameContainerGroup.setLayout(layout);
-		nameContainerGroup.setFont(topComposite.getFont());
-		nameContainerGroup.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL));
-		
-		Label label = new Label(nameContainerGroup, SWT.NONE);
-		label.setFont(topComposite.getFont());
-		label.setText(AntPreferencesMessages.getString("AddCustomDialog.&Name__3")); //$NON-NLS-1$
-		
-		nameField = new Text(nameContainerGroup, SWT.BORDER);
-		GridData data = new GridData(GridData.FILL_HORIZONTAL);
-		data.widthHint = IDialogConstants.ENTRY_FIELD_WIDTH;
-	
-		nameField.setLayoutData(data);
-		nameField.setFont(topComposite.getFont());
-		nameField.setText(name);
-		nameField.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-				updateStatus();
-			}
-		});
-	}
-
-	/* (non-Javadoc)
-	 * Method declared on Window.
-	 */
-	protected void configureShell(Shell newShell) {
-		super.configureShell(newShell);
-		WorkbenchHelp.setHelp(newShell, IExternalToolsHelpContextIds.ADD_CUSTOM_DIALOG);
-	}
-	/**
-	 * Clears the cached structure provider after first finalizing
-	 * it properly.
-	 */
-	private void clearProviderCache() {
-		if (providerCache != null) {
-			closeZipFile(providerCache.getZipFile());
-			providerCache = null;
-		}
-	}
-	/**
-	 * Attempts to close the passed zip file, and answers a boolean indicating success.
-	 */
-	private boolean closeZipFile(ZipFile file) {
-		try {
-			file.close();
-		} catch (IOException e) {
-			AntUIPlugin.log(MessageFormat.format(AntPreferencesMessages.getString("AddCustomDialog.Could_not_close_zip_file_{0}_4"), new String[]{file.getName()}), e); //$NON-NLS-1$
-			return false;
-		}
-
-		return true;
-	}
-
-	/**
-	 *	Create the group for creating the root directory
-	 */
-	private void createRootDirectoryGroup(Composite parent) {
-		Composite sourceContainerGroup = new Composite(parent, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 2;
-		layout.marginHeight=0;
-		layout.marginWidth=0;
-		
-		sourceContainerGroup.setLayout(layout);
-		sourceContainerGroup.setFont(parent.getFont());
-		sourceContainerGroup.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL));
-
-		Label groupLabel = new Label(sourceContainerGroup, SWT.NONE);
-		groupLabel.setText(AntPreferencesMessages.getString("AddCustomDialog.&Location")); //$NON-NLS-1$
-		groupLabel.setFont(parent.getFont());
-
-		// source name entry field
-		sourceNameField = new Combo(sourceContainerGroup, SWT.BORDER | SWT.READ_ONLY);
-		GridData data = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL);
-		data.widthHint = IDialogConstants.ENTRY_FIELD_WIDTH;
-		sourceNameField.setLayoutData(data);
-		sourceNameField.setFont(parent.getFont());
-		
-		sourceNameField.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				updateFromSourceField();
-			}
-		});
-
-		Iterator libraries= libraryUrls.iterator();
-		while (libraries.hasNext()) {
-			URL srcLibrary = (URL) libraries.next();
-			sourceNameField.add(srcLibrary.getFile());
-		}
-
-		sourceNameField.addKeyListener(new KeyAdapter() {
-			/*
-			 * @see KeyListener.keyPressed
-			 */
-			public void keyPressed(KeyEvent e) {
-				//If there has been a key pressed then mark as dirty
-				entryChanged = true;
-			}
-		});
-
-		sourceNameField.addFocusListener(new FocusAdapter() {
-			/*
-			 * @see FocusListener.focusLost(FocusEvent)
-			 */
-			public void focusLost(FocusEvent e) {
-				//Clear the flag to prevent constant update
-				if (entryChanged) {
-					entryChanged = false;
-					updateFromSourceField();
-				}
-			}
-		});
-	}
-	
-	/**
-	 * Update the receiver from the source name field.
-	 */
-	private void updateFromSourceField(){
-		setSourceName(sourceNameField.getText());
-		updateStatus();
-	}
-	
-	
-	/**
-	 * Check the field values and display a message in the status if needed.
-	 */
-	private void updateStatus() {
-		StatusInfo status= new StatusInfo();
-		String customName= nameField.getText().trim();
-		if (customName.length() == 0) {
-			status.setError(noNameErrorMsg);
-		} else if (!editing){
-			Iterator names= existingNames.iterator();
-			while (names.hasNext()) {
-				String aName = (String) names.next();
-				if(aName.equals(customName)) {
-					status.setError(MessageFormat.format(alreadyExistsErrorMsg, new String[]{customName}));
-					updateStatus(status);
-					return;
-				}
-			}
-		} 
-		if (selectionGroup.getListTableSelection().isEmpty()) {
-			status.setError(AntPreferencesMessages.getString("AddCustomDialog.mustSelect")); //$NON-NLS-1$
-		}
-		updateStatus(status);
-	}
-
-	
-	/**
-	 * Sets the source name of the import to be the supplied path.
-	 * Adds the name of the path to the list of items in the
-	 * source combo and selects it.
-	 *
-	 * @param path the path to be added
-	 */
-	private void setSourceName(String path) {
-
-		if (path.length() > 0) {
-
-			String[] currentItems = this.sourceNameField.getItems();
-			int selectionIndex = -1;
-			for (int i = 0; i < currentItems.length; i++) {
-				if (currentItems[i].equals(path)) {
-					selectionIndex = i;
-					break;
-				}
-			}
-			if (selectionIndex < 0) {
-				int oldLength = currentItems.length;
-				String[] newItems = new String[oldLength + 1];
-				System.arraycopy(currentItems, 0, newItems, 0, oldLength);
-				newItems[oldLength] = path;
-				this.sourceNameField.setItems(newItems);
-				selectionIndex = oldLength;
-			}
-			this.sourceNameField.select(selectionIndex);
-
-			resetSelection();
-		}
-	}
-
-	/**
-	*	Create the import source selection widget
-	*/
-	private void createFileSelectionGroup(Composite parent) {
-		//Just create with a dummy root.
-		FileSystemElement dummyRoot= new FileSystemElement("Dummy", null, true); //$NON-NLS-1$
-		this.selectionGroup = new TreeAndListGroup(parent, dummyRoot, 
-				getFolderProvider(), new WorkbenchLabelProvider(), getFileProvider(),
-				new WorkbenchLabelProvider(), SWT.NONE, 400, 150);
-
-		ISelectionChangedListener listener = new ISelectionChangedListener() {
-			public void selectionChanged(SelectionChangedEvent event) {
-				updateStatus();
-			}
-		};
-
-		WorkbenchViewerSorter sorter = new WorkbenchViewerSorter();
-		this.selectionGroup.setTreeSorter(sorter);
-		this.selectionGroup.setListSorter(sorter);
-		this.selectionGroup.addSelectionChangedListener(listener);
-		selectionGroup.addDoubleClickListener(new IDoubleClickListener() {
-			public void doubleClick(DoubleClickEvent event) {
-				if (getButton(IDialogConstants.OK_ID).isEnabled()) {
-					buttonPressed(IDialogConstants.OK_ID);
-				}
-			}
-		});
-	}
-	
-	/**
-	 *	Returns whether the specified source currently exists
-	 *	and is valid (ie.- proper format)
-	 */
-	protected boolean ensureSourceIsValid() {
-		ZipFile specifiedFile = getSpecifiedSourceFile();
-
-		if (specifiedFile == null){
-			return false;
-		}
-
-		return closeZipFile(specifiedFile);
-	}
-	/**
-	*	Answer the root FileSystemElement that represents the contents of the
-	*	currently-specified .zip file.  If this FileSystemElement is not
-	*	currently defined then create and return it.
-	*/
-	private MinimizedFileSystemElement getFileSystemTree() {
-		IImportStructureProvider provider= null;
-		MinimizedFileSystemElement element= null;
-		ZipFile sourceFile = getSpecifiedSourceFile();
-		if (sourceFile == null) {
-			File file= new File(sourceNameField.getText());
-			if (file.exists()) {
-				provider = FileSystemStructureProvider.INSTANCE;
-				element= selectFiles(file, provider);
-			} 
-		} else {
-			//zip file set as location
-			provider = getStructureProvider(sourceFile);
-			element= selectFiles(((ZipFileStructureProvider)provider).getRoot(), provider);
-		}
-		this.currentProvider = provider;
-		return element;
-	}
-	
-	/**
-	 * Invokes a file selection operation using the specified file system and
-	 * structure provider.  If the user specifies files then this selection is
-	 * cached for later retrieval and is returned.
-	 */
-	private MinimizedFileSystemElement selectFiles(final Object rootFileSystemObject, final IImportStructureProvider structureProvider) {
-
-		final MinimizedFileSystemElement[] results = new MinimizedFileSystemElement[1];
-
-		BusyIndicator.showWhile(getShell().getDisplay(), new Runnable() {
-			public void run() {
-				//Create the root element from the supplied file system object
-				results[0] = createRootElement(rootFileSystemObject, structureProvider);
-			}
-		});
-
-		return results[0];
-	}
-	
-	/**
-	 * Creates and returns a <code>MinimizedFileSystemElement</code> if the specified
-	 * file system object merits one.
-	 */
-	private MinimizedFileSystemElement createRootElement(Object fileSystemObject, IImportStructureProvider provider) {
-		boolean isContainer = provider.isFolder(fileSystemObject);
-		String elementLabel = provider.getLabel(fileSystemObject);
-
-		// Use an empty label so that display of the element's full name
-		// doesn't include a confusing label
-		MinimizedFileSystemElement dummyParent =
-			new MinimizedFileSystemElement("", null, true);//$NON-NLS-1$
-		dummyParent.setPopulated();
-		MinimizedFileSystemElement result =
-			new MinimizedFileSystemElement(elementLabel, dummyParent, isContainer);
-		result.setFileSystemObject(fileSystemObject);
-
-		//Get the files for the element so as to build the first level
-		result.getFiles(provider);
-
-		return dummyParent;
-	}
-	
-	/**
-	 *	Answer a handle to the zip file currently specified as being the source.
-	 *	Return null if this file does not exist or is not of valid format.
-	 */
-	private ZipFile getSpecifiedSourceFile() {
-		try {
-			return new ZipFile(sourceNameField.getText());
-		} catch (ZipException e) {
-			StatusInfo status= new StatusInfo();
-			status.setError(AntPreferencesMessages.getString("AddCustomDialog.Bad_Format")); //$NON-NLS-1$
-			updateStatus(status);
-		} catch (IOException e) {
-			StatusInfo status= new StatusInfo();
-			status.setError(AntPreferencesMessages.getString("AddCustomDialog.Unreadable")); //$NON-NLS-1$
-			updateStatus(status);
-		}
-
-		sourceNameField.setFocus();
-		return null;
-	}
-	/**
-	 * Returns a structure provider for the specified zip file.
-	 */
-	private ZipFileStructureProvider getStructureProvider(ZipFile targetZip) {
-		if (providerCache == null) {
-			providerCache = new ZipFileStructureProvider(targetZip);
-		} else if (!providerCache.getZipFile().getName().equals(targetZip.getName())) {
-			clearProviderCache();
-			// ie.- new value, so finalize & remove old value
-			providerCache = new ZipFileStructureProvider(targetZip);
-		} else if (!providerCache.getZipFile().equals(targetZip)) {
-			closeZipFile(targetZip); // ie.- duplicate handle to same .zip
-		}
-
-		return providerCache;
-	}
-
-	/**
-	 *	Repopulate the view based on the currently entered directory.
-	 */
-	private void resetSelection() {
-		MinimizedFileSystemElement currentRoot = getFileSystemTree();
-		selectionGroup.setRoot(currentRoot);
-		
-		if (className.length() != 0) {
-			StringTokenizer tokenizer= new StringTokenizer(className, "."); //$NON-NLS-1$
-			selectClass(currentRoot, tokenizer);
-		}
-	}
-	
-	private void selectClass(MinimizedFileSystemElement currentParent, StringTokenizer tokenizer) {
-		if (!tokenizer.hasMoreTokens()) {
-			return;
-		}
-		List folders= currentParent.getFolders(currentProvider);
-		if (folders.size() == 1) {
-			MinimizedFileSystemElement element = (MinimizedFileSystemElement)folders.get(0);
-			if (element.getLabel(null).equals("/")) { //$NON-NLS-1$
-				selectionGroup.selectAndRevealFolder(element);
-				selectClass(element, tokenizer);
-				return;
-			}
-		}
-		String currentName= tokenizer.nextToken();
-		if (tokenizer.hasMoreTokens()) {
-			Iterator allFolders= folders.iterator();
-			while (allFolders.hasNext()) {
-				MinimizedFileSystemElement folder = (MinimizedFileSystemElement) allFolders.next();
-				if (folder.getLabel(null).equals(currentName)) {
-					selectionGroup.selectAndRevealFolder(folder);
-					selectClass(folder, tokenizer);
-					return;
-				}
-			}	
-		} else {
-			List files= currentParent.getFiles(currentProvider);
-			Iterator iter= files.iterator();
-			while (iter.hasNext()) {
-				MinimizedFileSystemElement file = (MinimizedFileSystemElement) iter.next();
-				if (file.getLabel(null).equals(currentName + ".class")) { //$NON-NLS-1$
-					selectionGroup.selectAndRevealFile(file);
-					return;
-				}
-			}
-		}
-	}
-
-	/**
-	 * Returns a content provider for <code>MinimizedFileSystemElement</code>s that returns
-	 * only files as children.
-	 */
-	private ITreeContentProvider getFileProvider() {
-		return new WorkbenchContentProvider() {
-			public Object[] getChildren(Object o) {
-				if (o instanceof MinimizedFileSystemElement) {
-					MinimizedFileSystemElement element = (MinimizedFileSystemElement) o;
-					return element.getFiles(currentProvider).toArray();
-				}
-				return new Object[0];
-			}
-		};
-	}
-
-	/**
-	 * Returns a content provider for <code>MinimizedFileSystemElement</code>s that returns
-	 * only folders as children.
-	 */
-	private ITreeContentProvider getFolderProvider() {
-		return new WorkbenchContentProvider() {
-			public Object[] getChildren(Object o) {
-				if (o instanceof MinimizedFileSystemElement) {
-					MinimizedFileSystemElement element = (MinimizedFileSystemElement) o;
-					return element.getFolders(currentProvider).toArray();
-				}
-				return new Object[0];
-			}
-			public boolean hasChildren(Object o) {
-				if (o instanceof MinimizedFileSystemElement) {
-					MinimizedFileSystemElement element = (MinimizedFileSystemElement) o;
-					if (element.isPopulated())
-						return getChildren(element).length > 0;
-					else {
-						//If we have not populated then wait until asked
-						return true;
-					}
-				}
-				return false;
-			}
-		};
-	}
-
-	/**
-	 * @see org.eclipse.jface.dialogs.Dialog#cancelPressed()
-	 */
-	protected void cancelPressed() {
-		clearProviderCache();
-		super.cancelPressed();
-	}
-
-	/**
-	 * @see org.eclipse.jface.dialogs.Dialog#okPressed()
-	 */
-	protected void okPressed() {
-		clearProviderCache();
-		name= nameField.getText().trim();
-		library= (URL)libraryUrls.get(sourceNameField.getSelectionIndex());
-		IStructuredSelection selection= this.selectionGroup.getListTableSelection();
-		MinimizedFileSystemElement element= (MinimizedFileSystemElement)selection.getFirstElement();
-		if (element == null) {
-			super.okPressed();
-			return;
-		}
-		Object file= element.getFileSystemObject();
-		if (file instanceof ZipEntry) {
-			className= ((ZipEntry)file).getName();
-		} else {
-			className= ((File)file).getAbsolutePath();
-			IPath classPath= new Path(className);
-			IPath libraryPath= new Path(library.getPath());
-			int matching= classPath.matchingFirstSegments(libraryPath);
-			classPath= classPath.removeFirstSegments(matching);
-			classPath= classPath.setDevice(null);
-			className= classPath.toString();
-		}
-		int index= className.lastIndexOf('.');
-		className= className.substring(0, index);
-		className= className.replace('/', '.'); 
-		super.okPressed();
-	}
-	
-	protected String getName() {
-		return name;
-	}
-	
-	protected void setName(String name) {
-		this.name= name;
-	} 
-	
-	protected void setLibrary(URL library) {
-		this.library= library;
-		editing= true;
-	}
-	
-	protected URL getLibrary() {
-		return this.library;
-	}
-	
-	protected String getClassName() {
-		return className;
-	}
-	
-	protected void setClassName(String className) {
-		this.className= className;
-	}
-	
-	/**
-	 * @see org.eclipse.jface.window.Window#create()
-	 */
-	public void create() {
-		super.create();
-		getButton(IDialogConstants.OK_ID).setEnabled(!(library == null));
-	}
-	
-	protected void setAlreadyExistsErrorMsg(String alreadyExistsErrorMsg) {
-		this.alreadyExistsErrorMsg = alreadyExistsErrorMsg;
-	}
-
-	protected void setNoNameErrorMsg(String noNameErrorMsg) {
-		this.noNameErrorMsg = noNameErrorMsg;
-	}
-}
diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/preferences/AddPropertyDialog.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/preferences/AddPropertyDialog.java
deleted file mode 100644
index 453032c..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/preferences/AddPropertyDialog.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.ui.internal.preferences;
-
-
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.externaltools.internal.model.IExternalToolsHelpContextIds;
-import org.eclipse.ui.help.WorkbenchHelp;
-
-public class AddPropertyDialog extends Dialog {
-
-	private String fName;
-	private String fValue;
-
-	private String fTitle;
-	
-	private Label fNameLabel;
-	private Text fNameText;
-	private Label fValueLabel;
-	private Text fValueText;
-	
-	private String[] fInitialValues;
-
-	public AddPropertyDialog(Shell shell, String title, String[] initialValues) {
-		super(shell);
-		fTitle = title;
-		fInitialValues= initialValues;
-	}
-
-	/**
-	 * @see Dialog#createDialogArea(Composite)
-	 */
-	protected Control createDialogArea(Composite parent) {
-		Composite comp = new Composite(parent, SWT.NULL);
-		GridLayout topLayout = new GridLayout();
-		topLayout.numColumns = 2;
-		comp.setLayout(topLayout);
-		comp.setFont(parent.getFont());
-		GridData gd;
-		
-		fNameLabel = new Label(comp, SWT.NONE);
-		fNameLabel.setText(AntPreferencesMessages.getString("AddPropertyDialog.&Name__1")); //$NON-NLS-1$
-		fNameLabel.setFont(comp.getFont());
-		
-		fNameText = new Text(comp, SWT.BORDER | SWT.SINGLE);
-		fNameText.setText(fInitialValues[0]);
-		gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.widthHint = 300;
-		fNameText.setLayoutData(gd);
-		fNameText.setFont(comp.getFont());
-		fNameText.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-				updateButtons();
-			}
-		});
-		
-		fValueLabel = new Label(comp, SWT.NONE);
-		fValueLabel.setText(AntPreferencesMessages.getString("AddPropertyDialog.&Value__2")); //$NON-NLS-1$
-		fValueLabel.setFont(comp.getFont());
-		
-		fValueText = new Text(comp, SWT.BORDER | SWT.SINGLE);
-		fValueText.setText(fInitialValues[1]);
-		gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.widthHint = 300;
-		fValueText.setLayoutData(gd);
-		fValueText.setFont(comp.getFont());
-		fValueText.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-				updateButtons();
-			}
-		});		
-		
-		return comp;
-	}
-	
-	/**
-	 * Return the name/value pair entered in this dialog.  If the cancel button was hit,
-	 * both will be <code>null</code>.
-	 */
-	public String[] getNameValuePair() {
-		return new String[] {fName, fValue};
-	}
-	
-	/**
-	 * @see Dialog#buttonPressed(int)
-	 */
-	protected void buttonPressed(int buttonId) {
-		if (buttonId == IDialogConstants.OK_ID) {
-			fName= fNameText.getText();
-			fValue = fValueText.getText();
-		} else {
-			fName = null;
-			fValue = null;
-		}
-		super.buttonPressed(buttonId);
-	}
-	
-	/**
-	 * @see Window#configureShell(Shell)
-	 */
-	protected void configureShell(Shell shell) {
-		super.configureShell(shell);
-		if (fTitle != null) {
-			shell.setText(fTitle);
-		}
-		WorkbenchHelp.setHelp(shell, IExternalToolsHelpContextIds.ADD_PROPERTY_DIALOG);
-	}
-	
-	/**
-	 * Enable the OK button if valid input
-	 */
-	protected void updateButtons() {
-		String name = fNameText.getText().trim();
-		String value = fValueText.getText().trim();
-		getButton(IDialogConstants.OK_ID).setEnabled((name.length() > 0) &&(value.length() > 0));
-	}
-	
-	/**
-	 * Enable the buttons on creation.
-	 */
-	public void create() {
-		super.create();
-		updateButtons();
-	}
-}
diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/preferences/AntClasspathBlock.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/preferences/AntClasspathBlock.java
deleted file mode 100644
index 9a43c64..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/preferences/AntClasspathBlock.java
+++ /dev/null
@@ -1,588 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.ui.internal.preferences;
-
-
-import java.io.File;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.ant.core.AntCorePlugin;
-import org.eclipse.ant.core.AntCorePreferences;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.dialogs.IDialogSettings;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.DirectoryDialog;
-import org.eclipse.swt.widgets.FileDialog;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ant.ui.internal.model.AntUIPlugin;
-import org.eclipse.ant.ui.internal.model.IAntUIConstants;
-import org.eclipse.ui.externaltools.internal.ui.ExternalToolsContentProvider;
-
-public class AntClasspathBlock {
-
-	private TableViewer antTableViewer;
-	private ExternalToolsContentProvider antContentProvider;
-	private TableViewer userTableViewer;
-	private ExternalToolsContentProvider userContentProvider;
-
-	private Button upButton;
-	private Button downButton;
-	private Button removeButton;
-
-	private Button upUserButton;
-	private Button downUserButton;
-	private Button removeUserButton;
-
-	private final AntClasspathLabelProvider labelProvider = new AntClasspathLabelProvider();
-	private Button addUserJarButton;
-	private Button addUserFolderButtton;
-	private Button addFolderButtton;
-	private Button addJarButton;
-	
-	private Button antHomeButton;
-	private Text antHome;
-	private Button browseAntHomeButton;
-
-	private final IDialogSettings dialogSettings = AntUIPlugin.getDefault().getDialogSettings();
-	
-	private boolean initializing = true;
-	
-	private IAntBlockContainer container;
-	
-	private boolean tablesEnabled= true;
-	
-	public void setContainer(IAntBlockContainer container) {
-		this.container= container; 
-	}
-	
-	private void addButtonsToButtonGroup(Composite parent) {
-		if (addJarButton == null) {
-			addJarButton = container.createPushButton(parent, AntPreferencesMessages.getString("AntClasspathBlock.addJarButtonTitle")); //$NON-NLS-1$;
-			addJarButton.addSelectionListener(new SelectionAdapter() {
-				public void widgetSelected(SelectionEvent evt) {
-					addJars(antTableViewer);
-				
-				}
-			});
-			addFolderButtton = container.createPushButton(parent, AntPreferencesMessages.getString("AntClasspathBlock.addFolderButtonTitle")); //$NON-NLS-1$;
-			addFolderButtton.addSelectionListener(new SelectionAdapter() {
-				public void widgetSelected(SelectionEvent evt) {
-					addFolder(antTableViewer, AntPreferencesMessages.getString("AntClasspathBlock.&Choose_a_folder_to_add_to_the_classpath__1")); //$NON-NLS-1$
-				}
-			});
-
-			upButton = container.createPushButton(parent, AntPreferencesMessages.getString("AntClasspathBlock.upButtonTitle")); //$NON-NLS-1$;
-			upButton.addSelectionListener(new SelectionAdapter() {
-				public void widgetSelected(SelectionEvent evt) {
-					handleMove(-1, antTableViewer);
-				}
-			});
-			downButton = container.createPushButton(parent, AntPreferencesMessages.getString("AntClasspathBlock.downButtonTitle")); //$NON-NLS-1$;
-			downButton.addSelectionListener(new SelectionAdapter() {
-				public void widgetSelected(SelectionEvent evt) {
-					handleMove(1, antTableViewer);
-				}
-			});
-			removeButton = container.createPushButton(parent, AntPreferencesMessages.getString("AntClasspathBlock.removeButtonTitle")); //$NON-NLS-1$;
-			removeButton.addSelectionListener(new SelectionAdapter() {
-				public void widgetSelected(SelectionEvent evt) {
-					remove(antTableViewer);
-				}
-			});
-
-		} else {
-			addUserJarButton = container.createPushButton(parent, AntPreferencesMessages.getString("AntClasspathBlock.addJarButtonTitle2")); //$NON-NLS-1$;
-			addUserJarButton.addSelectionListener(new SelectionAdapter() {
-				public void widgetSelected(SelectionEvent evt) {
-					addJars(userTableViewer);
-				}
-			});
-			addUserFolderButtton = container.createPushButton(parent, AntPreferencesMessages.getString("AntClasspathBlock.addFolderButtonTitle2")); //$NON-NLS-1$;
-			addUserFolderButtton.addSelectionListener(new SelectionAdapter() {
-				public void widgetSelected(SelectionEvent evt) {
-					addFolder(userTableViewer, AntPreferencesMessages.getString("AntClasspathBlock.&Choose_a_folder_to_add_to_the_classpath__1")); //$NON-NLS-1$
-				}
-			});
-			upUserButton = container.createPushButton(parent, AntPreferencesMessages.getString("AntClasspathBlock.upButtonTitle2")); //$NON-NLS-1$;
-			upUserButton.addSelectionListener(new SelectionAdapter() {
-				public void widgetSelected(SelectionEvent evt) {
-					handleMove(-1, userTableViewer);
-				}
-			});
-			downUserButton = container.createPushButton(parent, AntPreferencesMessages.getString("AntClasspathBlock.downButtonTitle2")); //$NON-NLS-1$;
-			downUserButton.addSelectionListener(new SelectionAdapter() {
-				public void widgetSelected(SelectionEvent evt) {
-					handleMove(1, userTableViewer);
-				}
-			});
-			removeUserButton = container.createPushButton(parent, AntPreferencesMessages.getString("AntClasspathBlock.removeButtonTitle2")); //$NON-NLS-1$;
-			removeUserButton.addSelectionListener(new SelectionAdapter() {
-				public void widgetSelected(SelectionEvent evt) {
-					remove(userTableViewer);
-				}
-			});
-		}
-	}
-	
-	private void handleMove(int direction, TableViewer viewer) {
-		IStructuredSelection sel = (IStructuredSelection) viewer.getSelection();
-		List selList = sel.toList();
-		Object[] elements = ((ExternalToolsContentProvider) viewer.getContentProvider()).getElements(viewer.getInput());
-		List contents = new ArrayList(elements.length);
-		for (int i = 0; i < elements.length; i++) {
-			contents.add(elements[i]);
-		}
-		Object[] moved = new Object[contents.size()];
-		int i;
-		for (Iterator current = selList.iterator(); current.hasNext();) {
-			Object config = current.next();
-			i = contents.indexOf(config);
-			moved[i + direction] = config;
-		}
-
-		contents.removeAll(selList);
-
-		for (int j = 0; j < moved.length; j++) {
-			Object config = moved[j];
-			if (config != null) {
-				contents.add(j, config);
-			}
-		}
-		viewer.setInput(contents);
-		viewer.setSelection(viewer.getSelection());
-		container.update();
-	}
-
-	private void remove(TableViewer viewer) {
-		ExternalToolsContentProvider viewerContentProvider = (ExternalToolsContentProvider) viewer.getContentProvider();
-		IStructuredSelection sel = (IStructuredSelection) viewer.getSelection();
-		Iterator enum = sel.iterator();
-		while (enum.hasNext()) {
-			viewerContentProvider.remove(enum.next());
-		}
-		container.update();
-	}
-
-	/**
-	 * Allows the user to enter a folder as a classpath.
-	 */
-	private void addFolder(TableViewer viewer, String message) {
-		String lastUsedPath = dialogSettings.get(IAntUIConstants.DIALOGSTORE_LASTFOLDER);
-		if (lastUsedPath == null) {
-			lastUsedPath = ResourcesPlugin.getWorkspace().getRoot().getLocation().toOSString();
-		}
-		DirectoryDialog dialog = new DirectoryDialog(antTableViewer.getControl().getShell());
-		dialog.setMessage(message);
-		dialog.setFilterPath(lastUsedPath);
-		String result = dialog.open();
-		if (result != null) {
-			try {
-				URL url = new URL("file:" + result + "/"); //$NON-NLS-2$;//$NON-NLS-1$;
-				((ExternalToolsContentProvider)viewer.getContentProvider()).add(url);
-			} catch (MalformedURLException e) {
-			}
-		}
-		viewer.setSelection(viewer.getSelection());
-		dialogSettings.put(IAntUIConstants.DIALOGSTORE_LASTFOLDER, result);
-		container.update();
-	}
-
-	private void addJars(TableViewer viewer) {
-		String lastUsedPath = dialogSettings.get(IAntUIConstants.DIALOGSTORE_LASTEXTJAR);
-		if (lastUsedPath == null) {
-			lastUsedPath = ResourcesPlugin.getWorkspace().getRoot().getLocation().toOSString();
-		}
-		FileDialog dialog = new FileDialog(antTableViewer.getControl().getShell(), SWT.MULTI);
-		dialog.setFilterExtensions(new String[] { "*.jar" }); //$NON-NLS-1$;
-		dialog.setFilterPath(lastUsedPath);
-
-		String result = dialog.open();
-		if (result == null) {
-			return;
-		}
-		IPath filterPath = new Path(dialog.getFilterPath());
-		String[] results = dialog.getFileNames();
-		for (int i = 0; i < results.length; i++) {
-			String jarName = results[i];
-			try {
-				IPath path = filterPath.append(jarName).makeAbsolute();
-				URL url = new URL("file:" + path.toOSString()); //$NON-NLS-1$;
-				((ExternalToolsContentProvider)viewer.getContentProvider()).add(url);
-			} catch (MalformedURLException e) {
-			}
-		}
-
-		viewer.setSelection(viewer.getSelection());
-		dialogSettings.put(IAntUIConstants.DIALOGSTORE_LASTEXTJAR, filterPath.toOSString());
-		container.update();
-	}
-		
-	/**
-	 * Creates the group which will contain the buttons.
-	 */
-	private void createButtonGroup(Composite top) {
-		Composite buttonGroup = new Composite(top, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		layout.marginHeight = 0;
-		layout.marginWidth = 0;
-		buttonGroup.setLayout(layout);
-		buttonGroup.setLayoutData(new GridData(GridData.FILL_VERTICAL));
-		buttonGroup.setFont(top.getFont());
-
-		addButtonsToButtonGroup(buttonGroup);
-	}
-	
-	private void createAntTable(Composite parent) {
-		Table table = new Table(parent, SWT.MULTI | SWT.FULL_SELECTION | SWT.BORDER);
-		GridData data = new GridData(GridData.FILL_BOTH);
-		data.widthHint = IDialogConstants.ENTRY_FIELD_WIDTH;
-		data.heightHint = table.getItemHeight();
-		data.horizontalSpan = 1;
-		table.setLayoutData(data);
-		table.setFont(parent.getFont());
-
-		antContentProvider = new AntClasspathContentProvider();
-		antTableViewer = new TableViewer(table);
-		antTableViewer.setContentProvider(antContentProvider);
-		antTableViewer.setLabelProvider(labelProvider);
-		antTableViewer.addSelectionChangedListener(new ISelectionChangedListener() {
-			public void selectionChanged(SelectionChangedEvent event) {
-				if (tablesEnabled) {
-					tableSelectionChanged((IStructuredSelection) event.getSelection(),
-						(ExternalToolsContentProvider) antTableViewer.getContentProvider(), false);
-				}
-			}
-		});
-	}
-			
-	public void createContents(Composite parent) {
-		Font font = parent.getFont();
-		Label label = new Label(parent, SWT.NONE);
-		GridData gd = new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING);
-		gd.horizontalSpan = 2;
-		label.setLayoutData(gd);
-		label.setFont(font);
-		label.setText(AntPreferencesMessages.getString("AntClasspathBlock.Run&time_classpath__8")); //$NON-NLS-1$
-
-		createAntTable(parent);
-		createButtonGroup(parent);
-
-		createSeparator(parent);
-
-		createAntHome(parent);
-
-		label = new Label(parent, SWT.NONE);
-		gd = new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING);
-		gd.horizontalSpan = 2;
-		label.setLayoutData(gd);
-		label.setFont(font);
-		label.setText(AntPreferencesMessages.getString("AntClasspathBlock.Additional_classpath_entries__11")); //$NON-NLS-1$
-
-		createUserTable(parent);
-		createButtonGroup(parent);
-	}
-	
-	private void createUserTable(Composite top) {
-		Table table = new Table(top, SWT.MULTI | SWT.FULL_SELECTION | SWT.BORDER);
-		GridData data = new GridData(GridData.FILL_BOTH);
-		data.widthHint = IDialogConstants.ENTRY_FIELD_WIDTH;
-		data.heightHint = table.getItemHeight();
-		data.horizontalSpan = 1;
-		table.setLayoutData(data);
-		table.setFont(top.getFont());
-		userContentProvider = new AntClasspathContentProvider();
-		userTableViewer = new TableViewer(table);
-		userTableViewer.setContentProvider(userContentProvider);
-		userTableViewer.setLabelProvider(labelProvider);
-		userTableViewer.addSelectionChangedListener(new ISelectionChangedListener() {
-			public void selectionChanged(SelectionChangedEvent event) {
-				if (tablesEnabled) {
-					tableSelectionChanged((IStructuredSelection) event.getSelection(),
-						(ExternalToolsContentProvider) userTableViewer.getContentProvider(), true);
-				}
-			}
-		});
-	}
-
-	/**
-	 * Creates a space between controls
-	 */
-	private Label createSeparator(Composite parent) {
-		Label separator = new Label(parent, SWT.NONE);
-		GridData gd =
-			new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.VERTICAL_ALIGN_BEGINNING);
-		gd.heightHint = 4;
-		gd.horizontalSpan = 2;
-		separator.setLayoutData(gd);
-		return separator;
-	}
-
-	private void createAntHome(Composite top) {
-		Composite antHomeComposite = new Composite(top, SWT.NONE);
-		antHomeComposite.setLayoutData(
-			new GridData(
-				GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL));
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 2;
-		layout.marginHeight = 0;
-		layout.marginWidth = 0;
-		antHomeComposite.setLayout(layout);
-		antHomeComposite.setFont(top.getFont());
-
-		antHomeButton = new Button(antHomeComposite, SWT.CHECK);
-		antHomeButton.setFont(top.getFont());
-		antHomeButton.setText(AntPreferencesMessages.getString("AntClasspathBlock.Set_ANT_HO&ME_9")); //$NON-NLS-1$
-		antHomeButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent evt) {
-				specifyAntHome();
-			}
-		});
-
-		antHome = new Text(antHomeComposite, SWT.BORDER);
-		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.widthHint = IDialogConstants.ENTRY_FIELD_WIDTH;
-		antHome.setLayoutData(gd);
-		antHome.setFont(top.getFont());
-		antHome.setEnabled(false);
-		antHome.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-				if (initializing) {
-					return;
-				}
-				String path= antHome.getText();
-				if (path.length() > 0) {
-					File rootDir = new File(path, "lib"); //$NON-NLS-1$
-					if (rootDir.exists()) {
-						setAntHome(rootDir);
-					}
-				}
-				container.update();
-			}
-		});
-
-		browseAntHomeButton = container.createPushButton(top, AntPreferencesMessages.getString("AntClasspathBlock.&Browse..._10")); //$NON-NLS-1$
-		browseAntHomeButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				browseAntHome();
-			}
-		});
-		browseAntHomeButton.setEnabled(false);
-	}
-	
-	/* (non-Javadoc)
-	 * Method declared on AntPage.
-	 */
-	private void tableSelectionChanged(IStructuredSelection selection, ExternalToolsContentProvider contentProvider, boolean user) {
-		Object[] elements = contentProvider.getElements(null);
-		List urls = Arrays.asList(elements);
-		boolean notEmpty = !selection.isEmpty();
-		Iterator selected = selection.iterator();
-		boolean first = false;
-		boolean last = false;
-		int lastUrl = urls.size() - 1;
-		while (selected.hasNext()) {
-			Object element = (Object) selected.next();
-			if (!first && urls.indexOf(element) == 0) {
-				first = true;
-			}
-			if (!last && urls.indexOf(element) == lastUrl) {
-				last = true;
-			}
-		}
-
-		if (user) {
-			removeUserButton.setEnabled(notEmpty);
-			upUserButton.setEnabled(notEmpty && !first);
-			downUserButton.setEnabled(notEmpty && !last);
-		} else {
-			removeButton.setEnabled(notEmpty);
-			upButton.setEnabled(notEmpty && !first);
-			downButton.setEnabled(notEmpty && !last);
-		}
-	}
-	
-	private void specifyAntHome() {
-		antHome.setEnabled(!antHome.getEnabled());
-		browseAntHomeButton.setEnabled(!browseAntHomeButton.getEnabled());
-		if (antHome.isEnabled()) {
-			File rootDir = validateAntHome(antHome.getText());
-			if (rootDir != null) {
-				setAntHome(rootDir);
-			}
-		} else {
-			container.setMessage(null);
-			container.setErrorMessage(null);
-		}
-		container.update();
-	}
-	
-	private File validateAntHome(String path) {
-		File rootDir = null;
-		if (path.length() > 0) {
-			rootDir = new File(path, "lib"); //$NON-NLS-1$
-			if (!rootDir.exists()) {
-				container.setErrorMessage(AntPreferencesMessages.getString("AntClasspathBlock.Specified_ANT_HOME_does_not_contain_a___lib___directory_7")); //$NON-NLS-1$
-				return null;
-			}
-		} else {
-			container.setErrorMessage(AntPreferencesMessages.getString("AntClasspathBlock.Specified_ANT_HOME_does_not_contain_a___lib___directory_7")); //$NON-NLS-1$
-			return null;
-		}
-
-		container.setErrorMessage(null);
-		return rootDir;
-	}
-	
-	private void browseAntHome() {
-		String lastUsedPath= dialogSettings.get(IAntUIConstants.DIALOGSTORE_LASTANTHOME);
-		if (lastUsedPath == null) {
-			lastUsedPath= ResourcesPlugin.getWorkspace().getRoot().getLocation().toOSString();
-		}
-		DirectoryDialog dialog = new DirectoryDialog(antTableViewer.getControl().getShell());
-		dialog.setMessage(AntPreferencesMessages.getString("AntClasspathBlock.&Choose_a_folder_that_will_be_used_as_the_location_of_ANT_HOME_3")); //$NON-NLS-1$
-		dialog.setFilterPath(lastUsedPath);
-		String path = dialog.open();
-		if (path == null) {
-			return;
-		}
-	
-		antHome.setText(path);
-		dialogSettings.put(IAntUIConstants.DIALOGSTORE_LASTANTHOME, path);
-		container.update();
-	}
-		
-	private void setAntHome(File rootDir) {
-		AntClasspathContentProvider contentProvider = (AntClasspathContentProvider) antTableViewer.getContentProvider();
-		contentProvider.removeAll();
-		String[] names = rootDir.list();
-		for (int i = 0; i < names.length; i++) {
-			File file = new File(rootDir, names[i]);
-			if (file.isFile() && file.getPath().endsWith(".jar")) { //$NON-NLS-1$
-				try {
-					IPath jarPath = new Path(file.getAbsolutePath());
-					URL url = new URL("file:" + jarPath.toOSString()); //$NON-NLS-1$
-					contentProvider.add(url);
-				} catch (MalformedURLException e) {
-				}
-			}
-		}
-		AntCorePreferences prefs = AntCorePlugin.getPlugin().getPreferences();
-		URL url = prefs.getToolsJarURL();
-		if (url != null) {
-			contentProvider.add(url);
-		}
-		container.update();
-	}
-	
-	public List getAntURLs() { 
-		Object[] elements = antContentProvider.getElements(null);
-		return Arrays.asList(elements);
-	}
-	
-	public List getUserURLs() { 
-		Object[] elements = userContentProvider.getElements(null);
-		return Arrays.asList(elements);
-	}
-	
-	public String getAntHome() {
-		String antHomeText= antHome.getText().trim();
-		if (!antHomeButton.getSelection() || antHomeText.length() == 0) {
-			antHomeText= null;
-		}
-		return antHomeText;
-	}
-	
-	public void setEnabled(boolean enable) {
-		setTablesEnabled(enable);
-		antHomeButton.setEnabled(enable);
-		addFolderButtton.setEnabled(enable);
-		addJarButton.setEnabled(enable);
-		addUserJarButton.setEnabled(enable);
-		addUserFolderButtton.setEnabled(enable);
-		if (enable) {
-			antTableViewer.setSelection(antTableViewer.getSelection());
-			userTableViewer.setSelection(userTableViewer.getSelection());
-		} else {
-			antHomeButton.setSelection(false);
-			antHome.setEnabled(false);
-			browseAntHomeButton.setEnabled(false);
-			downButton.setEnabled(false);
-			downUserButton.setEnabled(false);
-			removeButton.setEnabled(false);
-			removeUserButton.setEnabled(false);
-			upButton.setEnabled(false);
-			upUserButton.setEnabled(false);
-			AntCorePreferences prefs = AntCorePlugin.getPlugin().getPreferences();
-			antTableViewer.setInput(prefs.getAntURLs());
-			userTableViewer.setInput(prefs.getCustomURLs());
-		}
-	}
-	
-	public void initializeAntHome(String antHomeString) {
-		antHomeButton.setSelection(antHomeString != null);
-		antHome.setEnabled(antHomeString != null);
-		browseAntHomeButton.setEnabled(antHomeString != null);
-		if (antHomeString != null) {
-			antHome.setText(antHomeString);
-		} else {
-			antHome.setText(""); //$NON-NLS-1$
-		}
-		initializing= false;
-	}
-	
-	public void setUserTableInput(Object input) {
-		userTableViewer.setInput(input);
-	}
-	
-	public void setAntTableInput(Object input) {
-		antTableViewer.setInput(input);
-	}
-	
-	public boolean isAntHomeEnabled() {
-		return antHome.isEnabled();
-	}
-	
-	public boolean validateAntHome() {
-		return validateAntHome(antHome.getText()) != null;
-	}
-	
-	public Image getClasspathImage() {
-		return labelProvider.getClasspathImage();
-	}
-	
-	public void setTablesEnabled(boolean tablesEnabled) {
-		this.tablesEnabled= tablesEnabled;
-	}
-}
diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/preferences/AntClasspathContentProvider.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/preferences/AntClasspathContentProvider.java
deleted file mode 100644
index 727fe9e..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/preferences/AntClasspathContentProvider.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.ui.internal.preferences;
-
-
-import java.io.File;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Iterator;
-
-import org.eclipse.jface.viewers.ViewerSorter;
-import org.eclipse.ui.externaltools.internal.ui.ExternalToolsContentProvider;
-
-/**
- * Content provider that maintains a list of URLs which are shown in a table
- * viewer.
- */
-public class AntClasspathContentProvider extends ExternalToolsContentProvider {
-	
-	/**
-	 * @see org.eclipse.ui.externaltools.internal.ui.ExternalToolsContentProvider#add(java.lang.Object)
-	 */
-	public void add(Object o) {
-		URL newURL = (URL) o;
-		File newFile= new File(newURL.getFile());
-		Iterator itr = elements.iterator();
-		File existingFile;
-		while (itr.hasNext()) {
-			URL url = (URL) itr.next();
-			existingFile= new File(url.getFile());
-			if (existingFile.equals(newFile)) {
-				return;
-			}
-		}
-		elements.add(o);
-		tableViewer.add(o);
-	}
-
-	public void removeAll() {
-		if (tableViewer != null) {
-			tableViewer.remove(elements.toArray());
-		}
-		elements = new ArrayList(5);
-	}
-	/**
-	 * @see org.eclipse.ui.externaltools.internal.ui.ExternalToolsContentProvider#getSorter()
-	 */
-	protected ViewerSorter getSorter() {
-		return null;
-	}
-}
diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/preferences/AntClasspathLabelProvider.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/preferences/AntClasspathLabelProvider.java
deleted file mode 100644
index b42d963..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/preferences/AntClasspathLabelProvider.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.ui.internal.preferences;
-
-import java.net.URL;
-
-import org.eclipse.ant.ui.internal.model.AntUIImages;
-import org.eclipse.ant.ui.internal.model.IAntUIConstants;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.ui.ISharedImages;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * Label provider for classpath elements
- */
-public class AntClasspathLabelProvider extends LabelProvider implements ITableLabelProvider {
-
-	/* (non-Javadoc)
-	 * Method declared on ITableLabelProvider.
-	 */
-	public Image getColumnImage(Object element, int columnIndex) {
-		URL url = (URL) element;
-		if (url.getFile().endsWith("/")) { //$NON-NLS-1$
-			return getFolderImage();
-		} else {
-			return getJarImage();
-		}
-	}
-
-	/* (non-Javadoc)
-	 * Method declared on ITableLabelProvider.
-	 */
-	public String getColumnText(Object element, int columnIndex) {
-		return ((URL) element).getFile();
-	}
-
-	private Image getFolderImage() {
-		return PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJ_FOLDER);
-	}
-
-	private Image getJarImage() {
-		return AntUIImages.getImage(IAntUIConstants.IMG_JAR_FILE);
-	}
-
-	public Image getClasspathImage() {
-		return AntUIImages.getImage(IAntUIConstants.IMG_TAB_CLASSPATH);
-	}
-}
diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/preferences/AntClasspathPage.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/preferences/AntClasspathPage.java
deleted file mode 100644
index 960cdf9..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/preferences/AntClasspathPage.java
+++ /dev/null
@@ -1,168 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.ui.internal.preferences;
-
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.eclipse.ant.core.AntCorePlugin;
-import org.eclipse.ant.core.AntCorePreferences;
-import org.eclipse.ant.ui.internal.model.IAntUIHelpContextIds;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.TabFolder;
-import org.eclipse.swt.widgets.TabItem;
-import org.eclipse.ui.help.WorkbenchHelp;
-
-/**
- * Sub-page that allows the user to enter custom classpaths
- * to be used when running Ant build files.
- */
-public class AntClasspathPage implements IAntBlockContainer {
-
-	private AntClasspathBlock antClasspathBlock= new AntClasspathBlock();
-	private AntRuntimePreferencePage preferencePage;
-	
-	/**
-	 * Creates an instance.
-	 */
-	public AntClasspathPage(AntRuntimePreferencePage preferencePage) {
-		this.preferencePage = preferencePage;
-	}
-	
-	/**
-	 * Returns the specified user classpath URLs
-	 * 
-	 * @return List
-	 */
-	protected List getUserURLs() {
-		return antClasspathBlock.getUserURLs();
-	}
-	
-	/**
-	 * Returns the currently listed objects in the table.
-	 */
-	protected List getAntURLs() {
-		return antClasspathBlock.getAntURLs();
-	}
-	
-	protected String getAntHome() {
-		return antClasspathBlock.getAntHome();
-	}
-	
-	/**
-	 * Sets the contents of the tables on this page.
-	 */
-	protected void initialize() {
-		
-		AntCorePreferences prefs= AntCorePlugin.getPlugin().getPreferences();
-		antClasspathBlock.setAntTableInput(prefs.getAntURLs());
-		antClasspathBlock.setUserTableInput(Arrays.asList(prefs.getCustomURLs()));
-		antClasspathBlock.setEnabled(true);
-		String antHomeString= prefs.getAntHome();
-		if (antHomeString != null && antHomeString.length() == 0) {
-			antHomeString= null;
-		}
-		antClasspathBlock.initializeAntHome(antHomeString);
-		
-		preferencePage.setErrorMessage(null);
-		preferencePage.setValid(true);
-	}
-	
-	protected void performDefaults() {
-		AntCorePreferences prefs= AntCorePlugin.getPlugin().getPreferences();
-		antClasspathBlock.setAntTableInput(Arrays.asList(prefs.getDefaultAntURLs()));
-		antClasspathBlock.setUserTableInput(new ArrayList(0));
-		antClasspathBlock.initializeAntHome(null);
-		antClasspathBlock.setEnabled(true);
-		update();
-	}
-	
-	/**
-	 * Creates the tab item that contains this sub-page.
-	 */
-	protected TabItem createTabItem(TabFolder folder) {
-		TabItem item = new TabItem(folder, SWT.NONE);
-		item.setText(AntPreferencesMessages.getString("AntClasspathPage.title")); //$NON-NLS-1$;
-		item.setImage(antClasspathBlock.getClasspathImage());
-		item.setData(this);
-		item.setControl(createContents(folder));
-		return item;
-	}
-	
-	/**
-	 * Creates this page's controls
-	 */
-	protected Composite createContents(Composite parent) {
-		WorkbenchHelp.setHelp(parent, IAntUIHelpContextIds.ANT_CLASSPATH_PAGE);
-		Font font = parent.getFont();
-		
-		Composite top = new Composite(parent, SWT.NONE);
-		top.setFont(font);
-		
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 2;
-		layout.marginHeight = 2;
-		layout.marginWidth = 2;
-		top.setLayout(layout);
-
-		top.setLayoutData(new GridData(GridData.FILL_BOTH));
-
-		antClasspathBlock.setContainer(this);
-		antClasspathBlock.createContents(top);
-		
-		return top;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ant.ui.internal.preferences.IAntBlockContainer#update()
-	 */
-	public void update() {
-		setMessage(null);
-		setErrorMessage(null);
-		boolean valid= true;
-		if (antClasspathBlock.isAntHomeEnabled()) {
-			valid= antClasspathBlock.validateAntHome();
-		}
-		preferencePage.setValid(valid);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ant.ui.internal.preferences.IAntBlockContainer#setMessage(java.lang.String)
-	 */
-	public void setMessage(String message) {
-		preferencePage.setMessage(message);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ant.ui.internal.preferences.IAntBlockContainer#setErrorMessage(java.lang.String)
-	 */
-	public void setErrorMessage(String message) {
-		preferencePage.setErrorMessage(message);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ant.ui.internal.preferences.IAntBlockContainer#createPushButton(org.eclipse.swt.widgets.Composite, java.lang.String)
-	 */
-	public Button createPushButton(Composite parent, String buttonText) {
-		Button button = new Button(parent, SWT.PUSH);
-		button.setFont(parent.getFont());
-		button.setText(buttonText);
-		preferencePage.setButtonLayoutData(button);
-		return button;
-	}
-}
\ No newline at end of file
diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/preferences/AntEditorPreferenceConstants.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/preferences/AntEditorPreferenceConstants.java
deleted file mode 100644
index 92ca2e5..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/preferences/AntEditorPreferenceConstants.java
+++ /dev/null
@@ -1,445 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.ui.internal.preferences;
-
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.preference.PreferenceConverter;
-import org.eclipse.swt.graphics.RGB;
-
-/**
- * Preference constants used in the default text editor preference store.
- */
-public class AntEditorPreferenceConstants {
-
-	private AntEditorPreferenceConstants() {
-	}
-	
-	/**
-	 * A named preference that controls whether the current line highlighting is turned on or off.
-	 * <p>
-	 * Value is of type <code>Boolean</code>.
-	 * </p>
-	 */
-	public final static String EDITOR_CURRENT_LINE= "currentLine"; //$NON-NLS-1$
-
-	/**
-	 * A named preference that holds the color used to highlight the current line.
-	 * <p>
-	 * Value is of type <code>String</code>. A RGB color value encoded as a string
-	 * using class <code>PreferenceConverter</code>
-	 * </p>
-	 * 
-	 * @see org.eclipse.jface.resource.StringConverter
-	 * @see org.eclipse.jface.preference.PreferenceConverter
-	 */
-	public final static String EDITOR_CURRENT_LINE_COLOR= "currentLineColor"; //$NON-NLS-1$
-
-	/**
-	 * A named preference that controls whether the print margin is turned on or off.
-	 * <p>
-	 * Value is of type <code>Boolean</code>.
-	 * </p>
-	 */
-	public final static String EDITOR_PRINT_MARGIN= "printMargin"; //$NON-NLS-1$
-	
-	/**
-	 * A named preference that holds the color used to render the print margin.
-	 * <p>
-	 * Value is of type <code>String</code>. A RGB color value encoded as a string
-	 * using class <code>PreferenceConverter</code>
-	 * </p>
-	 * 
-	 * @see org.eclipse.jface.resource.StringConverter
-	 * @see org.eclipse.jface.preference.PreferenceConverter
-	 */
-	public final static String EDITOR_PRINT_MARGIN_COLOR= "printMarginColor"; //$NON-NLS-1$
-
-	/**
-	 * Print margin column. Int value.
-	 */
-	public final static String EDITOR_PRINT_MARGIN_COLUMN= "printMarginColumn"; //$NON-NLS-1$
-
-
-	/**
-	 * A named preference that controls whether the editor shows problem indicators in text (squiggly lines). 
-	 * <p>
-	 * Value is of type <code>Boolean</code>.
-	 * </p>
-	 */
-	public final static String EDITOR_PROBLEM_INDICATION= "problemIndication"; //$NON-NLS-1$
-
-	/**
-	 * A named preference that holds the color used to render problem indicators.
-	 * <p>
-	 * Value is of type <code>String</code>. A RGB color value encoded as a string
-	 * using class <code>PreferenceConverter</code>
-	 * </p>
-	 * 
-	 * @see #EDITOR_PROBLEM_INDICATION
-	 * @see org.eclipse.jface.resource.StringConverter
-	 * @see org.eclipse.jface.preference.PreferenceConverter
-	 */
-	public final static String EDITOR_PROBLEM_INDICATION_COLOR= "problemIndicationColor"; //$NON-NLS-1$
-
-	/**
-	 * A named preference that controls whether the editor shows warning indicators in text (squiggly lines). 
-	 * <p>
-	 * Value is of type <code>Boolean</code>.
-	 * </p>
-	 */
-	public final static String EDITOR_WARNING_INDICATION= "warningIndication"; //$NON-NLS-1$
-
-	/**
-	 * A named preference that holds the color used to render warning indicators.
-	 * <p>
-	 * Value is of type <code>String</code>. A RGB color value encoded as a string
-	 * using class <code>PreferenceConverter</code>
-	 * </p>
-	 * 
-	 * @see #EDITOR_WARNING_INDICATION
-	 * @see org.eclipse.jface.resource.StringConverter
-	 * @see org.eclipse.jface.preference.PreferenceConverter
-	 */
-	public final static String EDITOR_WARNING_INDICATION_COLOR= "warningIndicationColor"; //$NON-NLS-1$
-	
-	/**
-	 * A named preference that controls whether the editor shows info indicators in text (squiggly lines). 
-	 * <p>
-	 * Value is of type <code>Boolean</code>.
-	 * </p>
-	 */
-	public final static String EDITOR_INFO_INDICATION= "infoIndication"; //$NON-NLS-1$
-
-	/**
-	 * A named preference that holds the color used to render info indicators.
-	 * <p>
-	 * Value is of type <code>String</code>. A RGB color value encoded as a string
-	 * using class <code>PreferenceConverter</code>
-	 * </p>
-	 * 
-	 * @see #EDITOR_INFO_INDICATION
-	 * @see org.eclipse.jface.resource.StringConverter
-	 * @see org.eclipse.jface.preference.PreferenceConverter
-	 */
-	public final static String EDITOR_INFO_INDICATION_COLOR= "infoIndicationColor"; //$NON-NLS-1$
-	
-	/**
-	 * A named preference that controls whether the editor shows task indicators in text (squiggly lines). 
-	 * <p>
-	 * Value is of type <code>Boolean</code>.
-	 * </p>
-	 */
-	public final static String EDITOR_TASK_INDICATION= "taskIndication"; //$NON-NLS-1$
-
-	/**
-	 * A named preference that holds the color used to render task indicators.
-	 * <p>
-	 * Value is of type <code>String</code>. A RGB color value encoded as a string
-	 * using class <code>PreferenceConverter</code>
-	 * </p>
-	 * 
-	 * @see #EDITOR_TASK_INDICATION
-	 * @see org.eclipse.jface.resource.StringConverter
-	 * @see org.eclipse.jface.preference.PreferenceConverter
-	 */
-	public final static String EDITOR_TASK_INDICATION_COLOR= "taskIndicationColor"; //$NON-NLS-1$
-
-	/**
-	 * A named preference that controls whether the editor shows bookmark
-	 * indicators in text (squiggly lines).
-	 * <p>
-	 * Value is of type <code>Boolean</code>.
-	 * </p>
-	 * @since 2.1
-	 */
-	public final static String EDITOR_BOOKMARK_INDICATION= "bookmarkIndication"; //$NON-NLS-1$
-
-	/**
-	 * A named preference that holds the color used to render bookmark indicators.
-	 * <p>
-	 * Value is of type <code>String</code>. A RGB color value encoded as a string
-	 * using class <code>PreferenceConverter</code>
-	 * </p>
-	 *
-	 * @see #EDITOR_BOOKMARK_INDICATION
-	 * @see org.eclipse.jface.resource.StringConverter
-	 * @see org.eclipse.jface.preference.PreferenceConverter
-	 * @since 2.1
-	 */
-	public final static String EDITOR_BOOKMARK_INDICATION_COLOR= "bookmarkIndicationColor"; //$NON-NLS-1$
-
-	/**
-	 * A named preference that controls whether the editor shows search
-	 * indicators in text (squiggly lines).
-	 * <p>
-	 * Value is of type <code>Boolean</code>.
-	 * </p>
-	 * @since 2.1
-	 */
-	public final static String EDITOR_SEARCH_RESULT_INDICATION= "searchResultIndication"; //$NON-NLS-1$
-
-	/**
-	 * A named preference that holds the color used to render search indicators.
-	 * <p>
-	 * Value is of type <code>String</code>. A RGB color value encoded as a string
-	 * using class <code>PreferenceConverter</code>
-	 * </p>
-	 *
-	 * @see #EDITOR_SEARCH_RESULT_INDICATION
-	 * @see org.eclipse.jface.resource.StringConverter
-	 * @see org.eclipse.jface.preference.PreferenceConverter
-	 * @since 2.1
-	 */
-	public final static String EDITOR_SEARCH_RESULT_INDICATION_COLOR= "searchResultIndicationColor"; //$NON-NLS-1$
-
-	/**
-	 * A named preference that controls whether the editor shows unknown
-	 * indicators in text (squiggly lines).
-	 * <p>
-	 * Value is of type <code>Boolean</code>.
-	 * </p>
-	 * @since 2.1
-	 */
-	public final static String EDITOR_UNKNOWN_INDICATION= "othersIndication"; //$NON-NLS-1$
-
-	/**
-	 * A named preference that holds the color used to render unknown
-	 * indicators.
-	 * <p>
-	 * Value is of type <code>String</code>. A RGB color value encoded as a string
-	 * using class <code>PreferenceConverter</code>
-	 * </p>
-	 *
-	 * @see #EDITOR_UNKNOWN_INDICATION
-	 * @see org.eclipse.jface.resource.StringConverter
-	 * @see org.eclipse.jface.preference.PreferenceConverter
-	 * @since 2.1
-	 */
-	public final static String EDITOR_UNKNOWN_INDICATION_COLOR= "othersIndicationColor"; //$NON-NLS-1$
-
-	/**
-	 * A named preference that controls whether the overview ruler shows error
-	 * indicators.
-	 * <p>
-	 * Value is of type <code>Boolean</code>.
-	 * </p>
-	 * @since 2.1
-	 */
-	public final static String EDITOR_ERROR_INDICATION_IN_OVERVIEW_RULER= "errorIndicationInOverviewRuler"; //$NON-NLS-1$
-	
-	/**
-	 * A named preference that controls whether the overview ruler shows warning
-	 * indicators.
-	 * <p>
-	 * Value is of type <code>Boolean</code>.
-	 * </p>
-	 * @since 2.1
-	 */
-	public final static String EDITOR_WARNING_INDICATION_IN_OVERVIEW_RULER= "warningIndicationInOverviewRuler"; //$NON-NLS-1$
-
-	/**
-	 * A named preference that controls whether the overview ruler shows info
-	 * indicators.
-	 * <p>
-	 * Value is of type <code>Boolean</code>.
-	 * </p>
-	 * @since 2.1
-	 */
-	public final static String EDITOR_INFO_INDICATION_IN_OVERVIEW_RULER= "infoIndicationInOverviewRuler"; //$NON-NLS-1$
-
-	/**
-	 * A named preference that controls whether the overview ruler shows task
-	 * indicators.
-	 * <p>
-	 * Value is of type <code>Boolean</code>.
-	 * </p>
-	 * @since 2.1
-	 */
-	public final static String EDITOR_TASK_INDICATION_IN_OVERVIEW_RULER= "taskIndicationInOverviewRuler"; //$NON-NLS-1$
-
-	/**
-	 * A named preference that controls whether the overview ruler shows
-	 * bookmark indicators.
-	 * <p>
-	 * Value is of type <code>Boolean</code>.
-	 * </p>
-	 * @since 2.1
-	 */
-	public final static String EDITOR_BOOKMARK_INDICATION_IN_OVERVIEW_RULER= "bookmarkIndicationInOverviewRuler"; //$NON-NLS-1$
-
-	/**
-	 * A named preference that controls whether the overview ruler shows
-	 * search result indicators.
-	 * <p>
-	 * Value is of type <code>Boolean</code>.
-	 * </p>
-	 * @since 2.1
-	 */
-	public final static String EDITOR_SEARCH_RESULT_INDICATION_IN_OVERVIEW_RULER= "searchResultIndicationInOverviewRuler"; //$NON-NLS-1$
-
-	/**
-	 * A named preference that controls whether the overview ruler shows
-	 * unknown indicators.
-	 * <p>
-	 * Value is of type <code>Boolean</code>.
-	 * </p>
-	 * @since 2.1
-	 */
-	public final static String EDITOR_UNKNOWN_INDICATION_IN_OVERVIEW_RULER= "othersIndicationInOverviewRuler"; //$NON-NLS-1$
-
-	/**
-	 * A named preference that controls if temporary problems are evaluated and shown in the UI.
-	 * <p>
-	 * Value is of type <code>Boolean</code>.
-	 * </p>
-	 */
-//	public final static String EDITOR_EVALUTE_TEMPORARY_PROBLEMS= "handleTemporaryProblems"; //$NON-NLS-1$
-
-	/**
-	 * A named preference that controls if the overview ruler is shown in the UI.
-	 * <p>
-	 * Value is of type <code>Boolean</code>.
-	 * </p>
-	 */
-	public final static String EDITOR_OVERVIEW_RULER= "overviewRuler"; //$NON-NLS-1$
-
-	/**
-	 * A named preference that controls if the line number ruler is shown in the UI.
-	 * <p>
-	 * Value is of type <code>Boolean</code>.
-	 * </p>
-	 */
-	public final static String EDITOR_LINE_NUMBER_RULER= "lineNumberRuler"; //$NON-NLS-1$
-
-	/**
-	 * A named preference that holds the color used to render line numbers inside the line number ruler.
-	 * <p>
-	 * Value is of type <code>String</code>. A RGB color value encoded as a string
-	 * using class <code>PreferenceConverter</code>
-	 * </p>
-	 * 
-	 * @see org.eclipse.jface.resource.StringConverter
-	 * @see org.eclipse.jface.preference.PreferenceConverter
-	 * @see #EDITOR_LINE_NUMBER_RULER
-	 */
-	public final static String EDITOR_LINE_NUMBER_RULER_COLOR= "lineNumberColor"; //$NON-NLS-1$
-	
-	/**
-	 * A named preference that controls if the Java code assist gets auto activated.
-	 * <p>
-	 * Value is of type <code>Boolean</code>.
-	 * </p>
-	 */
-	public final static String CODEASSIST_AUTOACTIVATION= "content_assist_autoactivation"; //$NON-NLS-1$
-
-	/**
-	 * A name preference that holds the auto activation delay time in milli seconds.
-	 * <p>
-	 * Value is of type <code>Int</code>.
-	 * </p>
-	 */
-	public final static String CODEASSIST_AUTOACTIVATION_DELAY= "content_assist_autoactivation_delay"; //$NON-NLS-1$
-
-	/**
-	 * A named preference that controls if the Java code assist inserts a
-	 * proposal automatically if only one proposal is available.
-	 * <p>
-	 * Value is of type <code>Boolean</code>.
-	 * </p>
-	 * @since 2.1
-	 */
-	public final static String CODEASSIST_AUTOINSERT= "content_assist_autoinsert"; //$NON-NLS-1$
-
-	/**
-	 * A named preference that holds the characters that auto activate code assist in Java code.
-	 * <p>
-	 * Value is of type <code>Sring</code>. All characters that trigger auto code assist in Java code.
-	 * </p>
-	 */
-	public final static String CODEASSIST_AUTOACTIVATION_TRIGGERS= "content_assist_autoactivation_triggers_java"; //$NON-NLS-1$
-
-	/**
-	 * A named preference that holds the background color used in the code assist selection dialog.
-	 * <p>
-	 * Value is of type <code>String</code>. A RGB color value encoded as a string
-	 * using class <code>PreferenceConverter</code>
-	 * </p>
-	 * 
-	 * @see org.eclipse.jface.resource.StringConverter
-	 * @see org.eclipse.jface.preference.PreferenceConverter
-	 */
-	public final static String CODEASSIST_PROPOSALS_BACKGROUND= "content_assist_proposals_background"; //$NON-NLS-1$
-
-	/**
-	 * A named preference that holds the foreground color used in the code assist selection dialog.
-	 * <p>
-	 * Value is of type <code>String</code>. A RGB color value encoded as a string
-	 * using class <code>PreferenceConverter</code>
-	 * </p>
-	 * 
-	 * @see org.eclipse.jface.resource.StringConverter
-	 * @see org.eclipse.jface.preference.PreferenceConverter
-	 */
-	public final static String CODEASSIST_PROPOSALS_FOREGROUND= "content_assist_proposals_foreground"; //$NON-NLS-1$
-
-	public static void initializeDefaultValues(IPreferenceStore store) {
-
-		store.setDefault(AntEditorPreferenceConstants.EDITOR_CURRENT_LINE, true);
-		PreferenceConverter.setDefault(store, AntEditorPreferenceConstants.EDITOR_CURRENT_LINE_COLOR, new RGB(225, 235, 224));
-
-		store.setDefault(AntEditorPreferenceConstants.EDITOR_PRINT_MARGIN, false);
-		store.setDefault(AntEditorPreferenceConstants.EDITOR_PRINT_MARGIN_COLUMN, 80);
-		PreferenceConverter.setDefault(store, AntEditorPreferenceConstants.EDITOR_PRINT_MARGIN_COLOR, new RGB(176, 180 , 185));
-
-		store.setDefault(AntEditorPreferenceConstants.EDITOR_PROBLEM_INDICATION, true);
-		PreferenceConverter.setDefault(store, AntEditorPreferenceConstants.EDITOR_PROBLEM_INDICATION_COLOR, new RGB(255, 0 , 128));
-		store.setDefault(AntEditorPreferenceConstants.EDITOR_ERROR_INDICATION_IN_OVERVIEW_RULER, true);
-
-		store.setDefault(AntEditorPreferenceConstants.EDITOR_WARNING_INDICATION, true);
-		PreferenceConverter.setDefault(store, AntEditorPreferenceConstants.EDITOR_WARNING_INDICATION_COLOR, new RGB(244, 200 , 45));
-		store.setDefault(AntEditorPreferenceConstants.EDITOR_WARNING_INDICATION_IN_OVERVIEW_RULER, true);
-
-		store.setDefault(AntEditorPreferenceConstants.EDITOR_INFO_INDICATION, true);
-		PreferenceConverter.setDefault(store, AntEditorPreferenceConstants.EDITOR_INFO_INDICATION_COLOR, new RGB(244, 200 , 45));
-		store.setDefault(AntEditorPreferenceConstants.EDITOR_INFO_INDICATION_IN_OVERVIEW_RULER, true);
-
-		store.setDefault(AntEditorPreferenceConstants.EDITOR_TASK_INDICATION, false);
-		PreferenceConverter.setDefault(store, AntEditorPreferenceConstants.EDITOR_TASK_INDICATION_COLOR, new RGB(0, 128, 255));
-		store.setDefault(AntEditorPreferenceConstants.EDITOR_TASK_INDICATION_IN_OVERVIEW_RULER, false);
-
-		store.setDefault(AntEditorPreferenceConstants.EDITOR_BOOKMARK_INDICATION, false);
-		PreferenceConverter.setDefault(store, AntEditorPreferenceConstants.EDITOR_BOOKMARK_INDICATION_COLOR, new RGB(34, 164, 99));
-		store.setDefault(AntEditorPreferenceConstants.EDITOR_BOOKMARK_INDICATION_IN_OVERVIEW_RULER, false);
-
-		store.setDefault(AntEditorPreferenceConstants.EDITOR_SEARCH_RESULT_INDICATION, false);
-		PreferenceConverter.setDefault(store, AntEditorPreferenceConstants.EDITOR_SEARCH_RESULT_INDICATION_COLOR, new RGB(192, 192, 192));
-		store.setDefault(AntEditorPreferenceConstants.EDITOR_SEARCH_RESULT_INDICATION_IN_OVERVIEW_RULER, false);
-
-		store.setDefault(AntEditorPreferenceConstants.EDITOR_UNKNOWN_INDICATION, false);
-		PreferenceConverter.setDefault(store, AntEditorPreferenceConstants.EDITOR_UNKNOWN_INDICATION_COLOR, new RGB(0, 0, 0));
-		store.setDefault(AntEditorPreferenceConstants.EDITOR_UNKNOWN_INDICATION_IN_OVERVIEW_RULER, false);
-
-//		store.setDefault(AntEditorPreferenceConstants.EDITOR_EVALUTE_TEMPORARY_PROBLEMS, true);
-
-		store.setDefault(AntEditorPreferenceConstants.EDITOR_OVERVIEW_RULER, true);
-
-		store.setDefault(AntEditorPreferenceConstants.EDITOR_LINE_NUMBER_RULER, false);
-		PreferenceConverter.setDefault(store, AntEditorPreferenceConstants.EDITOR_LINE_NUMBER_RULER_COLOR, new RGB(0, 0, 0));
-		
-		store.setDefault(AntEditorPreferenceConstants.CODEASSIST_AUTOINSERT, true);
-		store.setDefault(AntEditorPreferenceConstants.CODEASSIST_AUTOACTIVATION, true);
-		store.setDefault(AntEditorPreferenceConstants.CODEASSIST_AUTOACTIVATION_DELAY, 500);
-		PreferenceConverter.setDefault(store, AntEditorPreferenceConstants.CODEASSIST_PROPOSALS_BACKGROUND, new RGB(254, 241, 233));
-		PreferenceConverter.setDefault(store, AntEditorPreferenceConstants.CODEASSIST_PROPOSALS_FOREGROUND, new RGB(0, 0, 0));
-		store.setDefault(AntEditorPreferenceConstants.CODEASSIST_AUTOACTIVATION_TRIGGERS, "<${"); //$NON-NLS-1$
-	}
-}
diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/preferences/AntEditorPreferencePage.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/preferences/AntEditorPreferencePage.java
deleted file mode 100644
index 1b8a253..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/preferences/AntEditorPreferencePage.java
+++ /dev/null
@@ -1,844 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.ui.internal.preferences;
-
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
-import org.eclipse.ant.ui.internal.editor.text.IAntEditorColorConstants;
-import org.eclipse.ant.ui.internal.model.AntUIPlugin;
-import org.eclipse.ant.ui.internal.model.IAntUIHelpContextIds;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jface.dialogs.DialogPage;
-import org.eclipse.jface.preference.PreferenceConverter;
-import org.eclipse.jface.preference.PreferencePage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.graphics.RGB;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.List;
-import org.eclipse.swt.widgets.TabFolder;
-import org.eclipse.swt.widgets.TabItem;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-import org.eclipse.ui.help.WorkbenchHelp;
-
-
-/*
- * The page for setting the editor options.
- */
-public class AntEditorPreferencePage extends PreferencePage implements IWorkbenchPreferencePage {
-	
-	public final OverlayPreferenceStore.OverlayKey[] fKeys= new OverlayPreferenceStore.OverlayKey[] {
-		
-		new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.STRING, AntEditorPreferenceConstants.EDITOR_CURRENT_LINE_COLOR),
-		new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, AntEditorPreferenceConstants.EDITOR_CURRENT_LINE),
-		
-		new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.STRING, AntEditorPreferenceConstants.EDITOR_PRINT_MARGIN_COLOR),
-		new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.INT, AntEditorPreferenceConstants.EDITOR_PRINT_MARGIN_COLUMN),
-		new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, AntEditorPreferenceConstants.EDITOR_PRINT_MARGIN),
-
-		new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.STRING, AntEditorPreferenceConstants.EDITOR_PROBLEM_INDICATION_COLOR),
-		new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, AntEditorPreferenceConstants.EDITOR_PROBLEM_INDICATION),
-		
-		new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.STRING, AntEditorPreferenceConstants.EDITOR_WARNING_INDICATION_COLOR),
-		new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, AntEditorPreferenceConstants.EDITOR_WARNING_INDICATION),
-		
-		new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.STRING, AntEditorPreferenceConstants.EDITOR_INFO_INDICATION_COLOR),
-		new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, AntEditorPreferenceConstants.EDITOR_INFO_INDICATION),
-		
-		new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.STRING, AntEditorPreferenceConstants.EDITOR_TASK_INDICATION_COLOR),
-		new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, AntEditorPreferenceConstants.EDITOR_TASK_INDICATION),
-		
-		new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.STRING, AntEditorPreferenceConstants.EDITOR_BOOKMARK_INDICATION_COLOR),
-		new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, AntEditorPreferenceConstants.EDITOR_BOOKMARK_INDICATION),
-
-		new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.STRING, AntEditorPreferenceConstants.EDITOR_SEARCH_RESULT_INDICATION_COLOR),
-		new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, AntEditorPreferenceConstants.EDITOR_SEARCH_RESULT_INDICATION),
-
-		new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.STRING, AntEditorPreferenceConstants.EDITOR_UNKNOWN_INDICATION_COLOR),
-		new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, AntEditorPreferenceConstants.EDITOR_UNKNOWN_INDICATION),
-
-		new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, AntEditorPreferenceConstants.EDITOR_ERROR_INDICATION_IN_OVERVIEW_RULER),
-		new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, AntEditorPreferenceConstants.EDITOR_WARNING_INDICATION_IN_OVERVIEW_RULER),
-		new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, AntEditorPreferenceConstants.EDITOR_INFO_INDICATION_IN_OVERVIEW_RULER),
-		new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, AntEditorPreferenceConstants.EDITOR_TASK_INDICATION_IN_OVERVIEW_RULER),
-		new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, AntEditorPreferenceConstants.EDITOR_BOOKMARK_INDICATION_IN_OVERVIEW_RULER),
-		new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, AntEditorPreferenceConstants.EDITOR_SEARCH_RESULT_INDICATION_IN_OVERVIEW_RULER),
-		new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, AntEditorPreferenceConstants.EDITOR_UNKNOWN_INDICATION_IN_OVERVIEW_RULER),
-		
-//		new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, AntEditorPreferenceConstants.EDITOR_EVALUTE_TEMPORARY_PROBLEMS),
-		
-		new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, AntEditorPreferenceConstants.EDITOR_OVERVIEW_RULER),
-		
-		new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.STRING, AntEditorPreferenceConstants.EDITOR_LINE_NUMBER_RULER_COLOR),
-		new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, AntEditorPreferenceConstants.EDITOR_LINE_NUMBER_RULER),
-		
-		new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.STRING, IAntEditorColorConstants.P_DEFAULT),
-		new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.STRING, IAntEditorColorConstants.P_PROC_INSTR),
-		new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.STRING, IAntEditorColorConstants.P_STRING),
-		new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.STRING, IAntEditorColorConstants.P_TAG),
-		new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.STRING, IAntEditorColorConstants.P_XML_COMMENT),
-		
-		new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, AntEditorPreferenceConstants.CODEASSIST_AUTOACTIVATION),
-		new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.INT, AntEditorPreferenceConstants.CODEASSIST_AUTOACTIVATION_DELAY),
-		new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, AntEditorPreferenceConstants.CODEASSIST_AUTOINSERT),
-		new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.STRING, AntEditorPreferenceConstants.CODEASSIST_PROPOSALS_BACKGROUND),
-		new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.STRING, AntEditorPreferenceConstants.CODEASSIST_PROPOSALS_FOREGROUND),		
-		new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.STRING, AntEditorPreferenceConstants.CODEASSIST_AUTOACTIVATION_TRIGGERS),
-	};
-	
-	private final String[][] fAppearanceColorListModel= new String[][] {
-		{AntPreferencesMessages.getString("AntEditorPreferencePage.lineNumberForegroundColor"), AntEditorPreferenceConstants.EDITOR_LINE_NUMBER_RULER_COLOR}, //$NON-NLS-1$
-		{AntPreferencesMessages.getString("AntEditorPreferencePage.currentLineHighlighColor"), AntEditorPreferenceConstants.EDITOR_CURRENT_LINE_COLOR}, //$NON-NLS-1$
-		{AntPreferencesMessages.getString("AntEditorPreferencePage.printMarginColor"), AntEditorPreferenceConstants.EDITOR_PRINT_MARGIN_COLOR}, //$NON-NLS-1$
-		{AntPreferencesMessages.getString("AntEditorPreferencePage.Ant_editor_text_1"), IAntEditorColorConstants.P_DEFAULT, null}, //$NON-NLS-1$
-		{AntPreferencesMessages.getString("AntEditorPreferencePage.Ant_editor_processing_instuctions_2"),  IAntEditorColorConstants.P_PROC_INSTR, null}, //$NON-NLS-1$
-		{AntPreferencesMessages.getString("AntEditorPreferencePage.Ant_editor_constant_strings_3"),  IAntEditorColorConstants.P_STRING, null},  //$NON-NLS-1$
-		{AntPreferencesMessages.getString("AntEditorPreferencePage.Ant_editor_tags_4"),    IAntEditorColorConstants.P_TAG, null},  //$NON-NLS-1$
-		{AntPreferencesMessages.getString("AntEditorPreferencePage.Ant_editor_comments_5"), IAntEditorColorConstants.P_XML_COMMENT, null} //$NON-NLS-1$
-	
-	};
-	
-	private final String[][] fAnnotationColorListModel= new String[][] {
-		{AntPreferencesMessages.getString("AntEditorPreferencePage.annotations.errors"), AntEditorPreferenceConstants.EDITOR_PROBLEM_INDICATION_COLOR, AntEditorPreferenceConstants.EDITOR_PROBLEM_INDICATION, AntEditorPreferenceConstants.EDITOR_ERROR_INDICATION_IN_OVERVIEW_RULER }, //$NON-NLS-1$
-		{AntPreferencesMessages.getString("AntEditorPreferencePage.annotations.warnings"), AntEditorPreferenceConstants.EDITOR_WARNING_INDICATION_COLOR, AntEditorPreferenceConstants.EDITOR_WARNING_INDICATION, AntEditorPreferenceConstants.EDITOR_WARNING_INDICATION_IN_OVERVIEW_RULER }, //$NON-NLS-1$
-		{AntPreferencesMessages.getString("AntEditorPreferencePage.annotations.infos"), AntEditorPreferenceConstants.EDITOR_INFO_INDICATION_COLOR, AntEditorPreferenceConstants.EDITOR_INFO_INDICATION, AntEditorPreferenceConstants.EDITOR_INFO_INDICATION_IN_OVERVIEW_RULER }, //$NON-NLS-1$
-		{AntPreferencesMessages.getString("AntEditorPreferencePage.annotations.tasks"), AntEditorPreferenceConstants.EDITOR_TASK_INDICATION_COLOR, AntEditorPreferenceConstants.EDITOR_TASK_INDICATION, AntEditorPreferenceConstants.EDITOR_TASK_INDICATION_IN_OVERVIEW_RULER }, //$NON-NLS-1$
-		{AntPreferencesMessages.getString("AntEditorPreferencePage.annotations.searchResults"), AntEditorPreferenceConstants.EDITOR_SEARCH_RESULT_INDICATION_COLOR, AntEditorPreferenceConstants.EDITOR_SEARCH_RESULT_INDICATION, AntEditorPreferenceConstants.EDITOR_SEARCH_RESULT_INDICATION_IN_OVERVIEW_RULER }, //$NON-NLS-1$
-		{AntPreferencesMessages.getString("AntEditorPreferencePage.annotations.bookmarks"), AntEditorPreferenceConstants.EDITOR_BOOKMARK_INDICATION_COLOR, AntEditorPreferenceConstants.EDITOR_BOOKMARK_INDICATION, AntEditorPreferenceConstants.EDITOR_BOOKMARK_INDICATION_IN_OVERVIEW_RULER }, //$NON-NLS-1$
-		{AntPreferencesMessages.getString("AntEditorPreferencePage.annotations.others"), AntEditorPreferenceConstants.EDITOR_UNKNOWN_INDICATION_COLOR, AntEditorPreferenceConstants.EDITOR_UNKNOWN_INDICATION, AntEditorPreferenceConstants.EDITOR_UNKNOWN_INDICATION_IN_OVERVIEW_RULER } //$NON-NLS-1$
-	};
-	
-	private final String[][] fContentAssistColorListModel= new String[][] {
-		{AntPreferencesMessages.getString("AntEditorPreferencePage.backgroundForCompletionProposals"), AntEditorPreferenceConstants.CODEASSIST_PROPOSALS_BACKGROUND }, //$NON-NLS-1$
-		{AntPreferencesMessages.getString("AntEditorPreferencePage.foregroundForCompletionProposals"), AntEditorPreferenceConstants.CODEASSIST_PROPOSALS_FOREGROUND }, //$NON-NLS-1$
-		//{AntPreferencesMessages.getString("AntEditorPreferencePage.backgroundForCompletionReplacement"), AntEditorPreferenceConstants.CODEASSIST_REPLACEMENT_BACKGROUND }, //$NON-NLS-1$
-		//{AntPreferencesMessages.getString("AntEditorPreferencePage.foregroundForCompletionReplacement"), AntEditorPreferenceConstants.CODEASSIST_REPLACEMENT_FOREGROUND } //$NON-NLS-1$
-	};
-
-	private OverlayPreferenceStore fOverlayStore;
-	
-	private Map fCheckBoxes= new HashMap();
-	private SelectionListener fCheckBoxListener= new SelectionListener() {
-		public void widgetDefaultSelected(SelectionEvent e) {
-		}
-		public void widgetSelected(SelectionEvent e) {
-			Button button= (Button) e.widget;
-			fOverlayStore.setValue((String) fCheckBoxes.get(button), button.getSelection());
-		}
-	};
-	
-	private Map fTextFields= new HashMap();
-	private ModifyListener fTextFieldListener= new ModifyListener() {
-		public void modifyText(ModifyEvent e) {
-			Text text= (Text) e.widget;
-			fOverlayStore.setValue((String) fTextFields.get(text), text.getText());
-		}
-	};
-
-	private ArrayList fNumberFields= new ArrayList();
-	private ModifyListener fNumberFieldListener= new ModifyListener() {
-		public void modifyText(ModifyEvent e) {
-			numberFieldChanged((Text) e.widget);
-		}
-	};
-	
-	private List fAppearanceColorList;
-	private List fAnnotationList;
-	private List fContentAssistColorList;
-	
-	private ColorEditor fAppearanceColorEditor;
-	private ColorEditor fAnnotationForegroundColorEditor;
-	private ColorEditor fContentAssistColorEditor;
-	
-	private Button fShowInTextCheckBox;
-	private Button fShowInOverviewRulerCheckBox;
-	
-	private Control fAutoInsertDelayText;
-	private Control fAutoInsertTriggerText;
-	private Label fAutoInsertDelayLabel;
-	private Label fAutoInsertTriggerLabel;
-	
-	public AntEditorPreferencePage() {
-		setDescription(AntPreferencesMessages.getString("AntEditorPreferencePage.description")); //$NON-NLS-1$
-		setPreferenceStore(AntUIPlugin.getDefault().getPreferenceStore());
-		fOverlayStore= new OverlayPreferenceStore(getPreferenceStore(), fKeys);
-	}
-	
-	/*
-	 * @see IWorkbenchPreferencePage#init()
-	 */	
-	public void init(IWorkbench workbench) {
-	}
-	
-	private Label getLabelControl(Control[] labelledTextField){
-		return (Label)labelledTextField[0];
-	}
-
-	private Text getTextControl(Control[] labelledTextField){
-		return (Text)labelledTextField[1];
-	}
-
-	private void handleAppearanceColorListSelection() {	
-		int i= fAppearanceColorList.getSelectionIndex();
-		String key= fAppearanceColorListModel[i][1];
-		RGB rgb= PreferenceConverter.getColor(fOverlayStore, key);
-		fAppearanceColorEditor.setColorValue(rgb);		
-	}
-
-	private void handleAnnotationListSelection() {
-		int i= fAnnotationList.getSelectionIndex();
-		
-		String key= fAnnotationColorListModel[i][1];
-		RGB rgb= PreferenceConverter.getColor(fOverlayStore, key);
-		fAnnotationForegroundColorEditor.setColorValue(rgb);
-		
-		key= fAnnotationColorListModel[i][2];
-		fShowInTextCheckBox.setSelection(fOverlayStore.getBoolean(key));
-		
-		key= fAnnotationColorListModel[i][3];
-		fShowInOverviewRulerCheckBox.setSelection(fOverlayStore.getBoolean(key));				
-	}
-
-	private Control createAppearancePage(Composite parent) {
-		Font font= parent.getFont();
-
-		Composite appearanceComposite= new Composite(parent, SWT.NONE);
-		appearanceComposite.setFont(font);
-		GridLayout layout= new GridLayout(); layout.numColumns= 2;
-		appearanceComposite.setLayout(layout);
-
-		String labelText= AntPreferencesMessages.getString("AntEditorPreferencePage.printMarginColumn"); //$NON-NLS-1$
-		addTextField(appearanceComposite, labelText, AntEditorPreferenceConstants.EDITOR_PRINT_MARGIN_COLUMN, 3, 0, true);
-				
-		labelText= AntPreferencesMessages.getString("AntEditorPreferencePage.showOverviewRuler"); //$NON-NLS-1$
-		addCheckBox(appearanceComposite, labelText, AntEditorPreferenceConstants.EDITOR_OVERVIEW_RULER, 0);
-				
-		labelText= AntPreferencesMessages.getString("AntEditorPreferencePage.showLineNumbers"); //$NON-NLS-1$
-		addCheckBox(appearanceComposite, labelText, AntEditorPreferenceConstants.EDITOR_LINE_NUMBER_RULER, 0);
-
-		labelText= AntPreferencesMessages.getString("AntEditorPreferencePage.highlightCurrentLine"); //$NON-NLS-1$
-		addCheckBox(appearanceComposite, labelText, AntEditorPreferenceConstants.EDITOR_CURRENT_LINE, 0);
-				
-		labelText= AntPreferencesMessages.getString("AntEditorPreferencePage.showPrintMargin"); //$NON-NLS-1$
-		addCheckBox(appearanceComposite, labelText, AntEditorPreferenceConstants.EDITOR_PRINT_MARGIN, 0);
-
-
-		Label label= new Label(appearanceComposite, SWT.LEFT );
-		label.setFont(font);
-		GridData gd= new GridData(GridData.HORIZONTAL_ALIGN_FILL);
-		gd.horizontalSpan= 2;
-		gd.heightHint= convertHeightInCharsToPixels(1) / 2;
-		label.setLayoutData(gd);
-		
-		label= new Label(appearanceComposite, SWT.LEFT);
-		label.setFont(font);
-		label.setText(AntPreferencesMessages.getString("AntEditorPreferencePage.appearanceOptions")); //$NON-NLS-1$
-		gd= new GridData(GridData.HORIZONTAL_ALIGN_FILL);
-		gd.horizontalSpan= 2;
-		label.setLayoutData(gd);
-
-		Composite editorComposite= new Composite(appearanceComposite, SWT.NONE);
-		editorComposite.setFont(font);
-		layout= new GridLayout();
-		layout.numColumns= 2;
-		layout.marginHeight= 0;
-		layout.marginWidth= 0;
-		editorComposite.setLayout(layout);
-		gd= new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.FILL_VERTICAL);
-		gd.horizontalSpan= 2;
-		editorComposite.setLayoutData(gd);		
-
-		fAppearanceColorList= new List(editorComposite, SWT.SINGLE | SWT.V_SCROLL | SWT.BORDER);
-		fAppearanceColorList.setFont(font);
-		gd= new GridData(GridData.VERTICAL_ALIGN_BEGINNING | GridData.FILL_HORIZONTAL);
-		gd.heightHint= convertHeightInCharsToPixels(8);
-		fAppearanceColorList.setLayoutData(gd);
-						
-		Composite stylesComposite= new Composite(editorComposite, SWT.NONE);
-		stylesComposite.setFont(font);
-		layout= new GridLayout();
-		layout.marginHeight= 0;
-		layout.marginWidth= 0;
-		layout.numColumns= 2;
-		stylesComposite.setLayout(layout);
-		stylesComposite.setLayoutData(new GridData(GridData.FILL_BOTH));
-		
-		label= new Label(stylesComposite, SWT.LEFT);
-		label.setFont(font);
-		label.setText(AntPreferencesMessages.getString("AntEditorPreferencePage.color")); //$NON-NLS-1$
-		gd= new GridData();
-		gd.horizontalAlignment= GridData.BEGINNING;
-		label.setLayoutData(gd);
-
-		fAppearanceColorEditor= new ColorEditor(stylesComposite);
-		Button foregroundColorButton= fAppearanceColorEditor.getButton();
-		foregroundColorButton.setFont(font);
-		gd= new GridData(GridData.FILL_HORIZONTAL);
-		gd.horizontalAlignment= GridData.BEGINNING;
-		foregroundColorButton.setLayoutData(gd);
-
-		fAppearanceColorList.addSelectionListener(new SelectionListener() {
-			public void widgetDefaultSelected(SelectionEvent e) {
-				// do nothing
-			}
-			public void widgetSelected(SelectionEvent e) {
-				handleAppearanceColorListSelection();
-			}
-		});
-		foregroundColorButton.addSelectionListener(new SelectionListener() {
-			public void widgetDefaultSelected(SelectionEvent e) {
-				// do nothing
-			}
-			public void widgetSelected(SelectionEvent e) {
-				int i= fAppearanceColorList.getSelectionIndex();
-				String key= fAppearanceColorListModel[i][1];
-				
-				PreferenceConverter.setValue(fOverlayStore, key, fAppearanceColorEditor.getColorValue());
-			}
-		});
-		return appearanceComposite;
-	}
-	
-	/**
-	 * Returns an array of size 2:
-	 *  - first element is of type <code>Label</code>
-	 *  - second element is of type <code>Text</code>
-	 * Use <code>getLabelControl</code> and <code>getTextControl</code> to get the 2 controls.
-	 */
-	private Control[] addLabelledTextField(Composite composite, String label, String key, int textLimit, int indentation, boolean isNumber) {
-		Label labelControl= new Label(composite, SWT.NONE);
-		labelControl.setText(label);
-		labelControl.setFont(composite.getFont());
-		GridData gd= new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING);
-		gd.horizontalIndent= indentation;
-		labelControl.setLayoutData(gd);
-	
-		Text textControl= new Text(composite, SWT.BORDER | SWT.SINGLE);		
-		gd= new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING);
-		gd.widthHint= convertWidthInCharsToPixels(textLimit + 1);
-		textControl.setLayoutData(gd);
-		textControl.setTextLimit(textLimit);
-		textControl.setFont(composite.getFont());
-		fTextFields.put(textControl, key);
-		if (isNumber) {
-			fNumberFields.add(textControl);
-			textControl.addModifyListener(fNumberFieldListener);
-		} else {
-			textControl.addModifyListener(fTextFieldListener);
-		}
-		
-		return new Control[]{labelControl, textControl};
-	}
-		
-	private Control createContentAssistPage(Composite parent) {
-		Font font= parent.getFont();
-		Composite contentAssistComposite= new Composite(parent, SWT.NULL);
-		GridLayout layout= new GridLayout(); 
-		layout.numColumns= 2;
-		contentAssistComposite.setLayout(layout);
-		contentAssistComposite.setFont(font);
-
-		String text= AntPreferencesMessages.getString("AntEditorPreferencePage.Insert"); //$NON-NLS-1$
-		addCheckBox(contentAssistComposite, text, AntEditorPreferenceConstants.CODEASSIST_AUTOINSERT, 0);		
-
-		//text= "&Fill parameters automatically";
-		//addCheckBox(contentAssistComposite, text, AntEditorPreferenceConstants.CODEASSIST_FILL_ARGUMENT_NAMES, 0);
-
-		text= AntPreferencesMessages.getString("AntEditorPreferencePage.&Enable_auto_activation_2"); //$NON-NLS-1$
-		final Button autoactivation= addCheckBox(contentAssistComposite, text, AntEditorPreferenceConstants.CODEASSIST_AUTOACTIVATION, 0);
-		autoactivation.addSelectionListener(new SelectionAdapter(){
-			public void widgetSelected(SelectionEvent e) {
-				updateAutoactivationControls();
-			}
-		});		
-		
-		Control[] labelledTextField;
-		text= AntPreferencesMessages.getString("AntEditorPreferencePage.Auto_activation_&delay__3"); //$NON-NLS-1$
-		labelledTextField= addLabelledTextField(contentAssistComposite, text, AntEditorPreferenceConstants.CODEASSIST_AUTOACTIVATION_DELAY, 4, 0, true);
-		fAutoInsertDelayLabel= getLabelControl(labelledTextField);
-		fAutoInsertDelayText= getTextControl(labelledTextField);
-		
-		text= AntPreferencesMessages.getString("AntEditorPreferencePage.Auto_activation_tri&ggers__4"); //$NON-NLS-1$
-		labelledTextField= addLabelledTextField(contentAssistComposite, text, AntEditorPreferenceConstants.CODEASSIST_AUTOACTIVATION_TRIGGERS, 4, 0, false);
-		fAutoInsertTriggerLabel= getLabelControl(labelledTextField);
-		fAutoInsertTriggerText= getTextControl(labelledTextField);
-		
-		Label label= new Label(contentAssistComposite, SWT.LEFT);
-		label.setText(AntPreferencesMessages.getString("AntEditorPreferencePage.Code_assist_colo&r_options__5")); //$NON-NLS-1$
-		label.setFont(font);
-		GridData gd= new GridData(GridData.HORIZONTAL_ALIGN_FILL);
-		gd.horizontalSpan= 2;
-		label.setLayoutData(gd);
-
-		Composite editorComposite= new Composite(contentAssistComposite, SWT.NONE);
-		layout= new GridLayout();
-		layout.numColumns= 2;
-		layout.marginHeight= 0;
-		layout.marginWidth= 0;
-		editorComposite.setLayout(layout);
-		editorComposite.setFont(font);
-		gd= new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.FILL_VERTICAL);
-		gd.horizontalSpan= 2;
-		editorComposite.setLayoutData(gd);		
-
-		fContentAssistColorList= new List(editorComposite, SWT.SINGLE | SWT.V_SCROLL | SWT.BORDER);
-		gd= new GridData(GridData.VERTICAL_ALIGN_BEGINNING | GridData.FILL_HORIZONTAL);
-		gd.heightHint= convertHeightInCharsToPixels(8);
-		fContentAssistColorList.setLayoutData(gd);
-		fContentAssistColorList.setFont(font);
-						
-		Composite stylesComposite= new Composite(editorComposite, SWT.NONE);
-		layout= new GridLayout();
-		layout.marginHeight= 0;
-		layout.marginWidth= 0;
-		layout.numColumns= 2;
-		stylesComposite.setLayout(layout);
-		stylesComposite.setLayoutData(new GridData(GridData.FILL_BOTH));
-		stylesComposite.setFont(font);
-		
-		label= new Label(stylesComposite, SWT.LEFT);
-		label.setText(AntPreferencesMessages.getString("AntEditorPreferencePage.Col&or__6")); //$NON-NLS-1$
-		label.setFont(font);
-		gd= new GridData();
-		gd.horizontalAlignment= GridData.BEGINNING;
-		label.setLayoutData(gd);
-
-		fContentAssistColorEditor= new ColorEditor(stylesComposite);
-		Button colorButton= fContentAssistColorEditor.getButton();
-		gd= new GridData(GridData.FILL_HORIZONTAL);
-		gd.horizontalAlignment= GridData.BEGINNING;
-		colorButton.setLayoutData(gd);
-
-		fContentAssistColorList.addSelectionListener(new SelectionListener() {
-			public void widgetDefaultSelected(SelectionEvent e) {
-				// do nothing
-			}
-			public void widgetSelected(SelectionEvent e) {
-				handleContentAssistColorListSelection();
-			}
-		});
-		
-		colorButton.addSelectionListener(new SelectionListener() {
-			public void widgetDefaultSelected(SelectionEvent e) {
-				// do nothing
-			}
-			public void widgetSelected(SelectionEvent e) {
-				int i= fContentAssistColorList.getSelectionIndex();
-				String key= fContentAssistColorListModel[i][1];
-				
-				PreferenceConverter.setValue(fOverlayStore, key, fContentAssistColorEditor.getColorValue());
-			}
-		});
-
-		return contentAssistComposite;
-	}
-	
-	private void handleContentAssistColorListSelection() {	
-		int i= fContentAssistColorList.getSelectionIndex();
-		String key= fContentAssistColorListModel[i][1];
-		RGB rgb= PreferenceConverter.getColor(fOverlayStore, key);
-		fContentAssistColorEditor.setColorValue(rgb);
-	}
-		
-	private void updateAutoactivationControls() {
-	   boolean autoactivation= fOverlayStore.getBoolean(AntEditorPreferenceConstants.CODEASSIST_AUTOACTIVATION);
-	   fAutoInsertDelayText.setEnabled(autoactivation);
-	   fAutoInsertDelayLabel.setEnabled(autoactivation);
-
-	   fAutoInsertTriggerText.setEnabled(autoactivation);
-	   fAutoInsertTriggerLabel.setEnabled(autoactivation);
-   }
-	
-	private Control createAnnotationsPage(Composite parent) {
-		Font font= parent.getFont();
-		Composite composite= new Composite(parent, SWT.NULL);
-		composite.setFont(font);
-		GridLayout layout= new GridLayout(); layout.numColumns= 2;
-		composite.setLayout(layout);
-				
-//		String text= AntPreferencesMessages.getString("AntEditorPreferencePage.analyseAnnotationsWhileTyping"); //$NON-NLS-1$
-//		addCheckBox(composite, text, AntEditorPreferenceConstants.EDITOR_EVALUTE_TEMPORARY_PROBLEMS, 0);
-//		
-//		addFiller(composite);
-				
-		Label label= new Label(composite, SWT.LEFT);
-		label.setFont(font);
-		label.setText(AntPreferencesMessages.getString("AntEditorPreferencePage.annotationPresentationOptions")); //$NON-NLS-1$
-		GridData gd= new GridData(GridData.HORIZONTAL_ALIGN_FILL);
-		gd.horizontalSpan= 2;
-		label.setLayoutData(gd);
-
-		Composite editorComposite= new Composite(composite, SWT.NONE);
-		editorComposite.setFont(font);
-		layout= new GridLayout();
-		layout.numColumns= 2;
-		layout.marginHeight= 0;
-		layout.marginWidth= 0;
-		editorComposite.setLayout(layout);
-		gd= new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.FILL_VERTICAL);
-		gd.horizontalSpan= 2;
-		editorComposite.setLayoutData(gd);		
-
-		fAnnotationList= new List(editorComposite, SWT.SINGLE | SWT.V_SCROLL | SWT.BORDER);
-		fAnnotationList.setFont(font);
-		gd= new GridData(GridData.VERTICAL_ALIGN_BEGINNING | GridData.FILL_HORIZONTAL);
-		gd.heightHint= convertHeightInCharsToPixels(8);
-		fAnnotationList.setLayoutData(gd);
-						
-		Composite optionsComposite= new Composite(editorComposite, SWT.NONE);
-		optionsComposite.setFont(font);
-		layout= new GridLayout();
-		layout.marginHeight= 0;
-		layout.marginWidth= 0;
-		layout.numColumns= 2;
-		optionsComposite.setLayout(layout);
-		optionsComposite.setLayoutData(new GridData(GridData.FILL_BOTH));
-		
-		fShowInTextCheckBox= new Button(optionsComposite, SWT.CHECK);
-		fShowInTextCheckBox.setFont(font);
-		fShowInTextCheckBox.setText(AntPreferencesMessages.getString("AntEditorPreferencePage.annotations.showInText")); //$NON-NLS-1$
-		gd= new GridData(GridData.FILL_HORIZONTAL);
-		gd.horizontalAlignment= GridData.BEGINNING;
-		gd.horizontalSpan= 2;
-		fShowInTextCheckBox.setLayoutData(gd);
-		
-		fShowInOverviewRulerCheckBox= new Button(optionsComposite, SWT.CHECK);
-		fShowInOverviewRulerCheckBox.setFont(font);
-		fShowInOverviewRulerCheckBox.setText(AntPreferencesMessages.getString("AntEditorPreferencePage.annotations.showInOverviewRuler")); //$NON-NLS-1$
-		gd= new GridData(GridData.FILL_HORIZONTAL);
-		gd.horizontalAlignment= GridData.BEGINNING;
-		gd.horizontalSpan= 2;
-		fShowInOverviewRulerCheckBox.setLayoutData(gd);
-		
-		label= new Label(optionsComposite, SWT.LEFT);
-		label.setFont(font);
-		label.setText(AntPreferencesMessages.getString("AntEditorPreferencePage.annotations.color")); //$NON-NLS-1$
-		gd= new GridData();
-		gd.horizontalAlignment= GridData.BEGINNING;
-		label.setLayoutData(gd);
-
-		fAnnotationForegroundColorEditor= new ColorEditor(optionsComposite);
-		Button foregroundColorButton= fAnnotationForegroundColorEditor.getButton();
-		foregroundColorButton.setFont(font);
-		gd= new GridData(GridData.FILL_HORIZONTAL);
-		gd.horizontalAlignment= GridData.BEGINNING;
-		foregroundColorButton.setLayoutData(gd);
-
-		fAnnotationList.addSelectionListener(new SelectionListener() {
-			public void widgetDefaultSelected(SelectionEvent e) {
-				// do nothing
-			}
-			
-			public void widgetSelected(SelectionEvent e) {
-				handleAnnotationListSelection();
-			}
-		});
-		
-		fShowInTextCheckBox.addSelectionListener(new SelectionListener() {
-			public void widgetDefaultSelected(SelectionEvent e) {
-				// do nothing
-			}
-			
-			public void widgetSelected(SelectionEvent e) {
-				int i= fAnnotationList.getSelectionIndex();
-				String key= fAnnotationColorListModel[i][2];
-				fOverlayStore.setValue(key, fShowInTextCheckBox.getSelection());
-			}
-		});
-		
-		fShowInOverviewRulerCheckBox.addSelectionListener(new SelectionListener() {
-			public void widgetDefaultSelected(SelectionEvent e) {
-				// do nothing
-			}
-			
-			public void widgetSelected(SelectionEvent e) {
-				int i= fAnnotationList.getSelectionIndex();
-				String key= fAnnotationColorListModel[i][3];
-				fOverlayStore.setValue(key, fShowInOverviewRulerCheckBox.getSelection());
-			}
-		});
-		
-		foregroundColorButton.addSelectionListener(new SelectionListener() {
-			public void widgetDefaultSelected(SelectionEvent e) {
-				// do nothing
-			}
-			
-			public void widgetSelected(SelectionEvent e) {
-				int i= fAnnotationList.getSelectionIndex();
-				String key= fAnnotationColorListModel[i][1];
-				PreferenceConverter.setValue(fOverlayStore, key, fAnnotationForegroundColorEditor.getColorValue());
-			}
-		});
-		
-		return composite;
-	}
-
-//	private void addFiller(Composite composite) {
-//		Label filler= new Label(composite, SWT.LEFT );
-//		GridData gd= new GridData(GridData.HORIZONTAL_ALIGN_FILL);
-//		gd.horizontalSpan= 2;
-//		gd.heightHint= convertHeightInCharsToPixels(1) / 2;
-//		filler.setLayoutData(gd);
-//	}
-	
-	/*
-	 * @see PreferencePage#createContents(Composite)
-	 */
-	protected Control createContents(Composite parent) {
-
-		WorkbenchHelp.setHelp(getControl(), IAntUIHelpContextIds.ANT_EDITOR_PREFERENCE_PAGE);
-		fOverlayStore.load();
-		fOverlayStore.start();
-		
-		Font font= parent.getFont();
-		TabFolder folder= new TabFolder(parent, SWT.NONE);
-		folder.setLayout(new TabFolderLayout());	
-		folder.setLayoutData(new GridData(GridData.FILL_BOTH));
-		folder.setFont(font);
-		
-		TabItem item= new TabItem(folder, SWT.NONE);
-		item.setText(AntPreferencesMessages.getString("AntEditorPreferencePage.general")); //$NON-NLS-1$
-		item.setControl(createAppearancePage(folder));
-		
-		item= new TabItem(folder, SWT.NONE);
-		item.setText(AntPreferencesMessages.getString("AntEditorPreferencePage.codeAssistTab.title")); //$NON-NLS-1$
-		item.setControl(createContentAssistPage(folder));
-				
-		item= new TabItem(folder, SWT.NONE);
-		item.setText(AntPreferencesMessages.getString("AntEditorPreferencePage.annotationsTab.title")); //$NON-NLS-1$
-		item.setControl(createAnnotationsPage(folder));
-		
-		
-
-		initialize();
-		
-		return folder;
-	}
-	
-	private void initialize() {
-		
-		initializeFields();
-		
-		for (int i= 0; i < fAppearanceColorListModel.length; i++) {
-			fAppearanceColorList.add(fAppearanceColorListModel[i][0]);
-		}
-		fAppearanceColorList.getDisplay().asyncExec(new Runnable() {
-			public void run() {
-				if (fAppearanceColorList != null && !fAppearanceColorList.isDisposed()) {
-					fAppearanceColorList.select(0);
-					handleAppearanceColorListSelection();
-				}
-			}
-		});
-		
-		for (int i= 0; i < fAnnotationColorListModel.length; i++) {
-			fAnnotationList.add(fAnnotationColorListModel[i][0]);
-		}
-		fAnnotationList.getDisplay().asyncExec(new Runnable() {
-			public void run() {
-				if (fAnnotationList != null && !fAnnotationList.isDisposed()) {
-					fAnnotationList.select(0);
-					handleAnnotationListSelection();
-				}
-			}
-		});
-		
-		for (int i= 0; i < fContentAssistColorListModel.length; i++) {
-			fContentAssistColorList.add(fContentAssistColorListModel[i][0]);
-		}
-		fContentAssistColorList.getDisplay().asyncExec(new Runnable() {
-			public void run() {
-				if (fContentAssistColorList != null && !fContentAssistColorList.isDisposed()) {
-					fContentAssistColorList.select(0);
-					handleContentAssistColorListSelection();
-				}
-			}
-		});
-	}
-	
-	private void initializeFields() {
-		
-		Iterator e= fCheckBoxes.keySet().iterator();
-		while (e.hasNext()) {
-			Button b= (Button) e.next();
-			String key= (String) fCheckBoxes.get(b);
-			b.setSelection(fOverlayStore.getBoolean(key));
-		}
-		
-		e= fTextFields.keySet().iterator();
-		while (e.hasNext()) {
-			Text t= (Text) e.next();
-			String key= (String) fTextFields.get(t);
-			t.setText(fOverlayStore.getString(key));
-		}		
-	}
-	
-	/*
-	 * @see PreferencePage#performOk()
-	 */
-	public boolean performOk() {
-		fOverlayStore.propagate();
-		AntUIPlugin.getDefault().savePluginPreferences();
-		return true;
-	}
-	
-	/*
-	 * @see PreferencePage#performDefaults()
-	 */
-	protected void performDefaults() {
-		
-		fOverlayStore.loadDefaults();
-
-		initializeFields();
-
-		handleAppearanceColorListSelection();
-		handleAnnotationListSelection();
-		handleContentAssistColorListSelection();
-
-		super.performDefaults();
-	}
-	
-	/*
-	 * @see DialogPage#dispose()
-	 */
-	public void dispose() {
-		
-		if (fOverlayStore != null) {
-			fOverlayStore.stop();
-			fOverlayStore= null;
-		}
-		
-		super.dispose();
-	}
-	
-	private Button addCheckBox(Composite parent, String labelText, String key, int indentation) {		
-		Button checkBox= new Button(parent, SWT.CHECK);
-		checkBox.setText(labelText);
-		checkBox.setFont(parent.getFont());
-		
-		GridData gd= new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING);
-		gd.horizontalIndent= indentation;
-		gd.horizontalSpan= 2;
-		checkBox.setLayoutData(gd);
-		checkBox.addSelectionListener(fCheckBoxListener);
-		
-		fCheckBoxes.put(checkBox, key);
-		
-		return checkBox;
-	}
-	
-	private Control addTextField(Composite composite, String labelText, String key, int textLimit, int indentation, boolean isNumber) {
-		Font font= composite.getFont();
-		
-		Label label= new Label(composite, SWT.NONE);
-		label.setText(labelText);
-		label.setFont(font);
-		GridData gd= new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING);
-		gd.horizontalIndent= indentation;
-		label.setLayoutData(gd);
-		
-		Text textControl= new Text(composite, SWT.BORDER | SWT.SINGLE);
-		textControl.setFont(font);		
-		gd= new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING);
-		gd.widthHint= convertWidthInCharsToPixels(textLimit + 1);
-		textControl.setLayoutData(gd);
-		textControl.setTextLimit(textLimit);
-		fTextFields.put(textControl, key);
-		if (isNumber) {
-			fNumberFields.add(textControl);
-			textControl.addModifyListener(fNumberFieldListener);
-		} else {
-			textControl.addModifyListener(fTextFieldListener);
-		}
-			
-		return textControl;
-	}
-	
-	private void numberFieldChanged(Text textControl) {
-		String number= textControl.getText();
-		IStatus status= validatePositiveNumber(number);
-		if (!status.matches(IStatus.ERROR))
-			fOverlayStore.setValue((String) fTextFields.get(textControl), number);
-		updateStatus(status);
-	}
-	
-	private IStatus validatePositiveNumber(String number) {
-		StatusInfo status= new StatusInfo();
-		if (number.length() == 0) {
-			status.setError(AntPreferencesMessages.getString("AntEditorPreferencePage.empty_input")); //$NON-NLS-1$
-		} else {
-			try {
-				int value= Integer.parseInt(number);
-				if (value < 0)
-					status.setError(AntPreferencesMessages.getFormattedString("AntEditorPreferencePage.invalid_input", number)); //$NON-NLS-1$
-			} catch (NumberFormatException e) {
-				status.setError(AntPreferencesMessages.getFormattedString("AntEditorPreferencePage.invalid_input", number)); //$NON-NLS-1$
-			}
-		}
-		return status;
-	}
-	
-	private void updateStatus(IStatus status) {
-		if (!status.matches(IStatus.ERROR)) {
-			for (int i= 0; i < fNumberFields.size(); i++) {
-				Text text= (Text) fNumberFields.get(i);
-				IStatus s= validatePositiveNumber(text.getText());
-				status= s.getSeverity() > status.getSeverity() ? s : status;
-			}
-		}	
-		setValid(!status.matches(IStatus.ERROR));
-		applyToStatusLine(this, status);
-	}
-
-	/**
-	 * Applies the status to the status line of a dialog page.
-	 */
-	public void applyToStatusLine(DialogPage page, IStatus status) {
-		String message= status.getMessage();
-		switch (status.getSeverity()) {
-			case IStatus.OK:
-				page.setMessage(message, DialogPage.NONE);
-				page.setErrorMessage(null);
-				break;
-			case IStatus.WARNING:
-				page.setMessage(message, DialogPage.WARNING);
-				page.setErrorMessage(null);
-				break;				
-			case IStatus.INFO:
-				page.setMessage(message, DialogPage.INFORMATION);
-				page.setErrorMessage(null);
-				break;			
-			default:
-				if (message.length() == 0) {
-					message= null;
-				}
-				page.setMessage(null);
-				page.setErrorMessage(message);
-				break;		
-		}
-	}
-}
\ No newline at end of file
diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/preferences/AntPage.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/preferences/AntPage.java
deleted file mode 100644
index 8714823..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/preferences/AntPage.java
+++ /dev/null
@@ -1,338 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.ui.internal.preferences;
-
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.ant.internal.core.AntObject;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.viewers.DoubleClickEvent;
-import org.eclipse.jface.viewers.IDoubleClickListener;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.TabFolder;
-import org.eclipse.swt.widgets.TabItem;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.ui.externaltools.internal.ui.ExternalToolsContentProvider;
-import org.eclipse.ui.help.WorkbenchHelp;
-
-/**
- * Provides the generic implementation for a sub-page in the
- * Ant preference page.
- */
-public abstract class AntPage {
-	protected SelectionAdapter selectionAdapter = new SelectionAdapter() {
-		public void widgetSelected(SelectionEvent e) {
-			buttonPressed(((Integer) e.widget.getData()).intValue());
-		}
-	};
-	private AntRuntimePreferencePage preferencePage;
-	private TableViewer tableViewer;
-	private ExternalToolsContentProvider contentProvider;
-	
-	protected Button editButton;
-	protected Button removeButton;
-
-	/**
-	 * Creates an instance of this page.
-	 */
-	public AntPage(AntRuntimePreferencePage preferencePage) {
-		super();
-		this.preferencePage = preferencePage;
-	}
-	
-	/**
-	 * Adds buttons specific to the page.
-	 */
-	protected abstract void addButtonsToButtonGroup(Composite parent);
-	
-	/**
-	 * Give this page a chance to initialize itself
-	 */
-	protected abstract void initialize();
-	
-	/**
-	 * Adds an object to the contents
-	 */
-	protected void addContent(Object o) {
-		if (contentProvider != null) {
-			contentProvider.add(o);
-		}
-	}
-	
-	/**
-	 * Handles a button pressed event.
-	 */
-	protected void buttonPressed(int buttonId) {
-	}
-
-	/**
-	 * Creates and returns a button with appropriate size and layout.
-	 * 
-	 * @param parent the control to create the button on
-	 * @param labelKey the key to lookup the button's label
-	 * @param buttonId the id to assign to this button
-	 * @return a new and initialized button
-	 */
-	protected Button createPushButton(Composite parent, String buttonText, int buttonId) {
-		Button button = new Button(parent, SWT.PUSH);
-		button.setFont(parent.getFont());
-		button.setText(buttonText);
-		button.setData(new Integer(buttonId));
-		button.addSelectionListener(selectionAdapter);
-		preferencePage.setButtonLayoutData(button);
-		return button;
-	}
-	
-	/**
-	 * Creates the group which will contain the buttons.
-	 */
-	protected void createButtonGroup(Composite top) {
-		Composite buttonGroup = new Composite(top, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		layout.marginHeight = 0;
-		layout.marginWidth = 0;
-		buttonGroup.setLayout(layout);
-		buttonGroup.setLayoutData(new GridData(GridData.FILL_VERTICAL));
-		buttonGroup.setFont(top.getFont());
-		
-		addButtonsToButtonGroup(buttonGroup);
-	}
-
-	/**
-	 * Creates a space between controls
-	 */
-	protected final Label createSeparator(Composite parent) {
-		Label separator = new Label(parent, SWT.NONE);
-		GridData gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.VERTICAL_ALIGN_BEGINNING);
-		gd.heightHint = 4;
-		separator.setLayoutData(gd);
-		return separator;
-	}
-	
-	/**
-	 * Creates the table viewer.
-	 */
-	protected void createTable(Composite parent) {
-		Table table = new Table(parent, SWT.MULTI | SWT.FULL_SELECTION | SWT.BORDER);
-		GridData data= new GridData(GridData.FILL_BOTH);
-		data.widthHint = IDialogConstants.ENTRY_FIELD_WIDTH;
-		data.heightHint = table.getItemHeight();
-		data.horizontalSpan= 1;
-		table.setLayoutData(data);
-		table.setFont(parent.getFont());
-		
-		contentProvider = getContentProvider();
-		tableViewer = new TableViewer(table);
-		tableViewer.setContentProvider(contentProvider);
-		tableViewer.setLabelProvider(getLabelProvider());
-		tableViewer.addSelectionChangedListener(new ISelectionChangedListener() {
-			public void selectionChanged(SelectionChangedEvent event) {
-				tableSelectionChanged((IStructuredSelection) event.getSelection());
-			}
-		});
-		
-		tableViewer.addDoubleClickListener(new IDoubleClickListener() {
-			public void doubleClick(DoubleClickEvent event) {
-				edit((IStructuredSelection)event.getSelection());
-			}
-		});
-	}
-
-	/**
-	 * Returns the content provider to use for the table viewer
-	 * 
-	 * @return AntPageContentProvider
-	 */
-	protected ExternalToolsContentProvider getContentProvider() {
-		return new ExternalToolsContentProvider();
-	}
-
-	/**
-	 * Returns the currently listed objects in the table.  Returns null
-	 * if this widget has not yet been created or has been disposed.
-	 */
-	protected List getContents(boolean forDisplay) {
-		if (tableViewer == null || tableViewer.getControl().isDisposed()) {
-			return null;
-		}
-		List URLs= getPreferencePage().getLibraryURLs();
-		Object[] elements = contentProvider.getElements(tableViewer.getInput());
-		List contents= new ArrayList(elements.length);
-		Object element;
-		AntObject antObject;
-		for (int i = 0; i < elements.length; i++) {
-			element= elements[i];
-			if (element instanceof AntObject) {
-				antObject= (AntObject)element;
-				if (forDisplay) {
-					if (!antObject.isDefault() && !URLs.contains(antObject.getLibrary())) {
-						continue;
-					}
-				} else if (antObject.isDefault() || !URLs.contains(antObject.getLibrary())) {
-					continue;
-				}
-			}
-			contents.add(element);
-		}
-		return contents;
-	}
-
-	/**
-	 * Returns the label provider the sub-page wants to use
-	 * to display its content with.
-	 */
-	protected abstract ITableLabelProvider getLabelProvider();
-	
-	/**
-	 * Returns the selection in the viewer, or <code>null</code> if none.
-	 */
-	protected final IStructuredSelection getSelection() {
-		if (tableViewer == null || tableViewer.getControl().isDisposed()) {
-			return null;
-		}
-		return ((IStructuredSelection) tableViewer.getSelection());
-	}
-	
-	/**
-	 * Returns the shell of the sub-page.
-	 */
-	protected final Shell getShell() {
-		if (tableViewer == null || tableViewer.getControl().isDisposed()) {
-			return null;
-		}
-		return tableViewer.getControl().getShell();
-	}
-	
-	/**
-	 * Handles the remove button pressed event
-	 */
-	protected void remove() {
-		remove(tableViewer);
-	}
-	
-	protected void remove(TableViewer viewer) {
-		ExternalToolsContentProvider antContentProvider= (ExternalToolsContentProvider)viewer.getContentProvider();
-		IStructuredSelection sel = (IStructuredSelection) viewer.getSelection();
-		Iterator enum = sel.iterator();
-		while (enum.hasNext()) {
-			antContentProvider.remove(enum.next());
-		}
-	}
-	
-	/**
-	 * Sets the contents of the table on this page.  Has no effect
-	 * if this widget has not yet been created or has been disposed.
-	 */
-	protected void setInput(List inputs) {
-		if (tableViewer == null || tableViewer.getControl().isDisposed()) {
-			return;
-		}
-		tableViewer.setInput(inputs);
-		tableSelectionChanged((IStructuredSelection) tableViewer.getSelection());
-	}
-
-	/**
-	 * Updates the content element in the table viewer.
-	 */
-	protected final void updateContent(Object element) {
-		if (tableViewer == null || tableViewer.getControl().isDisposed()) {
-			return;
-		}
-		tableViewer.update(element, null);
-	}
-	
-	/**
-	 * Creates the default contents of this page
-	 */
-	protected Composite createContents(Composite top) {
-		WorkbenchHelp.setHelp(top, getHelpContextId());
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 2;
-		layout.marginHeight = 2;
-		layout.marginWidth = 2;
-		top.setLayout(layout);
-		
-		top.setLayoutData(new GridData(GridData.FILL_BOTH));
-
-		createTable(top);
-		createButtonGroup(top);
-		
-		return top;
-	}
-	
-	protected AntRuntimePreferencePage getPreferencePage() {
-		return preferencePage;
-	}
-	
-	protected TableViewer getTableViewer() {
-		return tableViewer;
-	}
-
-	/**
-	 * Handles selection changes in the table viewer.
-	 */
-	protected void tableSelectionChanged(IStructuredSelection newSelection) {
-		int size = newSelection.size();
-		boolean enabled= true;
-		
-		Iterator itr= newSelection.iterator();
-		while (itr.hasNext()) {
-			Object element = itr.next();
-			if (element instanceof AntObject) {
-				AntObject antObject= (AntObject)element;
-				if (antObject.isDefault()) {
-					enabled= false;
-					break;
-				}
-			}
-		}
-		editButton.setEnabled(enabled && size == 1);
-		removeButton.setEnabled(enabled && size > 0);
-	}
-	
-	protected void edit(IStructuredSelection selection) {
-	}
-	
-	/**
-	 * Returns this page's help context id, which is hooked
-	 * to this page on creation.
-	 * 
-	 * @return help context id
-	 */
-	protected abstract String getHelpContextId();
-
-	protected void connectToFolder(final TabItem item, TabFolder folder) {
-		folder.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				if (e.item == item) {
-					//remove ant objects whose library has been removed
-					setInput(getContents(true));
-				}
-			}
-		});		
-	}
-}
diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/preferences/AntPreferencePage.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/preferences/AntPreferencePage.java
deleted file mode 100644
index a37bc5b..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/preferences/AntPreferencePage.java
+++ /dev/null
@@ -1,240 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.ui.internal.preferences;
-
-
-import org.eclipse.ant.ui.internal.model.AntUIPlugin;
-import org.eclipse.ant.ui.internal.model.IAntUIHelpContextIds;
-import org.eclipse.ant.ui.internal.model.IAntUIPreferenceConstants;
-import org.eclipse.jface.preference.FieldEditorPreferencePage;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.preference.PreferenceConverter;
-import org.eclipse.jface.preference.StringFieldEditor;
-import org.eclipse.jface.resource.StringConverter;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.graphics.RGB;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.List;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-import org.eclipse.ui.help.WorkbenchHelp;
-
-public class AntPreferencePage extends FieldEditorPreferencePage implements IWorkbenchPreferencePage {
-
-	private StringFieldEditor fBuildFileNames;
-	
-	private List fAppearanceColorList;
-	private ColorEditor fAppearanceColorEditor;
-	
-	// Array containing the message to display, the preference key, and the 
-	// default value (initialized in storeInitialValues()) for each color preference
-	private final String[][] fAppearanceColorListModel= new String[][] {
-		{AntPreferencesMessages.getString("AntPreferencePage.&Error__2"), IAntUIPreferenceConstants.CONSOLE_ERROR_RGB, null}, //$NON-NLS-1$
-		{AntPreferencesMessages.getString("AntPreferencePage.&Warning__3"), IAntUIPreferenceConstants.CONSOLE_WARNING_RGB, null}, //$NON-NLS-1$
-		{AntPreferencesMessages.getString("AntPreferencePage.I&nformation__4"), IAntUIPreferenceConstants.CONSOLE_INFO_RGB, null}, //$NON-NLS-1$
-		{AntPreferencesMessages.getString("AntPreferencePage.Ve&rbose__5"), IAntUIPreferenceConstants.CONSOLE_VERBOSE_RGB, null}, //$NON-NLS-1$
-		{AntPreferencesMessages.getString("AntPreferencePage.Deb&ug__6"), IAntUIPreferenceConstants.CONSOLE_DEBUG_RGB, null}, //$NON-NLS-1$
-	};
-
-	/**
- 	 * Create the Ant page.
-     */
-		public AntPreferencePage() {
-			super(GRID);
-			setDescription(AntPreferencesMessages.getString("AntPreferencePage.General")); //$NON-NLS-1$
-			setPreferenceStore(AntUIPlugin.getDefault().getPreferenceStore());
-		}
-	
-	/**
-	 * @see org.eclipse.jface.preference.FieldEditorPreferencePage#createFieldEditors()
-	 */
-	protected void createFieldEditors() {
-		storeAppliedValues();
-
-		Font font= getFieldEditorParent().getFont();
-		Label label= new Label(getFieldEditorParent(), SWT.NONE);
-		label.setText(AntPreferencesMessages.getString("AntPreferencePage.Enter")); //$NON-NLS-1$
-		GridData gd= new GridData();
-		gd.horizontalSpan= 2;
-		label.setLayoutData(gd);
-		label.setFont(font);
-		
-		fBuildFileNames = new StringFieldEditor(IAntUIPreferenceConstants.ANT_FIND_BUILD_FILE_NAMES, AntPreferencesMessages.getString("AntPreferencePage.&Names__3"), getFieldEditorParent()); //$NON-NLS-1$
-		addField(fBuildFileNames);
-		fBuildFileNames.getTextControl(getFieldEditorParent()).addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-
-			}
-		});
-		
-		label= new Label(getFieldEditorParent(), SWT.NONE);
-		label.setFont(font);
-		createColorComposite();
-	}
-	
-	/**
-	 * Stores the initial values of the color preferences. The preference values are updated 
-	 * on the fly as the user edits them (instead of only when they press "Apply"). We need
-	 * to store the old values so that we can reset them when the user chooses "Cancel".
-	 */
-	private void storeAppliedValues() {
-		IPreferenceStore store= getPreferenceStore();
-		for (int i = 0; i < fAppearanceColorListModel.length; i++) {
-			String preference = fAppearanceColorListModel[i][1];
-			fAppearanceColorListModel[i][2]= store.getString(preference);
-		}
-	}
-	
-	private void createColorComposite() {
-		Font font= getFieldEditorParent().getFont();
-		Label label= new Label(getFieldEditorParent(), SWT.LEFT);
-		label.setText(AntPreferencesMessages.getString("AntPreferencePage.Ant_Color_Options__6"));  //$NON-NLS-1$
-		label.setFont(font);
-		GridData gd= new GridData(GridData.HORIZONTAL_ALIGN_FILL);
-		gd.horizontalSpan= 2;
-		label.setLayoutData(gd);
-				
-		Composite editorComposite= new Composite(getFieldEditorParent(), SWT.NONE);
-		GridLayout layout= new GridLayout();
-		layout.numColumns= 2;
-		layout.marginHeight= 0;
-		layout.marginWidth= 0;
-		editorComposite.setLayout(layout);
-		editorComposite.setFont(font);
-		gd= new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.FILL_VERTICAL);
-		gd.horizontalSpan= 2;
-		editorComposite.setLayoutData(gd);		
-
-		fAppearanceColorList= new List(editorComposite, SWT.SINGLE | SWT.V_SCROLL | SWT.H_SCROLL | SWT.BORDER);
-		gd= new GridData(GridData.VERTICAL_ALIGN_BEGINNING | GridData.FILL_HORIZONTAL);
-		gd.heightHint= convertHeightInCharsToPixels(8);
-		fAppearanceColorList.setLayoutData(gd);
-		fAppearanceColorList.setFont(font);
-				
-		Composite stylesComposite= new Composite(editorComposite, SWT.NONE);
-		layout= new GridLayout();
-		layout.marginHeight= 0;
-		layout.marginWidth= 0;
-		layout.numColumns= 2;
-		stylesComposite.setLayout(layout);
-		stylesComposite.setLayoutData(new GridData(GridData.FILL_BOTH));
-		stylesComposite.setFont(font);
-
-		label= new Label(stylesComposite, SWT.LEFT);
-		label.setText(AntPreferencesMessages.getString("AntPreferencePage.Color__7"));  //$NON-NLS-1$
-		label.setFont(font);
-		gd= new GridData();
-		gd.horizontalAlignment= GridData.BEGINNING;
-		label.setLayoutData(gd);
-
-		fAppearanceColorEditor= new ColorEditor(stylesComposite);
-		Button foregroundColorButton= fAppearanceColorEditor.getButton();
-		gd= new GridData(GridData.FILL_HORIZONTAL);
-		gd.horizontalAlignment= GridData.BEGINNING;
-		foregroundColorButton.setLayoutData(gd);
-		foregroundColorButton.setFont(font);
-
-		fAppearanceColorList.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				handleAppearanceColorListSelection();
-			}
-		});
-		foregroundColorButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				int i= fAppearanceColorList.getSelectionIndex();
-				String key= fAppearanceColorListModel[i][1];
-		
-				PreferenceConverter.setValue(getPreferenceStore(), key, fAppearanceColorEditor.getColorValue());
-			}
-		});
-	}
-	
-	/**
-	 * Restore all color preferences to their values when the page was opened.
-	 */
-	public boolean performCancel() {
-		for (int i = 0; i < fAppearanceColorListModel.length; i++) {
-			String preference = fAppearanceColorListModel[i][1];
-			PreferenceConverter.setValue(getPreferenceStore(), preference, StringConverter.asRGB(fAppearanceColorListModel[i][2]));
-		}
-		return super.performCancel();
-	}
-	
-	/**
-	 * When the user applies the preferences, update the set of stored
-	 * preferences so that we will fall back to the applied values on Cancel.
-	 */
-	public boolean performOk() {
-		storeAppliedValues();
-		return super.performOk();
-	}
-	
-	private void handleAppearanceColorListSelection() {	
-		int i= fAppearanceColorList.getSelectionIndex();
-		String key= fAppearanceColorListModel[i][1];
-		RGB rgb= PreferenceConverter.getColor(getPreferenceStore(), key);
-		fAppearanceColorEditor.setColorValue(rgb);		
-	}
-	
-	/**
-	 * @see FieldEditorPreferencePage#createContents(org.eclipse.swt.widgets.Composite)
-	 */
-	protected Control createContents(Composite parent) {
-		WorkbenchHelp.setHelp(parent, IAntUIHelpContextIds.ANT_PREFERENCE_PAGE);
-		return super.createContents(parent);
-	}
-
-	/**
-	 * @see IWorkbenchPreferencePage#init(IWorkbench)
-	 */
-	public void init(IWorkbench workbench) {
-	}
-	/**
-	 * @see org.eclipse.jface.preference.FieldEditorPreferencePage#initialize()
-	 */
-	protected void initialize() {
-		super.initialize();
-		for (int i= 0; i < fAppearanceColorListModel.length; i++) {
-			fAppearanceColorList.add(fAppearanceColorListModel[i][0]);
-		}
-		fAppearanceColorList.getDisplay().asyncExec(new Runnable() {
-			public void run() {
-				if (fAppearanceColorList != null && !fAppearanceColorList.isDisposed()) {
-					fAppearanceColorList.select(0);
-					handleAppearanceColorListSelection();
-				}
-			}
-		});
-	}
-	/**
-	 * @see org.eclipse.jface.preference.PreferencePage#performDefaults()
-	 */
-	protected void performDefaults() {
-		for (int i = 0; i < fAppearanceColorListModel.length; i++) {
-			String key= fAppearanceColorListModel[i][1];
-			PreferenceConverter.setValue(getPreferenceStore(), key, PreferenceConverter.getDefaultColor(getPreferenceStore(), key));
-		}
-		handleAppearanceColorListSelection();
-		
-		super.performDefaults();
-	}
-
-}
diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/preferences/AntPreferencesMessages.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/preferences/AntPreferencesMessages.java
deleted file mode 100644
index e1980d7..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/preferences/AntPreferencesMessages.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.ui.internal.preferences;
-
-
-import java.text.MessageFormat;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-public class AntPreferencesMessages {
-
-	private static final String BUNDLE_NAME = "org.eclipse.ant.ui.internal.preferences.AntPreferencesMessages"; //$NON-NLS-1$
-
-	private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME);
-
-	private AntPreferencesMessages() {
-	}
-
-	public static String getString(String key) {
-		try {
-			return RESOURCE_BUNDLE.getString(key);
-		} catch (MissingResourceException e) {
-			return '!' + key + '!';
-		}
-	}
-
-	public static String getFormattedString(String key, String arg) {
-		return getFormattedString(key, new String[] { arg });
-	}
-	
-	public static String getFormattedString(String key, String[] args) {
-		return MessageFormat.format(getString(key), args);	
-	}	
-}
diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/preferences/AntPreferencesMessages.properties b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/preferences/AntPreferencesMessages.properties
deleted file mode 100644
index 9d47772..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/preferences/AntPreferencesMessages.properties
+++ /dev/null
@@ -1,127 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2003 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Common Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/cpl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-AntClasspathBlock.&Choose_a_folder_to_add_to_the_classpath__1=&Choose a folder to add to the classpath:
-AntClasspathBlock.addFolderButtonTitle = Add &Folder...
-AntClasspathBlock.addJarButtonTitle = Add &JARs...
-AntClasspathBlock.upButtonTitle = &Up
-AntClasspathBlock.downButtonTitle = Do&wn
-AntClasspathBlock.removeButtonTitle = R&emove
-AntClasspathBlock.addFolderButtonTitle2 = Add F&older...
-AntClasspathBlock.addJarButtonTitle2 = Add JAR&s...
-AntClasspathBlock.upButtonTitle2 = U&p
-AntClasspathBlock.downButtonTitle2 = Dow&n
-AntClasspathBlock.removeButtonTitle2 = Re&move
-AntClasspathBlock.&Choose_a_folder_that_will_be_used_as_the_location_of_ANT_HOME_3=&Choose a folder that will be used as the location of ANT_HOME
-AntClasspathBlock.Specified_ANT_HOME_does_not_contain_a___lib___directory_7=Specified ANT_HOME does not contain a \"lib\" directory
-AntClasspathBlock.Run&time_classpath__8=Runt&ime classpath:
-AntClasspathBlock.Set_ANT_HO&ME_9=Set ANT_&HOME
-AntClasspathBlock.&Browse..._10=&Browse...
-AntClasspathBlock.Additional_classpath_entries__11=Additional &classpath entries:
-
-AntClasspathPage.title = C&lasspath
-
-AddCustomDialog.Bad_Format=Specified zip file is not in the correct format
-AddCustomDialog.Unreadable=Specified zip file could not be read
-AddCustomDialog.&Name__3=&Name:
-AddCustomDialog.Could_not_close_zip_file_{0}_4=Could not close zip file {0}
-AddCustomDialog.&Location=&Location:
-AddCustomDialog.mustSelect=A class file must be selected from the specified location
-
-AntPreferencePage.description = Settings used when running Ant buildfiles:
-AntPreferencePage.General=General Ant Settings:
-AntPreferencePage.Enter=File names used to emulate \"-find\".\nUsed by \"Run As > Ant Build\" when the current selection is not a buildfile.\nList is comma separated (e.g. export.xml, build.xml, clean.xml).
-AntPreferencePage.&Names__3=&Names:
-AntPreferencePage.Ant_Color_Options__6=Ant Color &Options:
-AntPreferencePage.Color__7=&Color:
-AntPreferencePage.&Error__2=Ant error message in console
-AntPreferencePage.&Warning__3=Ant warning message in console
-AntPreferencePage.I&nformation__4=Ant information message in console
-AntPreferencePage.Ve&rbose__5=Ant verbose message in console
-AntPreferencePage.Deb&ug__6=Ant debug message in console
-
-AntTasksPage.addTaskButtonTitle = Add &Task...
-AntTasksPage.editTaskButtonTitle = &Edit Task...
-AntTasksPage.removeButtonTitle = Remo&ve
-AntTasksPage.addTaskDialogTitle = Add Task
-AntTasksPage.title = Tas&ks
-AntTasksPage.editTaskDialogTitle = Edit Task
-AntTasksPage._[system_task]_3=\ [system task]
-AntTasksPage.8=A task with the name {0} already exists
-AntTasksPage.9=A name must be provided for the new task
-
-AntTypesPage.removeButtonTitle = Remo&ve
-AntTypesPage.addTypeButtonTitle = Add &Type...
-AntTypesPage.editTypeButtonTitle = &Edit Type...
-AntTypesPage.typesPageTitle = T&ypes
-AntTypesPage.addTypeDialogTitle = Add Type
-AntTypesPage.editTypeDialogTitle = Edit Type
-AntTypesPage._[system_type]_3=\ [system type]
-AntTypesPage.8=A type with the name {0} already exists
-AntTypesPage.9=A name must be provided for the new type
-
-AntPropertiesPage.title = P&roperties
-AntPropertiesPage.&Global_properties__1=&Global properties:
-AntPropertiesPage.Glo&bal_property_files__2=Glo&bal property files:
-
-AntPropertiesBlock.addButton = Add&...
-AntPropertiesBlock.editButton = &Edit...
-AntPropertiesBlock.removeButton = Rem&ove
-AntPropertiesBlock.addFileButton = A&dd...
-AntPropertiesBlock.removeFileButton = Re&move
-AntPropertiesBlock.Add_Property_2=Add Property
-AntPropertiesBlock.Edit_User_Property_5=Edit User Property
-
-AddPropertyDialog.&Name__1=&Name:
-AddPropertyDialog.&Value__2=&Value:
-
-AntEditorPreferencePage.description=Ant Editor settings:
-AntEditorPreferencePage.annotationsTab.title= Annotation&s
-AntEditorPreferencePage.annotationPresentationOptions= Annotation &presentation:
-AntEditorPreferencePage.annotations.bookmarks= Bookmarks
-AntEditorPreferencePage.annotations.searchResults= Search Results
-AntEditorPreferencePage.annotations.errors= Errors
-AntEditorPreferencePage.annotations.warnings= Warnings
-AntEditorPreferencePage.annotations.infos= Infos
-AntEditorPreferencePage.annotations.tasks= Tasks
-AntEditorPreferencePage.annotations.others= Others
-AntEditorPreferencePage.annotations.showInText= Show in &text
-AntEditorPreferencePage.annotations.showInOverviewRuler= Show in overview &ruler
-AntEditorPreferencePage.annotations.color= C&olor:
-AntEditorPreferencePage.invalid_input= Invalid print margin column specified
-AntEditorPreferencePage.empty_input= No print margin column specified
-
-AntEditorPreferencePage.codeAssistTab.title= &Code Assist
-AntEditorPreferencePage.backgroundForCompletionProposals=Completion proposal background
-AntEditorPreferencePage.foregroundForCompletionProposals=Completion proposal foreground
-
-AntEditorPreferencePage.general=Appeara&nce
-AntEditorPreferencePage.printMarginColumn=Print margin col&umn:
-AntEditorPreferencePage.showOverviewRuler=Show overview &ruler
-AntEditorPreferencePage.showLineNumbers=Show lin&e numbers
-AntEditorPreferencePage.highlightCurrentLine=Hi&ghlight current line
-AntEditorPreferencePage.showPrintMargin=Sho&w print margin
-AntEditorPreferencePage.color=C&olor:
-AntEditorPreferencePage.appearanceOptions=Appearance co&lor options:
-AntEditorPreferencePage.lineNumberForegroundColor=Line number foreground
-AntEditorPreferencePage.currentLineHighlighColor=Current line highlight
-AntEditorPreferencePage.printMarginColor=Print margin
-AntEditorPreferencePage.Ant_editor_text_1=Text
-AntEditorPreferencePage.Ant_editor_processing_instuctions_2=Processing instructions
-AntEditorPreferencePage.Ant_editor_constant_strings_3=Constant strings
-AntEditorPreferencePage.Ant_editor_tags_4=Tags
-AntEditorPreferencePage.Ant_editor_comments_5=Comments
-AntEditorPreferencePage.Insert=Insert single &proposals automatically
-AntEditorPreferencePage.&Enable_auto_activation_2=&Enable auto activation
-AntEditorPreferencePage.Auto_activation_&delay__3=Auto activation &delay:
-AntEditorPreferencePage.Auto_activation_tri&ggers__4=Auto activation tri&ggers:
-AntEditorPreferencePage.Code_assist_colo&r_options__5=Code assist colo&r options:
-AntEditorPreferencePage.Col&or__6=Col&or:
diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/preferences/AntPropertiesBlock.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/preferences/AntPropertiesBlock.java
deleted file mode 100644
index 72ec693..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/preferences/AntPropertiesBlock.java
+++ /dev/null
@@ -1,328 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.ui.internal.preferences;
-
-
-import java.util.Iterator;
-import java.util.Map;
-
-import org.eclipse.ant.core.Property;
-import org.eclipse.ant.ui.internal.model.AntUIPlugin;
-import org.eclipse.ant.ui.internal.model.IAntUIConstants;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.dialogs.IDialogSettings;
-import org.eclipse.jface.viewers.DoubleClickEvent;
-import org.eclipse.jface.viewers.IDoubleClickListener;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.FileDialog;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.ui.externaltools.internal.ui.ExternalToolsContentProvider;
-
-public class AntPropertiesBlock {
-	
-	private IAntBlockContainer container;
-	
-	private Button editButton;
-	private Button removeButton;
-	private Button addButton;
-	private Button addFileButton;
-	private Button removeFileButton;
-
-	private TableViewer propertyTableViewer;
-	private TableViewer fileTableViewer;
-
-	private final AntPropertiesLabelProvider labelProvider = new AntPropertiesLabelProvider();
-
-	private IDialogSettings dialogSettings;
-	
-	/**
-	 * Button listener that delegates for widget selection events.
-	 */
-	private SelectionAdapter buttonListener= new SelectionAdapter() {
-		public void widgetSelected(SelectionEvent event) {
-			if (event.widget == addButton) {
-				addProperty();
-			} else if (event.widget == editButton) {
-				edit();
-			} else if (event.widget == removeButton) {
-				remove(propertyTableViewer);
-			} else if (event.widget == addFileButton) {
-				addPropertyFile();
-			} else if (event.widget == removeFileButton) {
-				remove(fileTableViewer);
-			} else if (event.widget == removeButton) {
-			}
-		}
-	};
-	
-	/**
-	 * Selection changed listener that delegates selection events.
-	 */
-	private ISelectionChangedListener tableListener= new ISelectionChangedListener() {
-		public void selectionChanged(SelectionChangedEvent event) {
-			if (event.getSource() == propertyTableViewer) {
-				propertyTableSelectionChanged((IStructuredSelection) event.getSelection());
-			} else if (event.getSource() == fileTableViewer) {
-				fileTableSelectionChanged((IStructuredSelection) event.getSelection());
-			}
-		}
-	};
-	
-	public AntPropertiesBlock(IAntBlockContainer container) {
-		this.container= container; 
-	}
-	
-	public void createControl(Composite top, String propertyLabel, String propertyFileLabel) {
-		Font font= top.getFont();
-		dialogSettings= AntUIPlugin.getDefault().getDialogSettings();
-		
-		createVerticalSpacer(top, 2);
-
-		Label label = new Label(top, SWT.NONE);
-		GridData gd = new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING);
-		gd.horizontalSpan =2;
-		label.setLayoutData(gd);
-		label.setFont(font);
-		label.setText(propertyLabel);
-
-		propertyTableViewer= createTableViewer(top);
-		propertyTableViewer.addDoubleClickListener(new IDoubleClickListener() {
-			public void doubleClick(DoubleClickEvent event) {
-				edit();
-			}
-		});
-		
-		createButtonGroup(top);
-
-		label = new Label(top, SWT.NONE);
-		gd = new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING);
-		gd.horizontalSpan =2;
-		label.setLayoutData(gd);
-		label.setFont(font);
-		label.setText(propertyFileLabel);
-
-		fileTableViewer= createTableViewer(top);
-		createButtonGroup(top);
-	}
-	
-	/**
-	 * Create some empty space.
-	 */
-	private void createVerticalSpacer(Composite comp, int colSpan) {
-		Label label = new Label(comp, SWT.NONE);
-		GridData gd = new GridData();
-		gd.horizontalSpan = colSpan;
-		label.setLayoutData(gd);
-	}	
-	
-	/**
-	 * Creates the group which will contain the buttons.
-	 */
-	private void createButtonGroup(Composite top) {
-		Composite buttonGroup = new Composite(top, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		layout.marginHeight = 0;
-		layout.marginWidth = 0;
-		buttonGroup.setLayout(layout);
-		buttonGroup.setLayoutData(new GridData(GridData.FILL_VERTICAL));
-		buttonGroup.setFont(top.getFont());
-
-		addButtonsToButtonGroup(buttonGroup);
-	}
-	
-	/**
-	 * Creates and returns a configured table viewer in the given parent
-	 */
-	private TableViewer createTableViewer(Composite parent) {
-		Table table = new Table(parent, SWT.MULTI | SWT.FULL_SELECTION | SWT.BORDER);
-		GridData data= new GridData(GridData.FILL_BOTH);
-		data.widthHint = IDialogConstants.ENTRY_FIELD_WIDTH;
-		table.setLayoutData(data);
-		table.setFont(parent.getFont());
-		
-		TableViewer tableViewer= new TableViewer(table);
-		tableViewer.setContentProvider(new ExternalToolsContentProvider());
-		tableViewer.setLabelProvider(labelProvider);
-		tableViewer.addSelectionChangedListener(tableListener);
-		return tableViewer;
-	}
-	
-	/* (non-Javadoc)
-	 * Method declared on AntPage.
-	 */
-	protected void addButtonsToButtonGroup(Composite parent) {
-		if (editButton == null) {
-			addButton= createPushButton(parent, AntPreferencesMessages.getString("AntPropertiesBlock.addButton")); //$NON-NLS-1$
-			editButton= createPushButton(parent, AntPreferencesMessages.getString("AntPropertiesBlock.editButton"));  //$NON-NLS-1$
-			removeButton= createPushButton(parent, AntPreferencesMessages.getString("AntPropertiesBlock.removeButton"));  //$NON-NLS-1$
-		} else {
-			addFileButton= createPushButton(parent, AntPreferencesMessages.getString("AntPropertiesBlock.addFileButton")); //$NON-NLS-1$
-			removeFileButton= createPushButton(parent, AntPreferencesMessages.getString("AntPropertiesBlock.removeFileButton")); //$NON-NLS-1$
-		}
-	}
-	
-	/**
-	 * Creates and returns a configured button in the given composite with the given
-	 * label. Widget selection callbacks for the returned button will be processed
-	 * by the <code>buttonListener</code>
-	 */
-	private Button createPushButton(Composite parent, String label) {
-		Button button= container.createPushButton(parent, label);
-		button.addSelectionListener(buttonListener);
-		return button;
-	}
-	
-	/**
-	 * Allows the user to enter property files
-	 */
-	private void addPropertyFile() {
-		String lastUsedPath;
-		lastUsedPath= dialogSettings.get(IAntUIConstants.DIALOGSTORE_LASTEXTFILE);
-		if (lastUsedPath == null) {
-			lastUsedPath= ""; //$NON-NLS-1$
-		}
-		FileDialog dialog = new FileDialog(propertyTableViewer.getControl().getShell(), SWT.MULTI);
-		dialog.setFilterExtensions(new String[] { "*.properties" }); //$NON-NLS-1$;
-		dialog.setFilterPath(lastUsedPath);
-
-		String result = dialog.open();
-		if (result == null) {
-			return;
-		}
-		IPath filterPath= new Path(dialog.getFilterPath());
-		String[] results= dialog.getFileNames();
-		for (int i = 0; i < results.length; i++) {
-			String fileName = results[i];	
-			IPath path= filterPath.append(fileName).makeAbsolute();	
-			((ExternalToolsContentProvider)fileTableViewer.getContentProvider()).add(path.toOSString());
-		}
-	
-		dialogSettings.put(IAntUIConstants.DIALOGSTORE_LASTEXTFILE, filterPath.toOSString());
-		container.update();
-	}
-	
-	private void remove(TableViewer viewer) {
-		ExternalToolsContentProvider antContentProvider= (ExternalToolsContentProvider)viewer.getContentProvider();
-		IStructuredSelection sel = (IStructuredSelection) viewer.getSelection();
-		antContentProvider.remove(sel);
-		container.update();
-	}
-	
-	/**
-	 * Allows the user to enter a global user property
-	 */
-	private void addProperty() {
-		String title = AntPreferencesMessages.getString("AntPropertiesBlock.Add_Property_2");  //$NON-NLS-1$
-		AddPropertyDialog dialog = new AddPropertyDialog(propertyTableViewer.getControl().getShell(), title, new String[]{"", ""}); //$NON-NLS-1$ //$NON-NLS-2$
-		if (dialog.open() == Dialog.CANCEL) {
-			return;
-		}
-
-		Property prop = new Property();
-		String[] pair= dialog.getNameValuePair();
-		prop.setName(pair[0]);
-		prop.setValue(pair[1]);
-		((ExternalToolsContentProvider)propertyTableViewer.getContentProvider()).add(prop);
-		container.update();
-	}
-
-	private void edit() {
-		IStructuredSelection selection= (IStructuredSelection) propertyTableViewer.getSelection();
-		Property prop = (Property) selection.getFirstElement();
-		if (prop == null) {
-			return;
-		}
-		String title = AntPreferencesMessages.getString("AntPropertiesBlock.Edit_User_Property_5"); //$NON-NLS-1$
-		AddPropertyDialog dialog = new AddPropertyDialog(propertyTableViewer.getControl().getShell(), title, new String[]{prop.getName(), prop.getValue()});
-	
-		if (dialog.open() == Dialog.CANCEL) {
-			return;
-		}
-
-		String[] pair= dialog.getNameValuePair();
-		prop.setName(pair[0]);
-		prop.setValue(pair[1]);
-		//trigger a resort
-		propertyTableViewer.refresh();
-		container.update();
-	}
-	
-	/**
-	 * Handles selection changes in the Property file table viewer.
-	 */
-	private void fileTableSelectionChanged(IStructuredSelection newSelection) {
-		removeFileButton.setEnabled(newSelection.size() > 0);
-	}
-
-	/**
-	 * Handles selection changes in the Property file table viewer.
-	 */
-	private void propertyTableSelectionChanged(IStructuredSelection newSelection) {
-		int size= newSelection.size();
-		removeButton.setEnabled(size > 0);
-		editButton.setEnabled(size > 0);
-	}
-	
-	public void populatePropertyViewer(Map properties) {
-		if (properties == null) {
-			propertyTableViewer.setInput(new Property[0]);
-			return;
-		} 
-		Property[] result = new Property[properties.size()];
-		Iterator entries= properties.entrySet().iterator();
-		int i= 0;
-		while (entries.hasNext()) {
-			Map.Entry element = (Map.Entry) entries.next();
-			Property property = new Property();
-			property.setName((String)element.getKey());
-			property.setValue((String)element.getValue());
-			result[i]= property;
-			i++;
-		}
-		propertyTableViewer.setInput(result);
-	}
-	
-	public void setPropertiesInput(Property[] properties) {
-		propertyTableViewer.setInput(properties);
-	}
-		
-	public void setPropertyFilesInput(String[] files) {
-		fileTableViewer.setInput(files);
-	}
-	
-	public void update() {
-		propertyTableSelectionChanged((IStructuredSelection) propertyTableViewer.getSelection());
-		fileTableSelectionChanged((IStructuredSelection)fileTableViewer.getSelection());
-	}
-	
-	public Object[] getProperties() {
-		return ((ExternalToolsContentProvider)propertyTableViewer.getContentProvider()).getElements(null);
-	}
-	
-	public Object[] getPropertyFiles() {
-		return ((ExternalToolsContentProvider)fileTableViewer.getContentProvider()).getElements(null);
-	}
-}
diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/preferences/AntPropertiesLabelProvider.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/preferences/AntPropertiesLabelProvider.java
deleted file mode 100644
index bb6573b..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/preferences/AntPropertiesLabelProvider.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.ui.internal.preferences;
-
-
-import org.eclipse.ant.core.Property;
-import org.eclipse.ant.ui.internal.model.AntUIImages;
-import org.eclipse.ant.ui.internal.model.IAntUIConstants;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.ui.ISharedImages;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * Label provider for property elements
- */
-final class AntPropertiesLabelProvider extends LabelProvider implements ITableLabelProvider {
-
-	private Image classpathImage;
-	private Image fileImage;
-
-	/**
-	 * Creates an instance.
-	 */
-	public AntPropertiesLabelProvider() {
-	}
-	
-	/* (non-Javadoc)
-	 * Method declared on IBaseLabelProvider.
-	 */
-	public void dispose() {
-		// file image is shared, do not dispose.
-		fileImage = null;
-		if (classpathImage != null) {
-			classpathImage.dispose();
-			classpathImage = null;
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * Method declared on ITableLabelProvider.
-	 */
-	public Image getColumnImage(Object element, int columnIndex) {
-		if (element instanceof Property) {
-			return AntUIImages.getImage(IAntUIConstants.IMG_PROPERTY);
-		} else {
-			return getFileImage();
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * Method declared on ITableLabelProvider.
-	 */
-	public String getColumnText(Object element, int columnIndex) {
-		return element.toString();
-	}
-
-	public Image getFileImage() {
-		if (fileImage == null) {
-			fileImage = PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJ_FILE);
-		}
-		return fileImage;
-	}
-}
diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/preferences/AntPropertiesPage.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/preferences/AntPropertiesPage.java
deleted file mode 100644
index 846145f..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/preferences/AntPropertiesPage.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.ui.internal.preferences;
-
-
-import java.util.Arrays;
-import java.util.List;
-
-import org.eclipse.ant.core.AntCorePlugin;
-import org.eclipse.ant.ui.internal.model.AntUIImages;
-import org.eclipse.ant.ui.internal.model.IAntUIConstants;
-import org.eclipse.ant.ui.internal.model.IAntUIHelpContextIds;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.TabFolder;
-import org.eclipse.swt.widgets.TabItem;
-import org.eclipse.ui.help.WorkbenchHelp;
-
-/**
- * Preference page for setting global Ant user properties.
- * All properties specified here will be set as user properties on the 
- * project for any Ant build
- */
-public class AntPropertiesPage implements IAntBlockContainer {
-	
-	private AntPropertiesBlock antPropertiesBlock= new AntPropertiesBlock(this);
-	private AntRuntimePreferencePage preferencePage;
-	
-	/**
-	 * Creates an instance.
-	 */
-	public AntPropertiesPage(AntRuntimePreferencePage preferencePage) {
-		this.preferencePage= preferencePage;
-	}
-	
-	/**
-	 * Creates the tab item that contains this sub-page.
-	 */
-	protected TabItem createTabItem(TabFolder folder) {
-		TabItem item = new TabItem(folder, SWT.NONE);
-		item.setText(AntPreferencesMessages.getString("AntPropertiesPage.title")); //$NON-NLS-1$
-		item.setImage(AntUIImages.getImage(IAntUIConstants.IMG_PROPERTY));
-		item.setData(this);
-		item.setControl(createContents(folder));
-		return item;
-	}
-	
-	protected Composite createContents(Composite parent) {
-		Font font = parent.getFont();
-		
-		Composite top = new Composite(parent, SWT.NONE);
-		top.setFont(font);
-		WorkbenchHelp.setHelp(top, IAntUIHelpContextIds.ANT_PROPERTIES_PAGE);
-		GridLayout layout = new GridLayout();
-		layout.numColumns= 2;
-		top.setLayout(layout);
-		GridData gridData = new GridData(GridData.FILL_HORIZONTAL);
-		top.setLayoutData(gridData); 
-				
-		antPropertiesBlock.createControl(top, AntPreferencesMessages.getString("AntPropertiesPage.&Global_properties__1"), AntPreferencesMessages.getString("AntPropertiesPage.Glo&bal_property_files__2")); //$NON-NLS-1$ //$NON-NLS-2$
-		
-		return top;
-	}
-	
-	/**
-	 * Sets the contents of the tables on this page.
-	 */
-	protected void initialize() {
-		antPropertiesBlock.setPropertiesInput(AntCorePlugin.getPlugin().getPreferences().getCustomProperties());
-		antPropertiesBlock.setPropertyFilesInput(AntCorePlugin.getPlugin().getPreferences().getCustomPropertyFiles());
-		antPropertiesBlock.update();
-	}
-	
-	protected void performDefaults() {
-		antPropertiesBlock.populatePropertyViewer(null);
-		antPropertiesBlock.setPropertyFilesInput(new String[0]);
-		antPropertiesBlock.update();
-	}
-	
-	/**
-	 * Returns the specified property files
-	 * 
-	 * @return String[]
-	 */
-	protected String[] getPropertyFiles() {
-		Object[] elements = antPropertiesBlock.getPropertyFiles();
-		String[] files= new String[elements.length];
-		for (int i = 0; i < elements.length; i++) {
-			files[i] = (String)elements[i];
-		}
-		return files;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ant.ui.internal.preferences.IAntBlockContainer#setMessage(java.lang.String)
-	 */
-	public void setMessage(String message) {
-		preferencePage.setMessage(message);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ant.ui.internal.preferences.IAntBlockContainer#setErrorMessage(java.lang.String)
-	 */
-	public void setErrorMessage(String message) {
-		preferencePage.setErrorMessage(message);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ant.ui.internal.preferences.IAntBlockContainer#createPushButton(org.eclipse.swt.widgets.Composite, java.lang.String)
-	 */
-	public Button createPushButton(Composite parent, String buttonText) {
-		Button button = new Button(parent, SWT.PUSH);
-		button.setFont(parent.getFont());
-		button.setText(buttonText);
-		preferencePage.setButtonLayoutData(button);
-		return button;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ant.ui.internal.preferences.IAntBlockContainer#update()
-	 */
-	public void update() {
-	}
-	
-	protected List getProperties() {
-		return Arrays.asList(antPropertiesBlock.getProperties());
-	}
-}
\ No newline at end of file
diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/preferences/AntRuntimePreferencePage.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/preferences/AntRuntimePreferencePage.java
deleted file mode 100644
index acc2995..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/preferences/AntRuntimePreferencePage.java
+++ /dev/null
@@ -1,164 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.ui.internal.preferences;
-
-
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.ant.core.AntCorePlugin;
-import org.eclipse.ant.core.AntCorePreferences;
-import org.eclipse.ant.core.Property;
-import org.eclipse.ant.core.Task;
-import org.eclipse.ant.core.Type;
-import org.eclipse.ant.ui.internal.model.AntUIPlugin;
-import org.eclipse.ant.ui.internal.model.IAntUIHelpContextIds;
-import org.eclipse.jface.preference.PreferencePage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.TabFolder;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-import org.eclipse.ui.help.WorkbenchHelp;
-
-/**
- * Ant preference page to set the classpath, tasks, and types and properties.
- */
-public class AntRuntimePreferencePage extends PreferencePage implements IWorkbenchPreferencePage {
-	
-	private AntClasspathPage classpathPage;
-	private AntTasksPage tasksPage;
-	private AntTypesPage typesPage;
-	private AntPropertiesPage propertiesPage;
-	
-	/**
-	 * Creates the preference page
-	 */
-	public AntRuntimePreferencePage() {
-		setDescription(AntPreferencesMessages.getString("AntPreferencePage.description")); //$NON-NLS-1$
-		setPreferenceStore(AntUIPlugin.getDefault().getPreferenceStore());
-	}
-	
-	/* (non-Javadoc)
-	 * Method declared on IWorkbenchPreferencePage.
-	 */
-	public void init(IWorkbench workbench) {
-	}
-	
-	/* (non-Javadoc)
-	 * Method declared on PreferencePage.
-	 */
-	protected Control createContents(Composite parent) {
-		WorkbenchHelp.setHelp(getControl(), IAntUIHelpContextIds.ANT_RUNTIME_PREFERENCE_PAGE);
-		initializeDialogUnits(parent);
-
-		TabFolder folder = new TabFolder(parent, SWT.NONE);
-		folder.setLayout(new TabFolderLayout());	
-		folder.setLayoutData(new GridData(GridData.FILL_BOTH));
-		folder.setFont(parent.getFont());
-
-		classpathPage = new AntClasspathPage(this);
-		classpathPage.createTabItem(folder);
-		
-		tasksPage = new AntTasksPage(this);
-		tasksPage.createTabItem(folder);
-		
-		typesPage = new AntTypesPage(this);
-		typesPage.createTabItem(folder);
-
-		propertiesPage= new AntPropertiesPage(this);
-		propertiesPage.createTabItem(folder);
-	
-		tasksPage.initialize();
-		typesPage.initialize();
-		classpathPage.initialize();
-		propertiesPage.initialize();
-
-		return folder;
-	}
-	
-	/* (non-Javadoc)
-	 * Method declared on PreferencePage.
-	 */
-	protected void performDefaults() {
-		super.performDefaults();
-		
-		AntCorePreferences prefs = AntCorePlugin.getPlugin().getPreferences();
-		tasksPage.setInput(prefs.getDefaultTasks());
-		typesPage.setInput(prefs.getDefaultTypes());
-		classpathPage.performDefaults();
-		propertiesPage.performDefaults();
-	}
-	
-	/* (non-Javadoc)
-	 * Method declared on PreferencePage.
-	 */
-	public boolean performOk() {
-		AntCorePreferences prefs = AntCorePlugin.getPlugin().getPreferences();
-		
-		List contents = classpathPage.getAntURLs();
-		if (contents != null) {
-			URL[] urls = (URL[]) contents.toArray(new URL[contents.size()]);
-			prefs.setAntURLs(urls);
-		}
-		
-		contents = classpathPage.getUserURLs();
-		if (contents != null) {
-			URL[] urls = (URL[]) contents.toArray(new URL[contents.size()]);
-			prefs.setCustomURLs(urls);
-		}
-		
-		String antHome= classpathPage.getAntHome();
-		prefs.setAntHome(antHome);
-		
-		contents = tasksPage.getContents(false);
-		if (contents != null) {
-			Task[] tasks = (Task[]) contents.toArray(new Task[contents.size()]);
-			prefs.setCustomTasks(tasks);
-		}
-		
-		contents = typesPage.getContents(false);
-		if (contents != null) {
-			Type[] types = (Type[]) contents.toArray(new Type[contents.size()]);
-			prefs.setCustomTypes(types);
-		}
-		
-		contents = propertiesPage.getProperties();
-		if (contents != null) {
-			Property[] properties = (Property[]) contents.toArray(new Property[contents.size()]);
-			prefs.setCustomProperties(properties);
-		}
-		
-		String[] files = propertiesPage.getPropertyFiles();
-		prefs.setCustomPropertyFiles(files);
-		
-		prefs.updatePluginPreferences();
-		return super.performOk();
-	}
-	
-	/**
-	 * @see org.eclipse.jface.dialogs.DialogPage#setButtonLayoutData(org.eclipse.swt.widgets.Button)
-	 */
-	protected GridData setButtonLayoutData(Button button) {
-		return super.setButtonLayoutData(button);
-	}
-	
-	protected List getLibraryURLs() {
-		List urls= new ArrayList();
-		urls.addAll(classpathPage.getAntURLs());
-		urls.addAll(classpathPage.getUserURLs());
-		return urls;
-	}
-}
diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/preferences/AntTasksPage.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/preferences/AntTasksPage.java
deleted file mode 100644
index 1dc3357..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/preferences/AntTasksPage.java
+++ /dev/null
@@ -1,223 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.ui.internal.preferences;
-
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.ant.core.AntCorePlugin;
-import org.eclipse.ant.core.AntCorePreferences;
-import org.eclipse.ant.core.Task;
-import org.eclipse.ant.ui.internal.model.IAntUIHelpContextIds;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.TabFolder;
-import org.eclipse.swt.widgets.TabItem;
-import org.eclipse.ui.ISharedImages;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * Sub-page that allows the user to enter custom tasks
- * to be used when running Ant build files.
- */
-public class AntTasksPage extends AntPage {
-	private static final int ADD_TASK_BUTTON = IDialogConstants.CLIENT_ID + 1;
-	private static final int EDIT_TASK_BUTTON = IDialogConstants.CLIENT_ID + 2;
-	private static final int REMOVE_BUTTON = IDialogConstants.CLIENT_ID + 3;
-
-	private final AntTasksLabelProvider labelProvider = new AntTasksLabelProvider();
-	/**
-	 * Creates an instance.
-	 */
-	public AntTasksPage(AntRuntimePreferencePage preferencePage) {
-		super(preferencePage);
-	}
-	
-	/* (non-Javadoc)
-	 * Method declared on AntPage.
-	 */
-	protected void addButtonsToButtonGroup(Composite parent) {
-		createPushButton(parent, AntPreferencesMessages.getString("AntTasksPage.addTaskButtonTitle"), ADD_TASK_BUTTON); //$NON-NLS-1$
-		editButton = createPushButton(parent, AntPreferencesMessages.getString("AntTasksPage.editTaskButtonTitle"), EDIT_TASK_BUTTON); //$NON-NLS-1$
-		createSeparator(parent);
-		removeButton = createPushButton(parent, AntPreferencesMessages.getString("AntTasksPage.removeButtonTitle"), REMOVE_BUTTON); //$NON-NLS-1$
-	}
-	
-	/**
-	 * Allows the user to enter a custom task.
-	 */
-	private void addTask() {
-		AddCustomDialog dialog = getCustomDialog();
-		if (dialog.open() == Dialog.CANCEL) {
-			return;
-		}
-
-		Task task = new Task();
-		task.setTaskName(dialog.getName());
-		task.setClassName(dialog.getClassName());
-		task.setLibrary(dialog.getLibrary());
-		addContent(task);
-	}
-	
-	private AddCustomDialog getCustomDialog() {
-		String title = AntPreferencesMessages.getString("AntTasksPage.addTaskDialogTitle"); //$NON-NLS-1$
-
-		Iterator tasks= getContents(true).iterator();
-		List names= new ArrayList();
-		while (tasks.hasNext()) {
-			Task task = (Task) tasks.next();
-			names.add(task.getTaskName());	
-		}
-		AddCustomDialog dialog = new AddCustomDialog(getShell(), getPreferencePage().getLibraryURLs(), names);
-		dialog.setTitle(title);
-		dialog.setAlreadyExistsErrorMsg(AntPreferencesMessages.getString("AntTasksPage.8")); //$NON-NLS-1$
-		dialog.setNoNameErrorMsg(AntPreferencesMessages.getString("AntTasksPage.9")); //$NON-NLS-1$
-		return dialog;
-	}
-
-	/* (non-Javadoc)
-	 * Method declared on AntPage.
-	 */
-	protected void buttonPressed(int buttonId) {
-		switch (buttonId) {
-			case ADD_TASK_BUTTON :
-				addTask();
-				break;
-			case EDIT_TASK_BUTTON :
-				edit(getSelection());
-				break;
-			case REMOVE_BUTTON :
-				remove();
-				break;
-		}
-	}
-	
-	/**
-	 * Creates the tab item that contains this sub-page.
-	 */
-	protected TabItem createTabItem(TabFolder folder) {
-		TabItem item = new TabItem(folder, SWT.NONE);
-		item.setText(AntPreferencesMessages.getString("AntTasksPage.title")); //$NON-NLS-1$
-		item.setImage(labelProvider.getTaskImage());
-		item.setData(this);
-		Composite top = new Composite(folder, SWT.NONE);
-		top.setFont(folder.getFont());
-		item.setControl(createContents(top));
-		
-		connectToFolder(item, folder);
-		
-		return item;
-	}
-
-	/**
-	 * Allows the user to edit a custom Ant task.
-	 */	
-	protected void edit(IStructuredSelection selection) {
-		Task task= (Task)selection.getFirstElement();
-		if (task == null) {
-			return;
-		}
-		
-		AddCustomDialog dialog = getCustomDialog();
-		dialog.setClassName(task.getClassName());
-		dialog.setName(task.getTaskName());
-		dialog.setLibrary(task.getLibrary());
-		if (dialog.open() == Dialog.CANCEL) {
-			return;
-		}
-
-		task.setTaskName(dialog.getName());
-		task.setClassName(dialog.getClassName());
-		task.setLibrary(dialog.getLibrary());
-		updateContent(task);
-	}
-	
-	/* (non-Javadoc)
-	 * Method declared on AntPage.
-	 */
-	protected ITableLabelProvider getLabelProvider() {
-		return labelProvider;
-	}
-
-	/**
-	 * Label provider for task elements
-	 */
-	private static final class AntTasksLabelProvider extends LabelProvider implements ITableLabelProvider {
-		private Image taskImage;
-	
-		/**
-		 * Creates an instance.
-		 */
-		public AntTasksLabelProvider() {
-		}
-		
-		/* (non-Javadoc)
-		 * Method declared on IBaseLabelProvider.
-		 */
-		public void dispose() {
-			// Task image is shared, do not dispose.
-			taskImage = null;
-		}
-		
-		/* (non-Javadoc)
-		 * Method declared on ITableLabelProvider.
-		 */
-		public Image getColumnImage(Object element, int columnIndex) {
-			return getTaskImage();
-		}
-		
-		/* (non-Javadoc)
-		 * Method declared on ITableLabelProvider.
-		 */
-		public String getColumnText(Object element, int columnIndex) {
-			Task task = (Task) element;
-			StringBuffer text= new StringBuffer(task.getTaskName());
-			text.append(" ("); //$NON-NLS-1$
-			text.append(task.getLibrary().getFile());
-			text.append(": "); //$NON-NLS-1$
-			text.append(task.getClassName());
-			text.append(')');
-			if (task.isDefault()) {
-				text.append(AntPreferencesMessages.getString("AntTasksPage._[system_task]_3")); //$NON-NLS-1$
-			}
-			return text.toString();
-		}
-		
-		public Image getTaskImage() {
-			if (taskImage == null) {
-				taskImage = PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJS_TASK_TSK);
-			}
-			return taskImage;
-		}
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.ant.ui.internal.preferences.AntPage#initialize()
-	 */
-	protected void initialize() {
-		AntCorePreferences prefs = AntCorePlugin.getPlugin().getPreferences();
-		setInput(prefs.getTasks());
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ant.ui.internal.preferences.AntPage#getHelpContextId()
-	 */
-	protected String getHelpContextId() {
-		return IAntUIHelpContextIds.ANT_TASKS_PAGE;
-	}
-}
diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/preferences/AntTypesPage.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/preferences/AntTypesPage.java
deleted file mode 100644
index 3d381bd..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/preferences/AntTypesPage.java
+++ /dev/null
@@ -1,217 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.ui.internal.preferences;
-
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.ant.core.AntCorePlugin;
-import org.eclipse.ant.core.AntCorePreferences;
-import org.eclipse.ant.core.Type;
-import org.eclipse.ant.ui.internal.model.AntUIImages;
-import org.eclipse.ant.ui.internal.model.IAntUIConstants;
-import org.eclipse.ant.ui.internal.model.IAntUIHelpContextIds;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.TabFolder;
-import org.eclipse.swt.widgets.TabItem;
-
-/**
- * Sub-page that allows the user to enter custom types
- * to be used when running Ant build files.
- */
-public class AntTypesPage extends AntPage {
-	private static final int ADD_TYPE_BUTTON = IDialogConstants.CLIENT_ID + 1;
-	private static final int EDIT_TYPE_BUTTON = IDialogConstants.CLIENT_ID + 2;
-	private static final int REMOVE_BUTTON = IDialogConstants.CLIENT_ID + 3;
-
-	private final AntTypesLabelProvider labelProvider = new AntTypesLabelProvider();
-	/**
-	 * Creates an instance.
-	 */
-	public AntTypesPage(AntRuntimePreferencePage preferencePage) {
-		super(preferencePage);
-	}
-	
-	/* (non-Javadoc)
-	 * Method declared on AntPage.
-	 */
-	protected void addButtonsToButtonGroup(Composite parent) {
-		createPushButton(parent, AntPreferencesMessages.getString("AntTypesPage.addTypeButtonTitle"), ADD_TYPE_BUTTON); //$NON-NLS-1$
-		editButton = createPushButton(parent, AntPreferencesMessages.getString("AntTypesPage.editTypeButtonTitle"), EDIT_TYPE_BUTTON); //$NON-NLS-1$
-		createSeparator(parent);
-		removeButton = createPushButton(parent, AntPreferencesMessages.getString("AntTypesPage.removeButtonTitle"), REMOVE_BUTTON); //$NON-NLS-1$
-	}
-	
-	/**
-	 * Allows the user to enter a custom type.
-	 */
-	private void addType() {
-		AddCustomDialog dialog = getCustomDialog();
-		if (dialog.open() == Dialog.CANCEL) {
-			return;
-		}
-
-		Type type = new Type();
-		type.setTypeName(dialog.getName());
-		type.setClassName(dialog.getClassName());
-		type.setLibrary(dialog.getLibrary());
-		addContent(type);
-	}
-	
-	/* (non-Javadoc)
-	 * Method declared on AntPage.
-	 */
-	protected void buttonPressed(int buttonId) {
-		switch (buttonId) {
-			case ADD_TYPE_BUTTON :
-				addType();
-				break;
-			case EDIT_TYPE_BUTTON :
-				edit(getSelection());
-				break;
-			case REMOVE_BUTTON :
-				remove();
-				break;
-		}
-	}
-	
-	/**
-	 * Creates the tab item that contains this sub-page.
-	 */
-	protected TabItem createTabItem(TabFolder folder) {
-		TabItem item = new TabItem(folder, SWT.NONE);
-		item.setText(AntPreferencesMessages.getString("AntTypesPage.typesPageTitle")); //$NON-NLS-1$
-		item.setImage(labelProvider.getTypeImage());
-		item.setData(this);
-		Composite top = new Composite(folder, SWT.NONE);
-		top.setFont(folder.getFont());			
-		item.setControl(createContents(top));
-		
-		connectToFolder(item, folder);
-				
-		return item;
-	}
-	
-	/**
-	 * Allows the user to edit a custom Ant type.
-	 */	
-	protected void edit(IStructuredSelection selection) {
-		Type type = (Type) selection.getFirstElement();
-		if (type == null) {
-			return;
-		}
-		AddCustomDialog dialog = getCustomDialog();
-		dialog.setClassName(type.getClassName());
-		dialog.setName(type.getTypeName());
-		dialog.setLibrary(type.getLibrary());
-		if (dialog.open() == Dialog.CANCEL) {
-			return;
-		}
-
-		type.setTypeName(dialog.getName());
-		type.setClassName(dialog.getClassName());
-		type.setLibrary(dialog.getLibrary());
-		updateContent(type);
-	}
-	
-	private AddCustomDialog getCustomDialog() {
-		String title = AntPreferencesMessages.getString("AntTypesPage.editTypeDialogTitle"); //$NON-NLS-1$
-		
-		Iterator types= getContents(true).iterator();
-		List names= new ArrayList();
-		while (types.hasNext()) {
-			Type aTask = (Type) types.next();
-			names.add(aTask.getTypeName());
-		}
-		
-		AddCustomDialog dialog = new AddCustomDialog(getShell(), getPreferencePage().getLibraryURLs(), names);
-		dialog.setTitle(title);
-		dialog.setAlreadyExistsErrorMsg(AntPreferencesMessages.getString("AntTypesPage.8")); //$NON-NLS-1$
-		dialog.setNoNameErrorMsg(AntPreferencesMessages.getString("AntTypesPage.9")); //$NON-NLS-1$
-		return dialog;
-	}
-
-	/* (non-Javadoc)
-	 * Method declared on AntPage.
-	 */
-	protected ITableLabelProvider getLabelProvider() {
-		return labelProvider;
-	}
-
-		/**
-	 * Label provider for type elements
-	 */
-	private static final class AntTypesLabelProvider extends LabelProvider implements ITableLabelProvider {
-		/**
-		 * Creates an instance.
-		 */
-		public AntTypesLabelProvider() {
-		}
-		
-		/* (non-Javadoc)
-		 * Method declared on IBaseLabelProvider.
-		 */
-		public void dispose() {
-		}
-		
-		/* (non-Javadoc)
-		 * Method declared on ITableLabelProvider.
-		 */
-		public Image getColumnImage(Object element, int columnIndex) {
-			return getTypeImage();
-		}
-		
-		/* (non-Javadoc)
-		 * Method declared on ITableLabelProvider.
-		 */
-		public String getColumnText(Object element, int columnIndex) {
-			Type type = (Type) element;
-			StringBuffer text= new StringBuffer(type.getTypeName());
-			text.append(" ("); //$NON-NLS-1$
-			text.append(type.getLibrary().getFile());
-			text.append(": "); //$NON-NLS-1$
-			text.append(type.getClassName());
-			text.append(')');
-			if (type.isDefault()) {
-				text.append(AntPreferencesMessages.getString("AntTypesPage._[system_type]_3")); //$NON-NLS-1$
-			}
-			return text.toString();
-		}
-		
-		public Image getTypeImage() {
-			return AntUIImages.getImage(IAntUIConstants.IMG_ANT_TYPE);
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ant.ui.internal.preferences.AntPage#initialize()
-	 */
-	protected void initialize() {
-		AntCorePreferences prefs= AntCorePlugin.getPlugin().getPreferences();
-		setInput(prefs.getTypes());
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ant.ui.internal.preferences.AntPage#initialize()
-	 */
-	protected String getHelpContextId() {
-		return IAntUIHelpContextIds.ANT_TYPES_PAGE;
-	}
-}
diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/preferences/ColorEditor.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/preferences/ColorEditor.java
deleted file mode 100644
index a6aa0ae..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/preferences/ColorEditor.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.ui.internal.preferences;
-
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.DisposeEvent;
-import org.eclipse.swt.events.DisposeListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.graphics.GC;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.graphics.RGB;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.ColorDialog;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
-
-import org.eclipse.jface.resource.JFaceResources;
-
-/**
- * A "button" of a certain color determined by the color picker
- */
-public class ColorEditor {
-	
-	private Point fExtent;
-	private Image fImage;
-	private RGB fColorValue;
-	private Color fColor;
-	private Button fButton;
-	
-	public ColorEditor(Composite parent) {
-		
-		fButton= new Button(parent, SWT.PUSH);
-		fExtent= computeImageSize(parent);
-		fImage= new Image(parent.getDisplay(), fExtent.x, fExtent.y);
-		
-		GC gc= new GC(fImage);
-		gc.setBackground(fButton.getBackground());
-		gc.fillRectangle(0, 0, fExtent.x, fExtent.y);
-		gc.dispose();
-		
-		fButton.setImage(fImage);
-		fButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent event) {
-				ColorDialog colorDialog= new ColorDialog(fButton.getShell());
-				colorDialog.setRGB(fColorValue);
-				RGB newColor = colorDialog.open();
-				if (newColor != null) {
-					fColorValue= newColor;
-					updateColorImage();
-				}
-			}
-		});
-		
-		fButton.addDisposeListener(new DisposeListener() {
-			public void widgetDisposed(DisposeEvent event) {
-				if (fImage != null)  {
-					fImage.dispose();
-					fImage= null;
-				}
-				if (fColor != null) {
-					fColor.dispose();
-					fColor= null;
-				}
-			}
-		});
-	}
-	
-	public RGB getColorValue() {
-		return fColorValue;
-	}
-	
-	public void setColorValue(RGB rgb) {
-		fColorValue= rgb;
-		updateColorImage();
-	}
-	
-	public Button getButton() {
-		return fButton;
-	}
-	
-	protected void updateColorImage() {
-		
-		Display display= fButton.getDisplay();
-		
-		GC gc= new GC(fImage);
-		gc.setForeground(display.getSystemColor(SWT.COLOR_BLACK));
-		gc.drawRectangle(0, 2, fExtent.x - 1, fExtent.y - 4);
-		
-		if (fColor != null)
-			fColor.dispose();
-			
-		fColor= new Color(display, fColorValue);
-		gc.setBackground(fColor);
-		gc.fillRectangle(1, 3, fExtent.x - 2, fExtent.y - 5);
-		gc.dispose();
-		
-		fButton.setImage(fImage);
-	}
-	
-	protected Point computeImageSize(Control window) {
-		GC gc= new GC(window);
-		Font f= JFaceResources.getFontRegistry().get(JFaceResources.DEFAULT_FONT);
-		gc.setFont(f);
-		int height= gc.getFontMetrics().getHeight();
-		gc.dispose();
-		Point p= new Point(height * 3 - 6, height);
-		return p;
-	}
-}
diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/preferences/IAntBlockContainer.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/preferences/IAntBlockContainer.java
deleted file mode 100644
index 1b79dd0..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/preferences/IAntBlockContainer.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.ui.internal.preferences;
-
-
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-
-public interface IAntBlockContainer {
-	
-	/**
-	 * Sets the error message for the container.
-	 * May be <code>null</code> to remove the error message.
-	 * 
-	 * @param message A string error message or <code>null</code>
-	 */
-	public void setErrorMessage(String message);
-	
-	/**
-	 * Sets the message for the container.
-	 * May be <code>null</code> to remove the message.
-	 * 
-	 * @param message A string message or <code>null</code>
-	 */
-	public void setMessage(String message);
-	
-	/**
-	 * Creates and returns a properly configured push button with 
-	 * the supplied label
-	 * 
-	 * @param parent The composite parent of the button
-	 * @param label The button label
-	 * 
-	 * @return button the created button
-	 */
-	public Button createPushButton(Composite parent, String label);
-	
-	/**
-	 * Notifies the container that state has changed.
-	 */
-	public void update();
-
-}
diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/preferences/MessageLine.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/preferences/MessageLine.java
deleted file mode 100644
index a4fe38c..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/preferences/MessageLine.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.ui.internal.preferences;
-
-
-import org.eclipse.core.runtime.IStatus;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CLabel;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.RGB;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.ISharedImages;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * A message line displaying a status.
- */
-public class MessageLine extends CLabel {
-
-	private static final RGB ERROR_BACKGROUND_RGB = new RGB(230, 226, 221);
-
-	private Color fNormalMsgAreaBackground;
-	private Color fErrorMsgAreaBackground;
-
-	/**
-	 * Creates a new message line as a child of the given parent.
-	 */
-	public MessageLine(Composite parent) {
-		this(parent, SWT.LEFT);
-	}
-
-	/**
-	 * Creates a new message line as a child of the parent and with the given SWT stylebits.
-	 */
-	public MessageLine(Composite parent, int style) {
-		super(parent, style);
-		fNormalMsgAreaBackground= getBackground();
-		fErrorMsgAreaBackground= null;
-	}
-
-
-	private Image findImage(IStatus status) {
-		if (status.isOK()) {
-			return null;
-		} else if (status.matches(IStatus.ERROR)) {
-			return PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJS_ERROR_TSK);
-		} else if (status.matches(IStatus.WARNING)) {
-			return PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJS_WARN_TSK);
-		} else if (status.matches(IStatus.INFO)) {
-			return PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJS_INFO_TSK);
-		}
-		return null;
-	}
-
-	/**
-	 * Sets the message and image to the given status.
-	 * <code>null</code> is a valid argument and will set the empty text and no image
-	 */
-	public void setErrorStatus(IStatus status) {
-		if (status != null) {
-			String message= status.getMessage();
-			if (message != null && message.length() > 0) {
-				setText(message);
-				setImage(findImage(status));
-				if (fErrorMsgAreaBackground == null) {
-					fErrorMsgAreaBackground= new Color(getDisplay(), ERROR_BACKGROUND_RGB);
-				}
-				setBackground(fErrorMsgAreaBackground);
-				return;
-			}
-		}
-		setText(""); //$NON-NLS-1$
-		setImage(null);
-		setBackground(fNormalMsgAreaBackground);
-	}
-
-	/*
-	 * @see Widget#dispose()
-	 */
-	public void dispose() {
-		if (fErrorMsgAreaBackground != null) {
-			fErrorMsgAreaBackground.dispose();
-			fErrorMsgAreaBackground= null;
-		}
-		super.dispose();
-	}
-}
diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/preferences/MinimizedFileSystemElement.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/preferences/MinimizedFileSystemElement.java
deleted file mode 100644
index 42f60df..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/preferences/MinimizedFileSystemElement.java
+++ /dev/null
@@ -1,217 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.ui.internal.preferences;
-
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ui.ISharedImages;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.model.IWorkbenchAdapter;
-import org.eclipse.ui.wizards.datatransfer.IImportStructureProvider;
-
-class MinimizedFileSystemElement implements IWorkbenchAdapter, IAdaptable {
-	private boolean populated = false;
-	private List folders = null;
-	private List files = null;
-	private String name;
-	private boolean isDirectory = false;
-	private MinimizedFileSystemElement parent;
-	private Object fileSystemObject;
-	
-	/**
-	 * Create a <code>MinimizedFileSystemElement</code> with the supplied name and parent.
-	 * @param name the name of the file element this represents
-	 * @param parent the containing parent
-	 * @param isDirectory indicated if this could have children or not
-	 */
-	public MinimizedFileSystemElement(String name, MinimizedFileSystemElement parent, boolean isDirectory) {
-		this.name = name;
-		this.parent = parent;
-		this.isDirectory = isDirectory;
-		if (parent != null) {
-			parent.addChild(this);
-		}
-	}
-	
-	/**
-	 * Returns the adapter
-	 */
-	public Object getAdapter(Class adapter) {
-		if (adapter == IWorkbenchAdapter.class) {
-			return this;
-		}
-		//defer to the platform
-		return Platform.getAdapterManager().getAdapter(this, adapter);
-	}
-	
-	/**
-	 * Returns true if this element represents a directory, and false
-	 * otherwise.
-	 */
-	public boolean isDirectory() {
-		return isDirectory;
-	}
-	
-	/**
-	 * Adds the passed child to this object's collection of children.
-	 *
-	 * @param child MinimizedFileSystemElement
-	 */
-	private void addChild(MinimizedFileSystemElement child) {
-		if (child.isDirectory()) {
-			if (folders == null) {
-				 folders = new ArrayList(1);
-			}
-			folders.add(child);
-		} else {
-			if (files == null) {
-				 files = new ArrayList(1);
-			}
-			files.add(child);
-		}
-	}
-	/**
-	 * Returns a list of the files that are immediate children. Use the supplied provider
-	 * if it needs to be populated.
-	 */
-	protected List getFiles(IImportStructureProvider provider) {
-		if (!populated) {
-			populate(provider);
-		}
-
-		if (files == null) {
-			 return Collections.EMPTY_LIST;
-		}
-		return files;
-
-	}
-	/**
-	 * Returns a list of the folders that are immediate children. Use the supplied provider
-	 * if it needs to be populated.
-	 */
-	protected List getFolders(IImportStructureProvider provider) {
-		if (!populated) {
-			populate(provider);
-		}
-
-		return getFolders();
-
-	}
-
-	protected List getFolders() {
-		if (folders == null){
-			 return Collections.EMPTY_LIST;
-		}
-		return folders;
-	}
-	/**
-	 * Return whether or not population has happened for the receiver.
-	 */
-	protected boolean isPopulated() {
-		return this.populated;
-	}
-	/**
-	 * Return whether or not population has not happened for the receiver.
-	 */
-	protected boolean notPopulated() {
-		return !this.populated;
-	}
-	/**
-	 * Populate the files and folders of the receiver using the supplied
-	 * structure provider.
-	 * @param provider org.eclipse.ui.wizards.datatransfer.IImportStructureProvider
-	 */
-	private void populate(IImportStructureProvider provider) {
-
-		List children = provider.getChildren(fileSystemObject);
-		if (children == null) {
-			children = new ArrayList(1);
-		}
-		Iterator childrenEnum = children.iterator();
-		while (childrenEnum.hasNext()) {
-			Object child = childrenEnum.next();
-
-			String elementLabel = provider.getLabel(child);
-			boolean isFolder= provider.isFolder(child);
-			if (!isFolder && !elementLabel.endsWith(".class")) { //$NON-NLS-1$
-				continue;
-			}
-			//Create one level below
-			MinimizedFileSystemElement result = new MinimizedFileSystemElement(elementLabel, this, isFolder);
-			result.setFileSystemObject(child);
-		}
-		setPopulated();
-	}
-	
-	/**
-	 *	Returns the file system object property of this element
-	 *
-	 *	@return the file system object
-	 */
-	protected Object getFileSystemObject() {
-		return fileSystemObject;
-	}
-	
-	/**
-	 *	Set the file system object property of this element
-	 *
-	 *	@param value the file system object
-	 */
-	protected void setFileSystemObject(Object value) {
-		fileSystemObject = value;
-	}
-	/**
-	 * Set whether or not population has happened for the receiver to true.
-	 */
-	protected void setPopulated() {
-		this.populated = true;
-	}
-	/**
-	 * @see org.eclipse.ui.model.IWorkbenchAdapter#getChildren(java.lang.Object)
-	 */
-	public Object[] getChildren(Object o) {
-		return getFolders().toArray();
-	}
-
-	/**
-	 * @see org.eclipse.ui.model.IWorkbenchAdapter#getImageDescriptor(java.lang.Object)
-	 */
-	public ImageDescriptor getImageDescriptor(Object object) {
-		if (isDirectory()) {
-			return PlatformUI.getWorkbench().getSharedImages().getImageDescriptor(ISharedImages.IMG_OBJ_FOLDER);
-		} else {
-			return PlatformUI.getWorkbench().getEditorRegistry().getImageDescriptor(name);
-		}
-	}
-
-	/**
-	 * @see org.eclipse.ui.model.IWorkbenchAdapter#getLabel(java.lang.Object)
-	 */
-	public String getLabel(Object o) {
-		return name;
-	}
-
-	/**
-	 * @see org.eclipse.ui.model.IWorkbenchAdapter#getParent(java.lang.Object)
-	 */
-	public Object getParent(Object o) {
-		return parent;
-	}
-
-}
-
diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/preferences/OverlayPreferenceStore.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/preferences/OverlayPreferenceStore.java
deleted file mode 100644
index 50e7717..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/preferences/OverlayPreferenceStore.java
+++ /dev/null
@@ -1,451 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.ui.internal.preferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.preference.PreferenceStore;
-import org.eclipse.jface.util.IPropertyChangeListener;
-import org.eclipse.jface.util.PropertyChangeEvent;
-
-/**
- * An overlaying preference store.
- */
-class OverlayPreferenceStore  implements IPreferenceStore {
-	
-	
-	public static final class TypeDescriptor {
-		private TypeDescriptor() {
-		}
-	};
-	
-	public static final TypeDescriptor BOOLEAN= new TypeDescriptor();
-	public static final TypeDescriptor DOUBLE= new TypeDescriptor();
-	public static final TypeDescriptor FLOAT= new TypeDescriptor();
-	public static final TypeDescriptor INT= new TypeDescriptor();
-	public static final TypeDescriptor LONG= new TypeDescriptor();
-	public static final TypeDescriptor STRING= new TypeDescriptor();
-	
-	public static class OverlayKey {
-		
-		TypeDescriptor fDescriptor;
-		String fKey;
-		
-		public OverlayKey(TypeDescriptor descriptor, String key) {
-			fDescriptor= descriptor;
-			fKey= key;
-		}
-	};
-	
-	private class PropertyListener implements IPropertyChangeListener {
-				
-		/*
-		 * @see IPropertyChangeListener#propertyChange(PropertyChangeEvent)
-		 */
-		public void propertyChange(PropertyChangeEvent event) {
-			OverlayKey key= findOverlayKey(event.getProperty());
-			if (key != null)
-				propagateProperty(fParent, key, fStore); 
-		}
-	};
-	
-	
-	private IPreferenceStore fParent;
-	private IPreferenceStore fStore;
-	private OverlayKey[] fOverlayKeys;
-	
-	private PropertyListener fPropertyListener;
-	
-	
-	public OverlayPreferenceStore(IPreferenceStore parent, OverlayKey[] overlayKeys) {
-		fParent= parent;
-		fOverlayKeys= overlayKeys;
-		fStore= new PreferenceStore();
-	}
-	
-	private OverlayKey findOverlayKey(String key) {
-		for (int i= 0; i < fOverlayKeys.length; i++) {
-			if (fOverlayKeys[i].fKey.equals(key))
-				return fOverlayKeys[i];
-		}
-		return null;
-	}
-	
-	private boolean covers(String key) {
-		return (findOverlayKey(key) != null);
-	}
-	
-	private void propagateProperty(IPreferenceStore orgin, OverlayKey key, IPreferenceStore target) {
-		
-		if (orgin.isDefault(key.fKey)) {
-			if (!target.isDefault(key.fKey))
-				target.setToDefault(key.fKey);
-			return;
-		}
-		
-		TypeDescriptor d= key.fDescriptor;
-		if (BOOLEAN == d) {
-			
-			boolean originValue= orgin.getBoolean(key.fKey);
-			boolean targetValue= target.getBoolean(key.fKey);
-			if (targetValue != originValue)
-				target.setValue(key.fKey, originValue);
-				
-		} else if (DOUBLE == d) {
-			
-			double originValue= orgin.getDouble(key.fKey);
-			double targetValue= target.getDouble(key.fKey);
-			if (targetValue != originValue)
-				target.setValue(key.fKey, originValue);
-		
-		} else if (FLOAT == d) {
-			
-			float originValue= orgin.getFloat(key.fKey);
-			float targetValue= target.getFloat(key.fKey);
-			if (targetValue != originValue)
-				target.setValue(key.fKey, originValue);
-				
-		} else if (INT == d) {
-
-			int originValue= orgin.getInt(key.fKey);
-			int targetValue= target.getInt(key.fKey);
-			if (targetValue != originValue)
-				target.setValue(key.fKey, originValue);
-
-		} else if (LONG == d) {
-
-			long originValue= orgin.getLong(key.fKey);
-			long targetValue= target.getLong(key.fKey);
-			if (targetValue != originValue)
-				target.setValue(key.fKey, originValue);
-
-		} else if (STRING == d) {
-
-			String originValue= orgin.getString(key.fKey);
-			String targetValue= target.getString(key.fKey);
-			if (targetValue != null && originValue != null && !targetValue.equals(originValue))
-				target.setValue(key.fKey, originValue);
-
-		}
-	}
-	
-	public void propagate() {
-		for (int i= 0; i < fOverlayKeys.length; i++)
-			propagateProperty(fStore, fOverlayKeys[i], fParent);
-	}
-	
-	private void loadProperty(IPreferenceStore orgin, OverlayKey key, IPreferenceStore target, boolean forceInitialization) {
-		TypeDescriptor d= key.fDescriptor;
-		if (BOOLEAN == d) {
-			
-			if (forceInitialization)
-				target.setValue(key.fKey, true);
-			target.setValue(key.fKey, orgin.getBoolean(key.fKey));
-			target.setDefault(key.fKey, orgin.getDefaultBoolean(key.fKey));
-			
-		} else if (DOUBLE == d) {
-			
-			if (forceInitialization)
-				target.setValue(key.fKey, 1.0D);
-			target.setValue(key.fKey, orgin.getDouble(key.fKey));
-			target.setDefault(key.fKey, orgin.getDefaultDouble(key.fKey));
-			
-		} else if (FLOAT == d) {
-			
-			if (forceInitialization)
-				target.setValue(key.fKey, 1.0F);
-			target.setValue(key.fKey, orgin.getFloat(key.fKey));
-			target.setDefault(key.fKey, orgin.getDefaultFloat(key.fKey));
-			
-		} else if (INT == d) {
-			
-			if (forceInitialization)
-				target.setValue(key.fKey, 1);
-			target.setValue(key.fKey, orgin.getInt(key.fKey));
-			target.setDefault(key.fKey, orgin.getDefaultInt(key.fKey));
-			
-		} else if (LONG == d) {
-			
-			if (forceInitialization)
-				target.setValue(key.fKey, 1L);
-			target.setValue(key.fKey, orgin.getLong(key.fKey));
-			target.setDefault(key.fKey, orgin.getDefaultLong(key.fKey));
-			
-		} else if (STRING == d) {
-			
-			if (forceInitialization)
-				target.setValue(key.fKey, "1"); //$NON-NLS-1$
-			target.setValue(key.fKey, orgin.getString(key.fKey));
-			target.setDefault(key.fKey, orgin.getDefaultString(key.fKey));
-			
-		}
-	}
-	
-	public void load() {
-		for (int i= 0; i < fOverlayKeys.length; i++)
-			loadProperty(fParent, fOverlayKeys[i], fStore, true);
-	}
-	
-	public void loadDefaults() {
-		for (int i= 0; i < fOverlayKeys.length; i++)
-			setToDefault(fOverlayKeys[i].fKey);
-	}
-	
-	public void start() {
-		if (fPropertyListener == null) {
-			fPropertyListener= new PropertyListener();
-			fParent.addPropertyChangeListener(fPropertyListener);
-		}
-	}
-	
-	public void stop() {
-		if (fPropertyListener != null)  {
-			fParent.removePropertyChangeListener(fPropertyListener);
-			fPropertyListener= null;
-		}
-	}
-	
-	/*
-	 * @see IPreferenceStore#addPropertyChangeListener(IPropertyChangeListener)
-	 */
-	public void addPropertyChangeListener(IPropertyChangeListener listener) {
-		fStore.addPropertyChangeListener(listener);
-	}
-	
-	/*
-	 * @see IPreferenceStore#removePropertyChangeListener(IPropertyChangeListener)
-	 */
-	public void removePropertyChangeListener(IPropertyChangeListener listener) {
-		fStore.removePropertyChangeListener(listener);
-	}
-	
-	/*
-	 * @see IPreferenceStore#firePropertyChangeEvent(String, Object, Object)
-	 */
-	public void firePropertyChangeEvent(String name, Object oldValue, Object newValue) {
-		fStore.firePropertyChangeEvent(name, oldValue, newValue);
-	}
-
-	/*
-	 * @see IPreferenceStore#contains(String)
-	 */
-	public boolean contains(String name) {
-		return fStore.contains(name);
-	}
-	
-	/*
-	 * @see IPreferenceStore#getBoolean(String)
-	 */
-	public boolean getBoolean(String name) {
-		return fStore.getBoolean(name);
-	}
-
-	/*
-	 * @see IPreferenceStore#getDefaultBoolean(String)
-	 */
-	public boolean getDefaultBoolean(String name) {
-		return fStore.getDefaultBoolean(name);
-	}
-
-	/*
-	 * @see IPreferenceStore#getDefaultDouble(String)
-	 */
-	public double getDefaultDouble(String name) {
-		return fStore.getDefaultDouble(name);
-	}
-
-	/*
-	 * @see IPreferenceStore#getDefaultFloat(String)
-	 */
-	public float getDefaultFloat(String name) {
-		return fStore.getDefaultFloat(name);
-	}
-
-	/*
-	 * @see IPreferenceStore#getDefaultInt(String)
-	 */
-	public int getDefaultInt(String name) {
-		return fStore.getDefaultInt(name);
-	}
-
-	/*
-	 * @see IPreferenceStore#getDefaultLong(String)
-	 */
-	public long getDefaultLong(String name) {
-		return fStore.getDefaultLong(name);
-	}
-
-	/*
-	 * @see IPreferenceStore#getDefaultString(String)
-	 */
-	public String getDefaultString(String name) {
-		return fStore.getDefaultString(name);
-	}
-
-	/*
-	 * @see IPreferenceStore#getDouble(String)
-	 */
-	public double getDouble(String name) {
-		return fStore.getDouble(name);
-	}
-
-	/*
-	 * @see IPreferenceStore#getFloat(String)
-	 */
-	public float getFloat(String name) {
-		return fStore.getFloat(name);
-	}
-
-	/*
-	 * @see IPreferenceStore#getInt(String)
-	 */
-	public int getInt(String name) {
-		return fStore.getInt(name);
-	}
-
-	/*
-	 * @see IPreferenceStore#getLong(String)
-	 */
-	public long getLong(String name) {
-		return fStore.getLong(name);
-	}
-
-	/*
-	 * @see IPreferenceStore#getString(String)
-	 */
-	public String getString(String name) {
-		return fStore.getString(name);
-	}
-
-	/*
-	 * @see IPreferenceStore#isDefault(String)
-	 */
-	public boolean isDefault(String name) {
-		return fStore.isDefault(name);
-	}
-
-	/*
-	 * @see IPreferenceStore#needsSaving()
-	 */
-	public boolean needsSaving() {
-		return fStore.needsSaving();
-	}
-
-	/*
-	 * @see IPreferenceStore#putValue(String, String)
-	 */
-	public void putValue(String name, String value) {
-		if (covers(name))
-			fStore.putValue(name, value);
-	}
-
-	/*
-	 * @see IPreferenceStore#setDefault(String, double)
-	 */
-	public void setDefault(String name, double value) {
-		if (covers(name))
-			fStore.setDefault(name, value);
-	}
-
-	/*
-	 * @see IPreferenceStore#setDefault(String, float)
-	 */
-	public void setDefault(String name, float value) {
-		if (covers(name))
-			fStore.setDefault(name, value);
-	}
-
-	/*
-	 * @see IPreferenceStore#setDefault(String, int)
-	 */
-	public void setDefault(String name, int value) {
-		if (covers(name))
-			fStore.setDefault(name, value);
-	}
-
-	/*
-	 * @see IPreferenceStore#setDefault(String, long)
-	 */
-	public void setDefault(String name, long value) {
-		if (covers(name))
-			fStore.setDefault(name, value);
-	}
-
-	/*
-	 * @see IPreferenceStore#setDefault(String, String)
-	 */
-	public void setDefault(String name, String value) {
-		if (covers(name))
-			fStore.setDefault(name, value);
-	}
-
-	/*
-	 * @see IPreferenceStore#setDefault(String, boolean)
-	 */
-	public void setDefault(String name, boolean value) {
-		if (covers(name))
-			fStore.setDefault(name, value);
-	}
-
-	/*
-	 * @see IPreferenceStore#setToDefault(String)
-	 */
-	public void setToDefault(String name) {
-		fStore.setToDefault(name);
-	}
-
-	/*
-	 * @see IPreferenceStore#setValue(String, double)
-	 */
-	public void setValue(String name, double value) {
-		if (covers(name))
-			fStore.setValue(name, value);
-	}
-
-	/*
-	 * @see IPreferenceStore#setValue(String, float)
-	 */
-	public void setValue(String name, float value) {
-		if (covers(name))
-			fStore.setValue(name, value);
-	}
-
-	/*
-	 * @see IPreferenceStore#setValue(String, int)
-	 */
-	public void setValue(String name, int value) {
-		if (covers(name))
-			fStore.setValue(name, value);
-	}
-
-	/*
-	 * @see IPreferenceStore#setValue(String, long)
-	 */
-	public void setValue(String name, long value) {
-		if (covers(name))
-			fStore.setValue(name, value);
-	}
-
-	/*
-	 * @see IPreferenceStore#setValue(String, String)
-	 */
-	public void setValue(String name, String value) {
-		if (covers(name))
-			fStore.setValue(name, value);
-	}
-
-	/*
-	 * @see IPreferenceStore#setValue(String, boolean)
-	 */
-	public void setValue(String name, boolean value) {
-		if (covers(name))
-			fStore.setValue(name, value);
-	}
-}
diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/preferences/StatusDialog.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/preferences/StatusDialog.java
deleted file mode 100644
index 7c4cdf0..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/preferences/StatusDialog.java
+++ /dev/null
@@ -1,157 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.ui.internal.preferences;
-
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.externaltools.internal.model.IExternalToolsHelpContextIds;
-import org.eclipse.ui.help.WorkbenchHelp;
-
-/**
- * An abstract base class for dialogs with a status bar and ok/cancel buttons.
- * The status message must be passed over as StatusInfo object and can be
- * an error, warning or ok. The OK button is enabled or disabled depending
- * on the status.
- */
-public abstract class StatusDialog extends Dialog {
-
-	private Button fOkButton;
-	private MessageLine fStatusLine;
-	private IStatus fLastStatus;
-	private String fTitle;
-	private Image fImage;
-
-	/**
-	 * Creates an instane of a status dialog.
-	 */
-	public StatusDialog(Shell parent) {
-		super(parent);
-		fLastStatus= new StatusInfo();
-	}
-
-	/**
-	 * Update the dialog's status line to reflect the given status.
-	 * It is save to call this method before the dialog has been opened.
-	 */
-	protected void updateStatus(IStatus status) {
-		fLastStatus= status;
-		if (fStatusLine != null && !fStatusLine.isDisposed()) {
-			updateButtonsEnableState(status);
-			fStatusLine.setErrorStatus(status);
-		}
-	}
-
-	/**
-	 * Returns the last status.
-	 */
-	public IStatus getStatus() {
-		return fLastStatus;
-	}
-
-	/**
-	 * Updates the status of the ok button to reflect the given status.
-	 * Subclasses may override this method to update additional buttons.
-	 * @param status the status.
-	 */
-	protected void updateButtonsEnableState(IStatus status) {
-		if (fOkButton != null && !fOkButton.isDisposed())
-			fOkButton.setEnabled(!status.matches(IStatus.ERROR));
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.window.Window#configureShell(org.eclipse.swt.widgets.Shell)
-	 */
-	protected void configureShell(Shell shell) {
-		super.configureShell(shell);
-		if (fTitle != null) {
-			shell.setText(fTitle);
-		}
-		WorkbenchHelp.setHelp(shell, IExternalToolsHelpContextIds.STATUS_DIALOG);
-	}
-
-	/*
-	 * @see Window#create()
-	 */
-	public void create() {
-		super.create();
-		if (fLastStatus != null) {
-			// policy: dialogs are not allowed to come up with an error message
-			if (fLastStatus.matches(IStatus.ERROR)) {
-				StatusInfo status= new StatusInfo();
-				status.setError(""); //$NON-NLS-1$
-				fLastStatus= status;
-			}
-			updateStatus(fLastStatus);
-		}
-	}
-
-	/*
-	 * @see Dialog#createButtonsForButtonBar(Composite)
-	 */
-	protected void createButtonsForButtonBar(Composite parent) {
-		fOkButton= createButton(parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL, true);
-		createButton(parent, IDialogConstants.CANCEL_ID, IDialogConstants.CANCEL_LABEL, false);
-	}
-
-	/*
-	 * @see Dialog#createButtonBar(Composite)
-	 */
-	protected Control createButtonBar(Composite parent) {
-		Composite composite= new Composite(parent, SWT.NULL);
-		GridLayout layout= new GridLayout();
-		layout.numColumns= 1;
-		layout.marginHeight= 0;
-		layout.marginWidth= convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_MARGIN);
-		composite.setLayout(layout);
-		composite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-		fStatusLine= new MessageLine(composite);
-		fStatusLine.setAlignment(SWT.LEFT);
-		fStatusLine.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		fStatusLine.setErrorStatus(null); //$NON-NLS-1$
-
-		super.createButtonBar(composite);
-		return composite;
-	}
-
-	/**
-	 * Sets the title for this dialog.
-	 * @param title the title.
-	 */
-	public void setTitle(String title) {
-		fTitle= title != null ? title : ""; //$NON-NLS-1$
-		Shell shell= getShell();
-		if ((shell != null) && !shell.isDisposed())
-			shell.setText(fTitle);
-	}
-
-	/**
-	 * Sets the image for this dialog.
-	 * @param image the image.
-	 */
-	public void setImage(Image image) {
-		fImage= image;
-		Shell shell= getShell();
-		if ((shell != null) && !shell.isDisposed())
-			shell.setImage(fImage);
-	}
-
-}
diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/preferences/StatusInfo.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/preferences/StatusInfo.java
deleted file mode 100644
index effa5cb..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/preferences/StatusInfo.java
+++ /dev/null
@@ -1,172 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.ui.internal.preferences;
-
-
-import org.eclipse.ant.ui.internal.model.IAntUIConstants;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jface.util.Assert;
-
-/**
- * A settable IStatus.
- * Can be an error, warning, info or ok. For error, info and warning states,
- * a message describes the problem.
- */
-public class StatusInfo implements IStatus {
-
-	private String fStatusMessage;
-	private int fSeverity;
-
-	/**
-	 * Creates a status set to OK (no message)
-	 */
-	public StatusInfo() {
-		this(OK, null);
-	}
-
-	/**
-	 * Creates a status .
-	 * @param severity The status severity: ERROR, WARNING, INFO and OK.
-	 * @param message The message of the status. Applies only for ERROR,
-	 * WARNING and INFO.
-	 */
-	public StatusInfo(int severity, String message) {
-		fStatusMessage= message;
-		fSeverity= severity;
-	}
-
-	/**
-	 *  Returns if the status' severity is OK.
-	 */
-	public boolean isOK() {
-		return fSeverity == IStatus.OK;
-	}
-
-	/**
-	 *  Returns if the status' severity is WARNING.
-	 */
-	public boolean isWarning() {
-		return fSeverity == IStatus.WARNING;
-	}
-
-	/**
-	 *  Returns if the status' severity is INFO.
-	 */
-	public boolean isInfo() {
-		return fSeverity == IStatus.INFO;
-	}
-
-	/**
-	 *  Returns if the status' severity is ERROR.
-	 */
-	public boolean isError() {
-		return fSeverity == IStatus.ERROR;
-	}
-
-	/**
-	 * @see IStatus#getMessage
-	 */
-	public String getMessage() {
-		return fStatusMessage;
-	}
-
-	/**
-	 * Sets the status to ERROR.
-	 * @param The error message (can be empty, but not null)
-	 */
-	public void setError(String errorMessage) {
-		Assert.isNotNull(errorMessage);
-		fStatusMessage= errorMessage;
-		fSeverity= IStatus.ERROR;
-	}
-
-	/**
-	 * Sets the status to WARNING.
-	 * @param The warning message (can be empty, but not null)
-	 */
-	public void setWarning(String warningMessage) {
-		Assert.isNotNull(warningMessage);
-		fStatusMessage= warningMessage;
-		fSeverity= IStatus.WARNING;
-	}
-
-	/**
-	 * Sets the status to INFO.
-	 * @param The info message (can be empty, but not null)
-	 */
-	public void setInfo(String infoMessage) {
-		Assert.isNotNull(infoMessage);
-		fStatusMessage= infoMessage;
-		fSeverity= IStatus.INFO;
-	}
-
-	/**
-	 * Sets the status to OK.
-	 */
-	public void setOK() {
-		fStatusMessage= null;
-		fSeverity= IStatus.OK;
-	}
-
-	/*
-	 * @see IStatus#matches(int)
-	 */
-	public boolean matches(int severityMask) {
-		return (fSeverity & severityMask) != 0;
-	}
-
-	/**
-	 * Returns always <code>false</code>.
-	 * @see IStatus#isMultiStatus()
-	 */
-	public boolean isMultiStatus() {
-		return false;
-	}
-
-	/*
-	 * @see IStatus#getSeverity()
-	 */
-	public int getSeverity() {
-		return fSeverity;
-	}
-
-	/*
-	 * @see IStatus#getPlugin()
-	 */
-	public String getPlugin() {
-		return IAntUIConstants.PLUGIN_ID;
-	}
-
-	/**
-	 * Returns always <code>null</code>.
-	 * @see IStatus#getException()
-	 */
-	public Throwable getException() {
-		return null;
-	}
-
-	/**
-	 * Returns always the error severity.
-	 * @see IStatus#getCode()
-	 */
-	public int getCode() {
-		return fSeverity;
-	}
-
-	/**
-	 * Returns always <code>null</code>.
-	 * @see IStatus#getChildren()
-	 */
-	public IStatus[] getChildren() {
-		return new IStatus[0];
-	}
-
-}
diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/preferences/TabFolderLayout.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/preferences/TabFolderLayout.java
deleted file mode 100644
index 7b05318..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/preferences/TabFolderLayout.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.ui.internal.preferences;
-
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.graphics.Rectangle;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Layout;
-
-public class TabFolderLayout extends Layout {
-
-	protected Point computeSize (Composite composite, int wHint, int hHint, boolean flushCache) {
-		if (wHint != SWT.DEFAULT && hHint != SWT.DEFAULT)
-			return new Point(wHint, hHint);
-			
-		Control [] children = composite.getChildren ();
-		int count = children.length;
-		int maxWidth = 0, maxHeight = 0;
-		for (int i=0; i<count; i++) {
-			Control child = children [i];
-			Point pt = child.computeSize (SWT.DEFAULT, SWT.DEFAULT, flushCache);
-			maxWidth = Math.max (maxWidth, pt.x);
-			maxHeight = Math.max (maxHeight, pt.y);
-		}
-		
-		if (wHint != SWT.DEFAULT)
-			maxWidth= wHint;
-		if (hHint != SWT.DEFAULT)
-			maxHeight= hHint;
-		
-		return new Point(maxWidth, maxHeight);	
-		
-	}
-	
-	protected void layout (Composite composite, boolean flushCache) {
-		Rectangle rect= composite.getClientArea();
-	
-		Control[] children = composite.getChildren();
-		for (int i = 0; i < children.length; i++) {
-			children[i].setBounds(rect);
-		}
-	}
-}
diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/views/AntProjectContentProvider.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/views/AntProjectContentProvider.java
deleted file mode 100644
index d90b5e9..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/views/AntProjectContentProvider.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.ui.internal.views;
-
-
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.ant.ui.internal.views.elements.AntNode;
-import org.eclipse.ant.ui.internal.views.elements.ProjectNode;
-import org.eclipse.ant.ui.internal.views.elements.RootNode;
-import org.eclipse.ant.ui.internal.views.elements.TargetNode;
-
-/**
- * Content provider that provides a tree of ant projects.
- */
-public class AntProjectContentProvider implements ITreeContentProvider {
-
-	/**
-	 * The root node of the project tree
-	 */
-	private RootNode rootNode;
-
-	/**
-	 * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object)
-	 */
-	public Object[] getElements(Object inputElement) {
-		return getChildren(inputElement);
-	}
-
-	/**
-	 * @see org.eclipse.jface.viewers.IContentProvider#dispose()
-	 */
-	public void dispose() {
-	}
-
-	/**
-	 * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)
-	 */
-	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
-		if (newInput instanceof RootNode) {
-			rootNode= (RootNode) newInput;
-		}
-	}
-	
-	/**
-	 * Adds the given buildfile to the tree. Has no effect if the given build
-	 * file is already present in the tree.
-	 * 
-	 * @param buildFileName the string representing the path to a build file
-	 */
-	public void addProject(ProjectNode project) {
-		ProjectNode[] projects= getRootNode().getProjects();
-		for (int i = 0; i < projects.length; i++) {
-			ProjectNode node = projects[i];
-			if (node.getBuildFileName().equals(project.getBuildFileName())) {
-				return;
-			}
-		}
-		getRootNode().addProject(project);
-	}
-	
-	/**
-	 * Returns the root node of the tree or <code>null</code> if no root has
-	 * been set as the input
-	 * 
-	 * @return RootNode the root node of the tree
-	 */
-	public RootNode getRootNode() {
-		return rootNode;
-	}
-	
-	/**
-	 * @see org.eclipse.jface.viewers.ITreeContentProvider#getChildren(Object)
-	 */
-	public Object[] getChildren(Object element) {
-		if (element instanceof RootNode) {
-			return ((RootNode) element).getProjects();
-		} else if (element instanceof ProjectNode) {
-			return ((ProjectNode) element).getTargets();
-		}
-		return null;
-	}
-	
-	/**
-	 * @see org.eclipse.jface.viewers.ITreeContentProvider#getParent(Object)
-	 */
-	public Object getParent(Object element) {
-		if (element instanceof AntNode) {
-			return ((AntNode) element).getParent();
-		}
-		return null;
-	}
-	
-	/**
-	 * @see org.eclipse.jface.viewers.ITreeContentProvider#hasChildren(Object)
-	 */
-	public boolean hasChildren(Object element) {
-		if (element instanceof TargetNode) {
-			return false;
-		}
-		return true;
-	}
-
-}
diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/views/AntTargetContentProvider.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/views/AntTargetContentProvider.java
deleted file mode 100644
index 8ceef7c..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/views/AntTargetContentProvider.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.ui.internal.views;
-
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.ant.ui.internal.views.elements.TargetNode;
-
-/**
- * Content provider which provides a list of ant targets chosen by the user 
- */
-public class AntTargetContentProvider implements IStructuredContentProvider {
-
-	/**
-	 * The collection of currently active targets
-	 */
-	private List targets = new ArrayList();
-
-	/**
-	 * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object)
-	 */
-	public Object[] getElements(Object inputElement) {
-		return targets.toArray();
-	}
-
-	/**
-	 * @see org.eclipse.jface.viewers.IContentProvider#dispose()
-	 */
-	public void dispose() {
-	}
-
-	/**
-	 * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)
-	 */
-	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
-	}
-
-	/**
-	 * Returns the user's currently selected targets. The list contains
-	 * <code>TargetNode</code> objects.
-	 * 
-	 * @return List the user's currently selected targets
-	 */
-	public List getTargets() {
-		return targets;
-	}
-
-	/**
-	 * Adds the given target to the list of selected targets. Targets will
-	 * appear in the list as often as they are added.
-	 * 
-	 * @param target the target to add
-	 */
-	public void addTarget(TargetNode target) {
-		targets.add(target);
-	}
-
-	/**
-	 * Removes the given target from the list of selected targets. Has no effect
-	 * if the given index is invalid.
-	 * 
-	 * @param index the index of the the target to remove
-	 */
-	public void removeTarget(int index) {
-		if (targets.size() > index && index >= 0) {
-			targets.remove(index);
-		}
-	}
-	
-	/**
-	 * Moves the given target up in the list of active targets. Has no effect if
-	 * the given target is already the first target in the list or the given
-	 * index is invalid.
-	 * 
-	 * @param index the index of the target to move up
-	 */
-	public void moveUpTarget(int index) {
-		Object target= targets.get(index);
-		if (index == 0 || target == null) {
-			return;
-		}
-		targets.set(index, targets.get(index - 1));
-		targets.set(index - 1, target);
-	}
-	
-	/**
-	 * Moves the given target down in the list of active targets. Has no effect
-	 * if the given target is already the last target in the list or the given
-	 * index is invalid.
-	 *
-	 * @param index the index of the target to move down
-	 */
-	public void moveDownTarget(int index) {
-		Object target= targets.get(index);
-		if (index == targets.size() - 1 || target == null) {
-			return;
-		}
-		targets.set(index, targets.get(index + 1));
-		targets.set(index + 1, target);
-	}
-
-}
diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/views/AntView.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/views/AntView.java
deleted file mode 100644
index 3632ee8..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/views/AntView.java
+++ /dev/null
@@ -1,664 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     Roscoe Rush - Concept and prototype implementation
- *     IBM Corporation - current implementation
- *******************************************************************************/
-
-package org.eclipse.ant.ui.internal.views;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.ant.ui.internal.model.AntUIPlugin;
-import org.eclipse.ant.ui.internal.model.AntUtil;
-import org.eclipse.ant.ui.internal.model.IAntUIHelpContextIds;
-import org.eclipse.ant.ui.internal.views.elements.ProjectNode;
-import org.eclipse.ant.ui.internal.views.elements.RootNode;
-import org.eclipse.ant.ui.internal.views.elements.TargetNode;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceChangeEvent;
-import org.eclipse.core.resources.IResourceChangeListener;
-import org.eclipse.core.resources.IResourceDelta;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jface.action.IMenuListener;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.IToolBarManager;
-import org.eclipse.jface.action.MenuManager;
-import org.eclipse.jface.action.Separator;
-import org.eclipse.jface.viewers.DoubleClickEvent;
-import org.eclipse.jface.viewers.IDoubleClickListener;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerSorter;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.KeyAdapter;
-import org.eclipse.swt.events.KeyEvent;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Menu;
-import org.eclipse.ui.IEditorDescriptor;
-import org.eclipse.ui.IEditorRegistry;
-import org.eclipse.ui.IMemento;
-import org.eclipse.ui.IViewSite;
-import org.eclipse.ui.IWorkbenchActionConstants;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ant.ui.internal.views.actions.AddBuildFileAction;
-import org.eclipse.ant.ui.internal.views.actions.AntOpenWithMenu;
-import org.eclipse.ant.ui.internal.views.actions.EditLaunchConfigurationAction;
-import org.eclipse.ant.ui.internal.views.actions.RefreshBuildFilesAction;
-import org.eclipse.ant.ui.internal.views.actions.RemoveAllAction;
-import org.eclipse.ant.ui.internal.views.actions.RemoveProjectAction;
-import org.eclipse.ant.ui.internal.views.actions.RunTargetAction;
-import org.eclipse.ant.ui.internal.views.actions.SearchForBuildFilesAction;
-import org.eclipse.ui.help.WorkbenchHelp;
-import org.eclipse.ui.part.IShowInSource;
-import org.eclipse.ui.part.ShowInContext;
-import org.eclipse.ui.part.ViewPart;
-import org.eclipse.ui.texteditor.IUpdate;
-
-/**
- * A view which displays a hierarchical view of ant build files and allows the
- * user to run selected targets from those files.
- */
-public class AntView extends ViewPart implements IResourceChangeListener, IShowInSource {
-	/**
-	 * The root node of the project viewer as restored during initialization
-	 */
-	private RootNode restoredRoot = null;
-
-	/**
-	 * XML tag used to identify an ant project in storage
-	 */
-	private static final String TAG_PROJECT = "project"; //$NON-NLS-1$
-	/**
-	 * XML key used to store whether or not an ant project is an error node.
-	 * Persisting this data saved a huge amount of processing at startup.
-	 */
-	private static final String KEY_ERROR = "error"; //$NON-NLS-1$
-	/**
-	 * XML key used to store an ant project's path
-	 */
-	private static final String KEY_PATH = "path"; //$NON-NLS-1$
-	/**
-	 * XML key used to store an ant node's name
-	 */
-	private static final String KEY_NAME = "name"; //$NON-NLS-1$
-	/**
-	 * XML key used to store an ant project's default target name
-	 */
-	private static final String KEY_DEFAULT = "default"; //$NON-NLS-1$
-	/**
-	 * XML value for a boolean attribute whose value is <code>true</code>
-	 */
-	private static final String VALUE_TRUE = "true"; //$NON-NLS-1$
-	/**
-	 * XML value for a boolean attribute whose value is <code>false</code>
-	 */
-	private static final String VALUE_FALSE = "false"; //$NON-NLS-1$
-
-	/**
-	 * The tree viewer that displays the users ant projects
-	 */
-	private TreeViewer projectViewer;
-	private AntProjectContentProvider projectContentProvider;
-
-	/**
-	 * Collection of <code>IUpdate</code> actions that need to update on
-	 * selection changed in the project viewer.
-	 */
-	private List updateProjectActions;
-	// Ant View Actions
-	private AddBuildFileAction addBuildFileAction;
-	private SearchForBuildFilesAction searchForBuildFilesAction;
-	private RefreshBuildFilesAction refreshBuildFilesAction;
-	private RunTargetAction runTargetAction;
-	private RemoveProjectAction removeProjectAction;
-	private RemoveAllAction removeAllAction;
-	// Context-menu-only actions
-	private AntOpenWithMenu openWithMenu;
-	private EditLaunchConfigurationAction editConfigAction;
-
-	/**
-	 * The given build file has changed. Refresh the view to pick up any
-	 * structural changes.
-	 */
-	private void handleBuildFileChanged(final ProjectNode project) {
-		project.parseBuildFile();
-		Display.getDefault().asyncExec(new Runnable() {
-			public void run() {
-				projectViewer.refresh(project);
-			}
-		});
-	}
-
-	/**
-	 * @see org.eclipse.ui.IWorkbenchPart#createPartControl(org.eclipse.swt.widgets.Composite)
-	 */
-	public void createPartControl(Composite parent) {
-		initializeActions();
-		createProjectViewer(parent);
-		fillMainToolBar();
-		if (getProjects().length > 0) {
-			// If any projects have been added to the view during startup,
-			// begin listening for resource changes
-			ResourcesPlugin.getWorkspace().addResourceChangeListener(this);
-		}
-		WorkbenchHelp.setHelp(parent, IAntUIHelpContextIds.ANT_VIEW);
-		updateProjectActions();
-	}
-
-	/**
-	 * Creates a pop-up menu on the given control
-	 *
-	 * @param menuControl the control with which the pop-up
-	 *  menu will be associated
-	 */
-	private void createContextMenu(final Viewer viewer) {
-		Control menuControl = viewer.getControl();
-		MenuManager menuMgr = new MenuManager("#PopUp"); //$NON-NLS-1$
-		menuMgr.setRemoveAllWhenShown(true);
-		menuMgr.addMenuListener(new IMenuListener() {
-			public void menuAboutToShow(IMenuManager mgr) {
-				fillContextMenu(viewer, mgr);
-			}
-		});
-		Menu menu = menuMgr.createContextMenu(menuControl);
-		menuControl.setMenu(menu);
-
-		// register the context menu such that other plugins may contribute to it
-		getSite().registerContextMenu(menuMgr, viewer);
-	}
-
-	/**
-	 * Adds actions to the context menu
-	 *
-	 * @param viewer the viewer who's menu we're configuring
-	 * @param menu The menu to contribute to
-	 */
-	private void fillContextMenu(Viewer viewer, IMenuManager menu) {
-		if (viewer == projectViewer) {
-			menu.add(addBuildFileAction);
-			menu.add(new Separator());
-			menu.add(runTargetAction);
-			menu.add(editConfigAction);
-			menu.add(refreshBuildFilesAction);
-			addOpenWithMenu(menu);
-			menu.add(new Separator());
-			menu.add(removeProjectAction);
-			menu.add(removeAllAction);
-		}
-		menu.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS));
-	}
-
-	private void addOpenWithMenu(IMenuManager menu) {
-		IFile buildFile= getSelectionBuildFile();
-		if (buildFile != null && buildFile.exists()) {
-			menu.add(new Separator("group.open")); //$NON-NLS-1$
-			IMenuManager submenu= new MenuManager(AntViewMessages.getString("AntView.Open_With_3"));  //$NON-NLS-1$
-			openWithMenu.setFile(buildFile);
-			submenu.add(openWithMenu);
-			menu.appendToGroup("group.open", submenu); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * Initialize the actions for this view
-	 */
-	private void initializeActions() {
-		updateProjectActions= new ArrayList(5);
-		
-		addBuildFileAction = new AddBuildFileAction(this);
-		
-		removeProjectAction = new RemoveProjectAction(this);
-		updateProjectActions.add(removeProjectAction);
-		
-		removeAllAction = new RemoveAllAction(this);
-		updateProjectActions.add(removeAllAction);
-		
-		runTargetAction = new RunTargetAction(this);
-		updateProjectActions.add(runTargetAction);
-		
-		searchForBuildFilesAction = new SearchForBuildFilesAction(this);
-		
-		refreshBuildFilesAction = new RefreshBuildFilesAction(this);
-		updateProjectActions.add(refreshBuildFilesAction); 
-		
-		openWithMenu= new AntOpenWithMenu(this.getViewSite().getPage());
-		
-		editConfigAction= new EditLaunchConfigurationAction(this);
-		updateProjectActions.add(editConfigAction);
-	}
-
-	/**
-	 * Updates the enabled state of all IUpdate actions associated 
-	 * with the project viewer.
-	 */
-	private void updateProjectActions() {
-		Iterator iter = updateProjectActions.iterator();
-		while (iter.hasNext()) {
-			((IUpdate) iter.next()).update();
-		}
-	}
-
-	/**
-	 * Create the viewer which displays the ant projects
-	 */
-	private void createProjectViewer(Composite parent) {
-		projectViewer = new TreeViewer(parent, SWT.H_SCROLL | SWT.V_SCROLL | SWT.MULTI);
-		projectContentProvider = new AntProjectContentProvider();
-		projectViewer.setContentProvider(projectContentProvider);
-		projectViewer.setLabelProvider(new AntViewLabelProvider());
-		projectViewer.setInput(restoredRoot);
-		projectViewer.setSorter(new ViewerSorter() {
-			/**
-			 * @see org.eclipse.jface.viewers.ViewerSorter#compare(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)
-			 */
-			public int compare(Viewer viewer, Object e1, Object e2) {
-				return e1.toString().compareToIgnoreCase(e2.toString());
-			}
-		});
-		
-		projectViewer.addSelectionChangedListener(new ISelectionChangedListener() {
-			public void selectionChanged(SelectionChangedEvent event) {
-				handleSelectionChanged(event);
-			}
-		});
-		
-		projectViewer.addDoubleClickListener(new IDoubleClickListener() {
-			public void doubleClick(DoubleClickEvent event) {
-				handleProjectViewerDoubleClick(event);
-			}
-		});
-		
-		projectViewer.getControl().addKeyListener(new KeyAdapter() {
-			public void keyPressed(KeyEvent event) {
-				handleProjectViewerKeyPress(event);
-			}
-		});
-		
-		createContextMenu(projectViewer);
-	}
-	
-	private void handleProjectViewerKeyPress(KeyEvent event) {
-		if (event.character == SWT.DEL && event.stateMask == 0) {
-			if (removeProjectAction.isEnabled()) {
-				removeProjectAction.run();
-			}
-		} else if (event.keyCode == SWT.F5 && event.stateMask == 0) {
-			if (refreshBuildFilesAction.isEnabled()) {
-				refreshBuildFilesAction.run();
-			}
-		}
-	}
-	
-	private void handleProjectViewerDoubleClick(DoubleClickEvent event) {
-		ISelection s= event.getSelection();
-		if (!(s instanceof IStructuredSelection)) {
-			return;
-		}
-		Object selection= ((IStructuredSelection)s).getFirstElement();
-		if (selection instanceof ProjectNode) {
-			ProjectNode project = (ProjectNode) selection;
-			IEditorRegistry registry= PlatformUI.getWorkbench().getEditorRegistry();
-			IFile file= AntUtil.getFile(project.getBuildFileName());
-			IEditorDescriptor editor = registry.getDefaultEditor(file);
-			if (editor == null) {
-				editor= registry.getDefaultEditor();
-			}
-			try {
-				if (editor == null) {
-					getViewSite().getPage().openSystemEditor(file);
-				} else {
-					getViewSite().getPage().openEditor(file, editor.getId());
-				}
-			} catch (PartInitException e) {
-				AntUIPlugin.log(e);
-			}
-		} else if (selection instanceof TargetNode){
-			runTargetAction.run();
-		}
-	}
-	
-	/**
-	 * Updates the actions and status line for selection change in one of the
-	 * viewers.
-	 */
-	private void handleSelectionChanged(SelectionChangedEvent event) {
-		updateProjectActions();
-		Iterator selectionIter = ((IStructuredSelection) event.getSelection()).iterator();
-		Object selection = null;
-		if (selectionIter.hasNext()) {
-			selection = selectionIter.next();
-		}
-		String messageString= null;
-		if (!selectionIter.hasNext()) { 
-			messageString= getStatusLineText(selection);
-		} 
-		getViewSite().getActionBars().getStatusLineManager().setMessage(messageString);
-	}
-	
-	/**
-	 * Returns text appropriate for display in the workbench status line for the
-	 * given node.
-	 */
-	private static String getStatusLineText(Object node) {
-		if (node instanceof ProjectNode) {
-			ProjectNode project = (ProjectNode) node;
-			StringBuffer message= new StringBuffer(project.getBuildFileName());
-			String description= project.getDescription();
-			if (description != null) {
-				message.append(": "); //$NON-NLS-1$
-				message.append(description);
-			}
-			return message.toString();
-		} else if (node instanceof TargetNode) {
-			TargetNode target = (TargetNode) node;
-			StringBuffer message= new StringBuffer(AntViewMessages.getString("AntView.Name___1")); //$NON-NLS-1$
-			message.append(target.getName());
-			message.append('\"');
-			String[] depends= target.getDependencies();
-			if (depends.length > 0 ) {
-				message.append(AntViewMessages.getString("AntView._Depends___2")); //$NON-NLS-1$
-				message.append(depends[0]); // Unroll the loop to avoid trailing comma
-				for (int i = 1; i < depends.length; i++) {
-					message.append(',').append(depends[i]);
-				}
-				message.append('\"');
-			}
-			String description= target.getDescription();
-			if (description != null && description.length() != 0) {
-				message.append(AntViewMessages.getString("AntView._Description___4")); //$NON-NLS-1$
-				message.append(description);
-				message.append('\"');
-			}
-			return message.toString();
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the tree viewer that displays the projects in this view
-	 * 
-	 * @return TreeViewer this view's project viewer
-	 */
-	public TreeViewer getProjectViewer() {
-		return projectViewer;
-	}
-
-	/**
-	 * Returns the <code>ProjectNode</code>s currently displayed in this view.
-	 * 
-	 * @return ProjectNode[] the <code>ProjectNode</code>s currently displayed
-	 * in this view
-	 */
-	public ProjectNode[] getProjects() {
-		return projectContentProvider.getRootNode().getProjects();
-	}
-
-	/**
-	 * Adds the given project project to the view
-	 * 
-	 * @param project the project to add
-	 */
-	public void addProject(ProjectNode project) {
-		projectContentProvider.addProject(project);
-		projectViewer.refresh();
-		ResourcesPlugin.getWorkspace().addResourceChangeListener(this);
-		updateProjectActions();
-	}
-
-	/**
-	 * Removes the given project from the view
-	 * 
-	 * @param project the project to remove
-	 */
-	private void removeProject(ProjectNode project) {
-		removeProjectFromContentProviders(project);
-		projectViewer.refresh();
-		if (getProjects().length == 0) {		
-			ResourcesPlugin.getWorkspace().removeResourceChangeListener(this);
-		}
-	}
-
-	/**
-	 * Removes the given list of <code>ProjectNode</code> objects from the view.
-	 * This method should be called whenever multiple projects are to be removed
-	 * because this method optimizes the viewer refresh associated with removing
-	 * multiple items.
-	 * 
-	 * @param projectNodes the list of <code>ProjectNode</code> objects to
-	 * remove
-	 */
-	public void removeProjects(List projectNodes) {
-		Iterator iter = projectNodes.iterator();
-		while (iter.hasNext()) {
-			ProjectNode project = (ProjectNode) iter.next();
-			removeProjectFromContentProviders(project);
-		}
-		projectViewer.refresh();
-	}
-
-	/**
-	 * Removes the given project node from the project content provider. Also
-	 * removes any targets from the given project from the target content
-	 * provider.
-	 * 
-	 * @param project the project to remove
-	 */
-	private void removeProjectFromContentProviders(ProjectNode project) {
-		projectContentProvider.getRootNode().removeProject(project);
-		if (!projectContentProvider.getRootNode().hasProjects()) {
-			ResourcesPlugin.getWorkspace().removeResourceChangeListener(this);
-		}
-	}
-
-	/**
-	 * Removes all projects from the view
-	 */
-	public void removeAllProjects() {
-		// Remove all projects
-		projectContentProvider.getRootNode().removeAllProjects();
-		// Refresh the viewer
-		projectViewer.refresh();
-		ResourcesPlugin.getWorkspace().removeResourceChangeListener(this);
-		updateProjectActions();
-	}
-
-	/**
-	 * @see org.eclipse.ui.IWorkbenchPart#setFocus()
-	 */
-	public void setFocus() {
-		if (getProjectViewer() != null) {
-			getProjectViewer().getControl().setFocus();
-		}
-	}
-
-	/**
-	 * Restore the projects and selected targets
-	 * 
-	 * @see org.eclipse.ui.IViewPart#init(IViewSite, IMemento)
-	 */
-	public void init(IViewSite site, IMemento memento) throws PartInitException {
-		init(site);
-		restoreRoot(memento);
-	}
-
-	/**
-	 * Initialize the root node by restoring the persisted projects
-	 * 
-	 * @param  memento the memento containing the persisted projects
-	 */
-	private void restoreRoot(IMemento memento) {
-		if (memento == null) {
-			restoredRoot = new RootNode();
-			return;
-		}
-		IMemento[] projects = memento.getChildren(TAG_PROJECT);
-		if (projects.length < 1) {
-			restoredRoot = new RootNode();
-			return;
-		}
-		List projectNodes = new ArrayList(projects.length);
-		for (int i = 0; i < projects.length; i++) {
-			IMemento projectMemento = projects[i];
-			String pathString = projectMemento.getString(KEY_PATH);
-			if (!ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(pathString)).exists()) {
-				// If the file no longer exists, don't add it.
-				continue;
-			}
-			String nameString = projectMemento.getString(KEY_NAME);
-			String defaultTarget= projectMemento.getString(KEY_DEFAULT);
-			String errorString = projectMemento.getString(KEY_ERROR);
-
-			ProjectNode project = null;
-			if (nameString == null) {
-				nameString = ""; //$NON-NLS-1$
-			}
-			project = new ProjectNode(nameString, pathString);
-			if (errorString != null && errorString.equals(VALUE_TRUE)) {
-				project.setIsErrorNode(true);
-			}
-			if (defaultTarget != null) {
-				project.setDefaultTargetName(defaultTarget);
-			}
-			projectNodes.add(project);
-		}
-		restoredRoot = new RootNode((ProjectNode[]) projectNodes.toArray(new ProjectNode[projectNodes.size()]));
-	}
-
-	/**
-	 * Save the contents of the project viewer and the target viewer
-	 * 
-	 * @see org.eclipse.ui.IViewPart#saveState(IMemento)
-	 */
-	public void saveState(IMemento memento) {
-		// Save the projects
-		ProjectNode[] projects = projectContentProvider.getRootNode().getProjects();
-		ProjectNode project;
-		IMemento projectMemento;
-		for (int i = 0; i < projects.length; i++) {
-			project = projects[i];
-			projectMemento = memento.createChild(TAG_PROJECT);
-			projectMemento.putString(KEY_PATH, project.getBuildFileName());
-			projectMemento.putString(KEY_NAME, project.getName());
-			String defaultTarget= project.getDefaultTargetName();
-			if (project.isErrorNode()) {
-				projectMemento.putString(KEY_ERROR, VALUE_TRUE);
-			} else {
-				if (defaultTarget != null) {
-					projectMemento.putString(KEY_DEFAULT, defaultTarget);
-				}
-				projectMemento.putString(KEY_ERROR, VALUE_FALSE);
-			}
-		}
-	}
-
-	/**
-	 * @see org.eclipse.ui.IWorkbenchPart#dispose()
-	 */
-	public void dispose() {
-		super.dispose();
-		if (openWithMenu != null) {
-			openWithMenu.dispose();
-		}
-		ResourcesPlugin.getWorkspace().removeResourceChangeListener(this);
-	}
-
-	public void resourceChanged(IResourceChangeEvent event) {
-		IResourceDelta delta = event.getDelta();
-		if (delta != null) {
-			ProjectNode projects[]= projectContentProvider.getRootNode().getProjects();
-			IPath buildFilePath;
-			for (int i = 0; i < projects.length; i++) {
-				buildFilePath= new Path(projects[i].getBuildFileName());
-				IResourceDelta change= delta.findMember(buildFilePath);
-				if (change != null) {
-					handleChangeDelta(change, projects[i]);
-				}
-			}
-		}
-	}
-	
-	/**
-	 * Update the view for the given resource delta. The delta is a resource
-	 * delta for the given build file in the view
-	 * 
-	 * @param delta a delta for a build file in the view
-	 * @param project the project node that has changed
-	 */
-	private void handleChangeDelta(IResourceDelta delta, final ProjectNode project) {
-		IResource resource= delta.getResource();
-		if (resource.getType() != IResource.FILE) {
-			return;
-		}
-		if (delta.getKind() == IResourceDelta.REMOVED) {
-			Display.getDefault().asyncExec(new Runnable() {
-				public void run() {
-					removeProject(project);
-				}
-			});
-		} else if (delta.getKind() == IResourceDelta.CHANGED && (delta.getFlags() & IResourceDelta.CONTENT) != 0) {
-			handleBuildFileChanged(project);
-		}
-	}
-	
-	private void fillMainToolBar() {
-		IToolBarManager toolBarMgr= getViewSite().getActionBars().getToolBarManager();
-		toolBarMgr.removeAll();
-		
-		toolBarMgr.add(addBuildFileAction);
-		toolBarMgr.add(searchForBuildFilesAction);
-
-		toolBarMgr.add(runTargetAction);
-		toolBarMgr.add(removeProjectAction);
-		toolBarMgr.add(removeAllAction);
-		
-		toolBarMgr.update(false);	
-	}
-	
-	private IFile getSelectionBuildFile() {
-		IStructuredSelection selection= (IStructuredSelection)getProjectViewer().getSelection();
-		if (selection.size() == 1) {
-			Object element= selection.getFirstElement(); 
-			ProjectNode projectNode= null;
-			if (element instanceof ProjectNode) {
-				projectNode= (ProjectNode)element;
-			} else if (element instanceof TargetNode) {
-				projectNode= ((TargetNode)element).getProject();
-			}
-			if (projectNode != null) {
-				return AntUtil.getFile(projectNode.getBuildFileName());
-			}
-		}
-		return null;		
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.part.IShowInSource#getShowInContext()
-	 */
-	public ShowInContext getShowInContext() {
-		IFile buildFile= getSelectionBuildFile();
-		if (buildFile != null && buildFile.exists()) {
-			ISelection selection= new StructuredSelection(buildFile);
-			return new ShowInContext(null, selection);
-		}
-		return null;
-	}
-}
\ No newline at end of file
diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/views/AntViewLabelProvider.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/views/AntViewLabelProvider.java
deleted file mode 100644
index 6a5096e..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/views/AntViewLabelProvider.java
+++ /dev/null
@@ -1,134 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.ui.internal.views;
-
-import org.eclipse.ant.ui.internal.model.AntImageDescriptor;
-import org.eclipse.ant.ui.internal.model.AntUIImages;
-import org.eclipse.ant.ui.internal.model.IAntUIConstants;
-import org.eclipse.ant.ui.internal.views.elements.ProjectNode;
-import org.eclipse.ant.ui.internal.views.elements.TargetNode;
-import org.eclipse.jface.resource.CompositeImageDescriptor;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.IColorProvider;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-
-/**
- * A label provider that provides labels for elements displayed in the
- * <code>AntView</code>
- */
-public class AntViewLabelProvider implements ILabelProvider, IColorProvider {
-
-	/**
-	 * @see org.eclipse.jface.viewers.ILabelProvider#getImage(java.lang.Object)
-	 */
-	public Image getImage(Object element) {
-		if (element instanceof ProjectNode) {
-			ProjectNode project= (ProjectNode) element;
-			int flags = 0;
-			if (project.isErrorNode()) {
-				flags = flags | AntImageDescriptor.HAS_ERRORS;
-			}
-			CompositeImageDescriptor descriptor = new AntImageDescriptor(AntUIImages.getImageDescriptor(IAntUIConstants.IMG_ANT_PROJECT), flags);
-			return AntUIImages.getImage(descriptor);
-		} else if (element instanceof TargetNode) {
-			TargetNode target= (TargetNode) element;
-			int flags = 0;
-			ImageDescriptor base = null;
-			if (target.equals(target.getProject().getDefaultTarget())){
-				flags = flags | AntImageDescriptor.DEFAULT_TARGET;
-				base = AntUIImages.getImageDescriptor(IAntUIConstants.IMG_ANT_DEFAULT_TARGET);
-			} else if (target.getDescription() == null) {
-				base = AntUIImages.getImageDescriptor(IAntUIConstants.IMG_ANT_TARGET_PRIVATE);
-			} else {
-				base = AntUIImages.getImageDescriptor(IAntUIConstants.IMG_ANT_TARGET);
-			}			
-			if (target.isErrorNode()) {
-				flags = flags | AntImageDescriptor.HAS_ERRORS;
-			}
-			return AntUIImages.getImage(new AntImageDescriptor(base, flags));
-		}
-		return null;
-	}
-
-	/**
-	 * @see org.eclipse.jface.viewers.ILabelProvider#getText(java.lang.Object)
-	 */
-	public String getText(Object element) {
-		if (element instanceof TargetNode) {
-			TargetNode node= (TargetNode)element;
-			StringBuffer name= new StringBuffer(node.getName());
-			if (node.getName().equals(node.getProject().getDefaultTargetName())) {
-				name.append(AntViewMessages.getString("TargetNode.default")); //$NON-NLS-1$
-			} 
-			return name.toString();
-		} else if (element instanceof ProjectNode) {
-			ProjectNode project= (ProjectNode) element;
-			StringBuffer buffer= new StringBuffer(project.getName());
-			String defaultTarget= project.getDefaultTargetName();
-			if (defaultTarget != null) {
-				buffer.append(" [").append(defaultTarget).append(']'); //$NON-NLS-1$
-			}
-			return buffer.toString();
-		} else {
-			return element.toString();
-		}
-	}
-
-	/**
-	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#addListener(org.eclipse.jface.viewers.ILabelProviderListener)
-	 */
-	public void addListener(ILabelProviderListener listener) {
-	}
-
-	/**
-	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#dispose()
-	 */
-	public void dispose() {
-	}
-
-	/**
-	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#isLabelProperty(java.lang.Object, java.lang.String)
-	 */
-	public boolean isLabelProperty(Object element, String property) {
-		return false;
-	}
-
-	/**
-	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#removeListener(org.eclipse.jface.viewers.ILabelProviderListener)
-	 */
-	public void removeListener(ILabelProviderListener listener) {
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.IColorProvider#getForeground(java.lang.Object)
-	 */
-	public Color getForeground(Object element) {
-		if (element instanceof TargetNode) {
-			TargetNode target= (TargetNode)element;
-			if (target == target.getProject().getDefaultTarget()) {
-				return Display.getDefault().getSystemColor(SWT.COLOR_BLUE);
-			}
-		}
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.IColorProvider#getBackground(java.lang.Object)
-	 */
-	public Color getBackground(Object element) {
-		return null;
-	}
-}
diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/views/AntViewMessages.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/views/AntViewMessages.java
deleted file mode 100644
index c720994..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/views/AntViewMessages.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.ui.internal.views;
-
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-public class AntViewMessages {
-
-	private static final String BUNDLE_NAME = "org.eclipse.ant.ui.internal.views.AntViewMessages"; //$NON-NLS-1$
-
-	private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME);
-
-	private AntViewMessages() {
-	}
-
-	public static String getString(String key) {
-		try {
-			return RESOURCE_BUNDLE.getString(key);
-		} catch (MissingResourceException e) {
-			return '!' + key + '!';
-		}
-	}
-}
diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/views/AntViewMessages.properties b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/views/AntViewMessages.properties
deleted file mode 100644
index cbead01..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/views/AntViewMessages.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2003 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Common Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/cpl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-AntView.Open_With_3=Open With
-AntView.Name___1=name="
-AntView._Depends___2=\ depends="
-AntView._Description___4=\ description="
-
-TargetNode.default=\ [default]
\ No newline at end of file
diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/views/actions/AddBuildFileAction.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/views/actions/AddBuildFileAction.java
deleted file mode 100644
index 4178ead..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/views/actions/AddBuildFileAction.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.ui.internal.views.actions;
-
-import org.eclipse.ant.ui.internal.model.AntUIImages;
-import org.eclipse.ant.ui.internal.model.IAntUIConstants;
-import org.eclipse.ant.ui.internal.views.AntView;
-import org.eclipse.ant.ui.internal.views.elements.ProjectNode;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.jface.action.Action;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.externaltools.internal.model.IExternalToolsHelpContextIds;
-import org.eclipse.ui.externaltools.internal.ui.FileSelectionDialog;
-import org.eclipse.ui.help.WorkbenchHelp;
-
-/**
- * Action that prompts the user for a build file and adds the selected file to
- * an <code>AntView</code>
- */
-public class AddBuildFileAction extends Action {
-
-	private AntView view;
-
-	public AddBuildFileAction(AntView view) {
-		super(AntViewActionMessages.getString("AddBuildFileAction.Add_Build_File_1"), AntUIImages.getImageDescriptor(IAntUIConstants.IMG_ADD)); //$NON-NLS-1$
-		this.view= view;
-		setToolTipText(AntViewActionMessages.getString("AddBuildFileAction.Add_Build_File_1")); //$NON-NLS-1$
-		WorkbenchHelp.setHelp(this, IExternalToolsHelpContextIds.ADD_BUILDFILE_ACTION);
-	}
-
-	/**
-	 * @see org.eclipse.jface.action.IAction#run()
-	 */
-	public void run() {
-		FileSelectionDialog dialog = new FileSelectionDialog(Display.getCurrent().getActiveShell(), ResourcesPlugin.getWorkspace().getRoot(), AntViewActionMessages.getString("AddBuildFileAction.&Select")); //$NON-NLS-1$
-		dialog.setFileFilter("*.xml", true); //$NON-NLS-1$
-		dialog.open();
-		IFile file= dialog.getResult();
-		if (file == null) {
-			return;
-		}
-		String buildFileName= file.getFullPath().toString();
-		ProjectNode[] existingProjects= view.getProjects();
-		for (int j = 0; j < existingProjects.length; j++) {
-			ProjectNode existingProject = existingProjects[j];
-			if (existingProject.getBuildFileName().equals(buildFileName)) {
-				// Don't parse projects that have already been added.
-				return;
-			}
-		}
-		ProjectNode project= new ProjectNode(buildFileName);
-		view.addProject(project);
-	}
-
-}
diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/views/actions/AntOpenWithMenu.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/views/actions/AntOpenWithMenu.java
deleted file mode 100644
index 622327f..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/views/actions/AntOpenWithMenu.java
+++ /dev/null
@@ -1,299 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.ui.internal.views.actions;
-
-
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Comparator;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.ant.ui.internal.model.AntUIPlugin;
-import org.eclipse.ant.ui.internal.model.IAntUIConstants;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.jface.action.ContributionItem;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.program.Program;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Menu;
-import org.eclipse.swt.widgets.MenuItem;
-import org.eclipse.ui.IEditorDescriptor;
-import org.eclipse.ui.IEditorRegistry;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * 
- * Code mostly a copy of the OpenWithMenu which cannot be effectively subclassed
- */
-public class AntOpenWithMenu extends ContributionItem {
-
-	private IWorkbenchPage page;
-	private IAdaptable file;
-	private IEditorRegistry registry = PlatformUI.getWorkbench().getEditorRegistry();
-	private static final String SYSTEM_EDITOR_ID= PlatformUI.PLUGIN_ID + ".SystemEditor"; //$NON-NLS-1$
-
-	private static Map imageCache = new Hashtable(11);
-
-	/**
-	 * The id of this action.
-	 */
-	public static final String ID = IAntUIConstants.PLUGIN_ID + ".AntOpenWithMenu"; //$NON-NLS-1$
-
-	public AntOpenWithMenu(IWorkbenchPage page) {
-		super(ID);
-		this.page= page;
-	}
-	
-	public void setFile(IAdaptable file) {
-		this.file= file;
-	}
-	
-	public void dispose() {
-		super.dispose();
-		Iterator iter= imageCache.values().iterator();
-		while (iter.hasNext()) {
-			Image image = (Image) iter.next();
-			image.dispose();
-		}		
-		imageCache.clear();
-	}
-
-	/**
-	 * Returns an image to show for the corresponding editor descriptor.
-	 *
-	 * @param editorDesc the editor descriptor, or null for the system editor
-	 * @return the image or null
-	 */
-	private Image getImage(IEditorDescriptor editorDesc) {
-		ImageDescriptor imageDesc = getImageDescriptor(editorDesc);
-		if (imageDesc == null) {
-			return null;
-		}
-		Image image = (Image) imageCache.get(imageDesc);
-		if (image == null) {
-			image = imageDesc.createImage();
-			imageCache.put(imageDesc, image);
-		}
-		return image;
-	}
-
-	/**
-	 * Returns the image descriptor for the given editor descriptor,
-	 * or null if it has no image.
-	 */
-	private ImageDescriptor getImageDescriptor(IEditorDescriptor editorDesc) {
-		ImageDescriptor imageDesc = null;
-		if (editorDesc == null) {
-			imageDesc = registry.getImageDescriptor(getFileResource());
-		} else {
-			imageDesc = editorDesc.getImageDescriptor();
-		}
-		if (imageDesc == null) {
-			if (editorDesc.getId().equals(SYSTEM_EDITOR_ID)) {
-				imageDesc = getSystemEditorImageDescriptor(getFileResource().getFileExtension());
-			}
-		}
-		return imageDesc;
-	}
-
-	/**
-	 * Return the image descriptor of the system editor
-	 * that is registered with the OS to edit files of
-	 * this type. Null if none can be found.
-	 */
-	private ImageDescriptor getSystemEditorImageDescriptor(String extension) {
-		Program externalProgram = null;
-		if (extension != null) {
-			externalProgram = Program.findProgram(extension);
-		}
-		if (externalProgram == null) {
-			return null;
-		} else {
-			return new EditorImageDescriptor(externalProgram);
-		}
-	}
-	/**
-	 * Creates the menu item for the editor descriptor.
-	 *
-	 * @param menu the menu to add the item to
-	 * @param descriptor the editor descriptor, or null for the system editor
-	 * @param preferredEditor the descriptor of the preferred editor, or <code>null</code>
-	 */
-	private void createMenuItem(Menu menu, final IEditorDescriptor descriptor, final IEditorDescriptor preferredEditor) {
-		// XXX: Would be better to use bold here, but SWT does not support it.
-		final MenuItem menuItem = new MenuItem(menu, SWT.RADIO);
-		boolean isPreferred = preferredEditor != null && descriptor.getId().equals(preferredEditor.getId());
-		menuItem.setSelection(isPreferred);
-		menuItem.setText(descriptor.getLabel());
-		Image image = getImage(descriptor);
-		if (image != null) {
-			menuItem.setImage(image);
-		}
-		Listener listener = new Listener() {
-			public void handleEvent(Event event) {
-				switch (event.type) {
-					case SWT.Selection :
-						if (menuItem.getSelection()) {
-							openEditor(descriptor);
-						}
-						break;
-				}
-			}
-		};
-		menuItem.addListener(SWT.Selection, listener);
-	}
-	/* (non-Javadoc)
-	 * Fills the menu with perspective items.
-	 */
-	public void fill(Menu menu, int index) {
-		IFile fileResource = getFileResource();
-		if (fileResource == null) {
-			return;
-		}
-
-		IEditorDescriptor defaultEditor = registry.getDefaultEditor(); // should not be null
-		IEditorDescriptor preferredEditor = registry.getDefaultEditor(fileResource); // may be null
-		
-		Object[] editors= registry.getEditors(fileResource);
-		Arrays.sort(editors, new Comparator() {
-			/**
-			 * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object)
-			 */
-			public int compare(Object o1, Object o2) {
-				String s1 = ((IEditorDescriptor) o1).getLabel();
-				String s2 = ((IEditorDescriptor) o2).getLabel();
-				//Return true if elementTwo is 'greater than' elementOne
-				return s1.compareToIgnoreCase(s2);
-			}
-		});
-		IEditorDescriptor antEditor= registry.findEditor("org.eclipse.ant.ui.internal.editor.AntEditor"); //$NON-NLS-1$
-		
-		boolean defaultFound = false;
-		boolean antFound= false;
-		List alreadyAddedEditors= new ArrayList(editors.length);
-		for (int i = 0; i < editors.length; i++) {
-			IEditorDescriptor editor = (IEditorDescriptor) editors[i];
-			if (alreadyAddedEditors.contains(editor.getId())) {
-				continue;
-			}
-			createMenuItem(menu, editor, preferredEditor);
-			if (defaultEditor != null && editor.getId().equals(defaultEditor.getId())) {
-				defaultFound = true;
-			}
-			if (antEditor != null && editor.getId().equals(antEditor.getId())) {
-				antFound= true;
-			}
-			alreadyAddedEditors.add(editor.getId());
-			
-		}
-
-		// Only add a separator if there is something to separate
-		if (editors.length > 0) {
-			new MenuItem(menu, SWT.SEPARATOR);
-		}
-
-		// Add ant editor.
-		 if (!antFound && antEditor != null) {
-			 createMenuItem(menu, antEditor, preferredEditor);
-		 }
-			 
-		// Add default editor.
-		if (!defaultFound && defaultEditor != null) {
-			createMenuItem(menu, defaultEditor, preferredEditor);
-		}
-
-		// Add system editor.
-		IEditorDescriptor descriptor = registry.findEditor(SYSTEM_EDITOR_ID);
-		createMenuItem(menu, descriptor, preferredEditor);
-		createDefaultMenuItem(menu, fileResource);
-	}
-
-	/**
-	 * Converts the IAdaptable file to IFile or null.
-	 */
-	private IFile getFileResource() {
-		if (this.file instanceof IFile) {
-			return (IFile) this.file;
-		} else {
-			IResource resource = (IResource) this.file.getAdapter(IResource.class);
-			if (resource instanceof IFile) {
-				return (IFile) resource;
-			}
-		}
-		return null;
-	}
-	/* (non-Javadoc)
-	 * Returns whether this menu is dynamic.
-	 */
-	public boolean isDynamic() {
-		return true;
-	}
-	/**
-	 * Opens the given editor on the selected file.
-	 *
-	 * @param editor the editor descriptor, or null for the system editor
-	 */
-	private void openEditor(IEditorDescriptor editor) {
-		IFile fileResource = getFileResource();
-		try {
-			if (editor == null) {
-				page.openSystemEditor(fileResource);
-			} else {
-				page.openEditor(fileResource, editor.getId());
-			}
-		} catch (PartInitException e) {
-			AntUIPlugin.log(MessageFormat.format(AntViewActionMessages.getString("AntViewOpenWithMenu.Editor_failed"), new String[]{fileResource.getLocation().toOSString()}), e); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * Creates the menu item for the default editor
-	 *
-	 * @param menu the menu to add the item to
-	 * @param file the file being edited
-	 * @param registry the editor registry
-	 */
-	private void createDefaultMenuItem(Menu menu, final IFile fileResource) {
-		final MenuItem menuItem = new MenuItem(menu, SWT.RADIO);
-		menuItem.setSelection(registry.getDefaultEditor(fileResource) == null);
-		menuItem.setText(AntViewActionMessages.getString("AntViewOpenWithMenu.Default_Editor_4")); //$NON-NLS-1$
-
-		Listener listener = new Listener() {
-			public void handleEvent(Event event) {
-				switch (event.type) {
-					case SWT.Selection :
-						if (menuItem.getSelection()) {
-							registry.setDefaultEditor(fileResource, null);
-							try {
-								page.openEditor(fileResource);
-							} catch (PartInitException e) {
-								AntUIPlugin.log(MessageFormat.format(AntViewActionMessages.getString("AntViewOpenWithMenu.Editor_failed"), new String[]{fileResource.getLocation().toOSString()}), e); //$NON-NLS-1$
-							}
-						}
-						break;
-				}
-			}
-		};
-
-		menuItem.addListener(SWT.Selection, listener);
-	}
-}
diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/views/actions/AntViewActionMessages.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/views/actions/AntViewActionMessages.java
deleted file mode 100644
index 592e875..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/views/actions/AntViewActionMessages.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.ui.internal.views.actions;
-
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-public class AntViewActionMessages {
-
-	private static final String BUNDLE_NAME = "org.eclipse.ant.ui.internal.views.actions.AntViewActionMessages"; //$NON-NLS-1$
-
-	private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME);
-
-	private AntViewActionMessages() {
-	}
-
-	public static String getString(String key) {
-		try {
-			return RESOURCE_BUNDLE.getString(key);
-		} catch (MissingResourceException e) {
-			return '!' + key + '!';
-		}
-	}
-}
diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/views/actions/AntViewActionMessages.properties b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/views/actions/AntViewActionMessages.properties
deleted file mode 100644
index 18d0dee..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/views/actions/AntViewActionMessages.properties
+++ /dev/null
@@ -1,40 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2003 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Common Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/cpl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-SearchForBuildFilesDialog.Search_for_Build_Files_1=Search for Buildfiles
-SearchForBuildFilesDialog.&Input=&Input a buildfile name (* = any string, ? = any character):
-SearchForBuildFilesDialog.Build_name_cannot_be_empty_3=Build name cannot be empty
-SearchForBuildFilesDialog.&Search_4=&Search
-SearchForBuildFilesDialog.Scope_5=Scope
-SearchForBuildFilesDialog.&Workspace_6=&Workspace
-SearchForBuildFilesDialog.Wor&king_Set__7=Wor&king Set:
-SearchForBuildFilesDialog.&Choose..._8=&Choose...
-SearchForBuildFilesDialog.Include_errors=Include &buildfiles that contain errors
-SearchForBuildFilesDialog.Must_select_a_working_set_10=Must select a working set
-SearchForBuildFilesDialog.No_searchable=No searchable resources found in the selected working set
-AntViewOpenWithMenu.Editor_failed=Editor failed to open for {0}
-AntViewOpenWithMenu.Default_Editor_4=Default Editor
-AddBuildFileAction.Add_Build_File_1=Add Buildfile
-AddBuildFileAction.&Select=&Select a buildfile:
-RemoveAllAction.Remove_All=Remove All Buildfiles
-RemoveProjectAction.Remove=Remove Buildfile
-RemoveProjectAction.Remove_2=Remove Selected Buildfile
-RunTargetAction.Run_1=Run
-RunTargetAction.Run_Default=Run the Default Target of the Selected Buildfile
-SearchForBuildFilesAction.Search_1=Search
-SearchForBuildFilesAction.Add_build_files_with_search_2=Add Buildfiles with Search
-SearchForBuildFilesAction.Processing_search_results_3=Processing search results
-SearchForBuildFilesAction.Adding_{0}_4=Adding {0}
-EditLaunchConfigurationAction.Properties=&Properties...
-EditLaunchConfigurationAction.Edit=Edit the launch configuration properties for selected buildfile
-RefreshBuildFilesAction.Refresh_Buildfiles_1=Refresh Buildfiles
-RefreshBuildFilesAction.Refreshing_buildfiles_3=Refreshing buildfiles
-RefreshBuildFilesAction.Refreshing_{0}_4=Refreshing {0}
diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/views/actions/EditLaunchConfigurationAction.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/views/actions/EditLaunchConfigurationAction.java
deleted file mode 100644
index f434805..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/views/actions/EditLaunchConfigurationAction.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.ui.internal.views.actions;
-
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.ant.ui.internal.launchConfigurations.AntLaunchShortcut;
-import org.eclipse.ant.ui.internal.model.AntUtil;
-import org.eclipse.ant.ui.internal.views.AntView;
-import org.eclipse.ant.ui.internal.views.elements.AntNode;
-import org.eclipse.ant.ui.internal.views.elements.ProjectNode;
-import org.eclipse.ant.ui.internal.views.elements.TargetNode;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.ui.DebugUITools;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ui.externaltools.internal.model.IExternalToolConstants;
-import org.eclipse.ui.externaltools.internal.model.IExternalToolsHelpContextIds;
-import org.eclipse.ui.help.WorkbenchHelp;
-import org.eclipse.ui.texteditor.IUpdate;
-
-/**
- * Action for activating a target node selected in the ant view
- */
-public class EditLaunchConfigurationAction extends Action implements IUpdate {
-	
-	private AntView view;
-	private ProjectNode projectNode;
-	
-	public EditLaunchConfigurationAction(AntView view) {
-		super(AntViewActionMessages.getString("EditLaunchConfigurationAction.Properties")); //$NON-NLS-1$
-		setDescription(AntViewActionMessages.getString("EditLaunchConfigurationAction.Edit")); //$NON-NLS-1$
-		this.view= view;
-		WorkbenchHelp.setHelp(this, IExternalToolsHelpContextIds.EDIT_LAUNCH_CONFIGURATION_ACTION);
-	}
-	
-	public void run() {
-		IFile file= AntUtil.getFile(projectNode.getBuildFileName());
-		ILaunchConfiguration configuration= null;
-		List configurations = AntLaunchShortcut.findExistingLaunchConfigurations(file);
-		if (configurations.isEmpty()) {
-			configuration = AntLaunchShortcut.createDefaultLaunchConfiguration(file);
-		} else {
-			if (configurations.size() == 1) {
-				configuration= (ILaunchConfiguration)configurations.get(0);
-			} else {
-				configuration= AntLaunchShortcut.chooseConfig(configurations);
-				if (configuration == null) {
-					// User cancelled selection
-					return;
-				}
-			}
-		}
-		if (configuration != null) {
-			DebugUITools.openLaunchConfigurationPropertiesDialog(view.getSite().getShell(), configuration, IExternalToolConstants.ID_EXTERNAL_TOOLS_BUILDER_LAUNCH_GROUP);
-		}
-	}
-
-	/**
-	 * Updates the enablement of this action based on the user's selection
-	 */
-	public void update() {
-		boolean enabled= false;
-		IStructuredSelection selection= (IStructuredSelection) view.getProjectViewer().getSelection();
-		if (selection.size() == 1) {
-			Object element= selection.getFirstElement();
-			if (element instanceof ProjectNode) {
-				if (!((ProjectNode)element).isErrorNode()) {
-					enabled= true;
-					projectNode= (ProjectNode)element;
-				}
-			} else if (element instanceof TargetNode) {
-				if (!((TargetNode)element).isErrorNode()) {
-					enabled= true;
-					projectNode= getProjectNode((AntNode)element);
-				}
-			} else if (element instanceof AntNode) {
-				projectNode= getProjectNode((AntNode)element);
-				enabled= true;
-			}
-		} else if (!selection.isEmpty()){
-			//all non-error nodes from the same project
-			Iterator iter= selection.iterator();
-			Object data= null;
-			enabled= true;
-			ProjectNode tempProjectNode= null;
-			while (iter.hasNext()) {
-				data= iter.next();
-				if (!(data instanceof AntNode)) {
-					continue;
-				}
-				if (data instanceof TargetNode) {
-					TargetNode targetNode= (TargetNode) data;
-					if(targetNode.isErrorNode()) {
-						enabled= false;
-						break;
-					}
-				}
-				if (data instanceof ProjectNode) {
-					ProjectNode dataProjectNode= (ProjectNode) data;
-					if(dataProjectNode.isErrorNode()) {
-						enabled= false;
-						break;
-					}
-				}
-			
-				tempProjectNode= getProjectNode((AntNode)data);
-				if (projectNode != null) {
-					if (!(projectNode.equals(tempProjectNode))) {
-						enabled= false;
-						break;
-					}
-				} else {
-					projectNode= tempProjectNode;
-				}
-			}
-		}
-		
-		if (!enabled) {
-			projectNode= null;
-		}
-		setEnabled(enabled);
-	}
-
-	/**
-	 * Method getProjectNode.
-	 * @param antNode
-	 * @return ProjectNode
-	 */
-	private ProjectNode getProjectNode(AntNode antNode) {
-		AntNode parentNode= null;
-		if (antNode instanceof ProjectNode) {
-			parentNode= antNode;
-		} else {
-			parentNode= antNode.getParent();
-			while (parentNode != null && !(parentNode instanceof ProjectNode)) {
-				parentNode= parentNode.getParent();
-			}
-		}
-		return (ProjectNode)parentNode;
-	}
-}
diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/views/actions/EditorImageDescriptor.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/views/actions/EditorImageDescriptor.java
deleted file mode 100644
index d9b3d6e..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/views/actions/EditorImageDescriptor.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.ui.internal.views.actions;
-
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.ImageData;
-import org.eclipse.swt.program.Program;
-import org.eclipse.ui.ISharedImages;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * Copy of org.eclipse.ui.internal.misc.ExternalProgramImageDescriptor for
- * use in the AntViewOpenWithMenu
- */
-public class EditorImageDescriptor extends ImageDescriptor {
-
-	public Program program;
-
-	/**
-	 * Creates a new ImageDescriptor. The image is loaded 
-	 * from a file with the given name <code>name</code>.
-	 */
-	public EditorImageDescriptor(Program program) {
-		this.program = program;
-	}
-	/**
-	 * @see Object#equals
-	 */
-	public boolean equals(Object o) {
-		if (!(o instanceof EditorImageDescriptor)) {
-			return false;
-		}
-		EditorImageDescriptor other = (EditorImageDescriptor) o;
-
-		//See if there is a name - compare it if so and compare the programs if not
-		String otherName = other.program.getName();
-		if (otherName == null) {
-			return other.program.equals(program);
-		} else {
-			return otherName.equals(program.getName());
-		}
-	}
-	/**
-	 * Returns an SWT Image that is described by the information
-	 * in this descriptor.  Each call returns a new Image.
-	 */
-	public Image getImage() {
-		return createImage();
-	}
-	
-	/**
-	 * @see org.eclipse.jface.resource.ImageDescriptor#getImageData()
-	 */
-	public ImageData getImageData() {
-		
-		ImageData defaultImage = PlatformUI.getWorkbench().getSharedImages().getImageDescriptor(ISharedImages.IMG_OBJ_FILE).getImageData();
-		if (defaultImage == null) {
-			return null;
-		}
-		ImageData data = null;
-		if (program == null || ((data = program.getImageData()) == null)) {
-			return defaultImage;
-		}
-
-		//The images in GNOME are too big. Scaling them does not give nice result so return defaultImage;
-		if (data.height > defaultImage.height || data.width > defaultImage.width) {
-			return defaultImage;
-		}
-
-		return data;
-	}
-	/**
-	 * @see Object#hashCode
-	 */
-	public int hashCode() {
-		String programName = program.getName();
-		if (programName == null) {
-			return program.hashCode();
-		} else {
-			return programName.hashCode();
-		}
-	}
-}
diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/views/actions/RefreshBuildFilesAction.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/views/actions/RefreshBuildFilesAction.java
deleted file mode 100644
index 1605e12..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/views/actions/RefreshBuildFilesAction.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.ui.internal.views.actions;
-
-import java.lang.reflect.InvocationTargetException;
-import java.text.MessageFormat;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Set;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.dialogs.ProgressMonitorDialog;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ant.ui.internal.model.AntUIImages;
-import org.eclipse.ant.ui.internal.model.IAntUIConstants;
-import org.eclipse.ant.ui.internal.views.AntView;
-import org.eclipse.ant.ui.internal.views.elements.ProjectNode;
-import org.eclipse.ant.ui.internal.views.elements.TargetNode;
-import org.eclipse.ui.externaltools.internal.model.IExternalToolsHelpContextIds;
-import org.eclipse.ui.help.WorkbenchHelp;
-import org.eclipse.ui.texteditor.IUpdate;
-
-/**
- * Action which refreshes the selected buildfiles in the Ant view
- */
-public class RefreshBuildFilesAction extends Action implements IUpdate {
-
-	private AntView view;
-
-	/**
-	 * Creates a new <code>RefreshBuildFilesAction</code> which will refresh buildfiles 
-	 * in the given Ant view.
-	 * @param view the Ant view whose selection this action will use when
-	 * determining which buildfiles to refresh.
-	 */
-	public RefreshBuildFilesAction(AntView view) {
-		super(AntViewActionMessages.getString("RefreshBuildFilesAction.Refresh_Buildfiles_1"), AntUIImages.getImageDescriptor(IAntUIConstants.IMG_ACTION_REFRESH)); //$NON-NLS-1$
-		setToolTipText(AntViewActionMessages.getString("RefreshBuildFilesAction.Refresh_Buildfiles_1")); //$NON-NLS-1$
-		this.view = view;
-		WorkbenchHelp.setHelp(this, IExternalToolsHelpContextIds.REFRESH_BUILDFILE_ACTION);
-	}
-
-	/**
-	 * Refreshes the selected buildfiles (or all buildfiles if none selected) in the Ant view
-	 */
-	public void run() {
-		final Set projects= getSelectedProjects();
-		if (projects.isEmpty()) {
-			// If no selection, add all
-			ProjectNode allProjects[]= view.getProjects();
-			for (int i = 0; i < allProjects.length; i++) {
-				projects.add(allProjects[i]);
-			}
-		}
-		final Iterator iter= projects.iterator();
-		if (!iter.hasNext()) {
-			return;
-		}
-		final ProgressMonitorDialog progressDialog= new ProgressMonitorDialog(Display.getDefault().getActiveShell());
-		try {
-			progressDialog.run(true, true, new IRunnableWithProgress() {
-				public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
-					monitor.beginTask(AntViewActionMessages.getString("RefreshBuildFilesAction.Refreshing_buildfiles_3"), projects.size()); //$NON-NLS-1$
-					ProjectNode project;
-					while (iter.hasNext()) {
-						project= (ProjectNode) iter.next();
-						monitor.subTask(MessageFormat.format(AntViewActionMessages.getString("RefreshBuildFilesAction.Refreshing_{0}_4"), new String[] {project.getBuildFileName()})); //$NON-NLS-1$
-						project.parseBuildFile();
-						monitor.worked(1);
-					}
-				}
-			});
-		} catch (InvocationTargetException e) {
-		} catch (InterruptedException e) {
-		}
-		view.getProjectViewer().refresh();
-	}
-
-	/**
-	 * Returns the selected project nodes to refresh
-	 * 
-	 * @return Set the selected <code>ProjectNode</code>s to refresh.
-	 */
-	private Set getSelectedProjects() {
-		IStructuredSelection selection = (IStructuredSelection) view.getProjectViewer().getSelection();
-		HashSet set= new HashSet();
-		Iterator iter = selection.iterator();
-		Object data;
-		while (iter.hasNext()) {
-			data= iter.next();
-			if (data instanceof ProjectNode) {
-				set.add(data);
-			} else if (data instanceof TargetNode) {
-				set.add(((TargetNode) data).getProject());
-			}
-		}
-		return set;
-	}
-
-	/**
-	 * Updates the enablement of this action based on the user's selection
-	 */
-	public void update() {
-		setEnabled(view.getProjects().length > 0);
-	}
-
-}
diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/views/actions/RemoveAllAction.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/views/actions/RemoveAllAction.java
deleted file mode 100644
index aa5034a..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/views/actions/RemoveAllAction.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.ui.internal.views.actions;
-
-
-import org.eclipse.ant.ui.internal.model.AntUIImages;
-import org.eclipse.ant.ui.internal.model.IAntUIConstants;
-import org.eclipse.ant.ui.internal.views.AntView;
-import org.eclipse.jface.action.Action;
-import org.eclipse.ui.externaltools.internal.model.IExternalToolsHelpContextIds;
-import org.eclipse.ui.help.WorkbenchHelp;
-import org.eclipse.ui.texteditor.IUpdate;
-
-public class RemoveAllAction extends Action implements IUpdate {
-	private AntView view;
-	
-	public RemoveAllAction(AntView view) {
-		super(AntViewActionMessages.getString("RemoveAllAction.Remove_All"), AntUIImages.getImageDescriptor(IAntUIConstants.IMG_REMOVE_ALL)); //$NON-NLS-1$
-		setDescription(AntViewActionMessages.getString("RemoveAllAction.Remove_All")); //$NON-NLS-1$
-		setToolTipText(AntViewActionMessages.getString("RemoveAllAction.Remove_All")); //$NON-NLS-1$
-		this.view= view;
-		WorkbenchHelp.setHelp(this, IExternalToolsHelpContextIds.REMOVE_ALL_ACTION);
-	}
-	
-	public void run() {
-		view.removeAllProjects();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.texteditor.IUpdate#update()
-	 */
-	public void update() {
-		setEnabled(view.getProjectViewer().getTree().getItemCount() != 0);
-	}
-}
diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/views/actions/RemoveProjectAction.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/views/actions/RemoveProjectAction.java
deleted file mode 100644
index 8c52346..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/views/actions/RemoveProjectAction.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.ui.internal.views.actions;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.ant.ui.internal.model.AntUIImages;
-import org.eclipse.ant.ui.internal.model.IAntUIConstants;
-import org.eclipse.ant.ui.internal.views.AntView;
-import org.eclipse.ant.ui.internal.views.elements.ProjectNode;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ui.externaltools.internal.model.IExternalToolsHelpContextIds;
-import org.eclipse.ui.help.WorkbenchHelp;
-import org.eclipse.ui.texteditor.IUpdate;
-
-/**
- * Action that removes selected build files from an <code>AntView</code>
- */
-public class RemoveProjectAction extends Action implements IUpdate {
-	
-	private AntView view;
-	
-	public RemoveProjectAction(AntView view) {
-		super(AntViewActionMessages.getString("RemoveProjectAction.Remove"), AntUIImages.getImageDescriptor(IAntUIConstants.IMG_REMOVE)); //$NON-NLS-1$
-		this.view= view;
-		setToolTipText(AntViewActionMessages.getString("RemoveProjectAction.Remove_2")); //$NON-NLS-1$
-		WorkbenchHelp.setHelp(this, IExternalToolsHelpContextIds.REMOVE_PROJECT_ACTION);
-	}
-
-	/**
-	 * @see org.eclipse.jface.action.IAction#run()
-	 */
-	public void run() {
-		IStructuredSelection selection= (IStructuredSelection) view.getProjectViewer().getSelection();
-		Iterator iter= selection.iterator();
-		Object element;
-		List projectNodes= new ArrayList();
-		while (iter.hasNext()) {
-			element= iter.next();
-			if (element instanceof ProjectNode) {
-				projectNodes.add(element);
-			}
-		}
-		view.removeProjects(projectNodes);
-	}
-	
-	/**
-	 * @see org.eclipse.ui.texteditor.IUpdate#update()
-	 */
-	public void update() {
-		IStructuredSelection selection= (IStructuredSelection) view.getProjectViewer().getSelection();
-		if (selection.isEmpty()) {
-			setEnabled(false);
-			return;
-		}
-		Object element;
-		Iterator iter= selection.iterator();
-		while (iter.hasNext()) {
-			element= iter.next();
-			if (!(element instanceof ProjectNode)) {
-				setEnabled(false);
-				return;
-			}
-		}
-		setEnabled(true);
-	}
-	
-}
diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/views/actions/RunTargetAction.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/views/actions/RunTargetAction.java
deleted file mode 100644
index f161398..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/views/actions/RunTargetAction.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.ui.internal.views.actions;
-
-
-import java.util.Iterator;
-
-import org.eclipse.ant.ui.internal.launchConfigurations.AntLaunchShortcut;
-import org.eclipse.ant.ui.internal.model.AntUIImages;
-import org.eclipse.ant.ui.internal.model.AntUIPlugin;
-import org.eclipse.ant.ui.internal.model.AntUtil;
-import org.eclipse.ant.ui.internal.model.IAntUIConstants;
-import org.eclipse.ant.ui.internal.views.AntView;
-import org.eclipse.ant.ui.internal.views.elements.AntNode;
-import org.eclipse.ant.ui.internal.views.elements.ProjectNode;
-import org.eclipse.ant.ui.internal.views.elements.TargetNode;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.debug.core.ILaunchManager;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ui.externaltools.internal.model.IExternalToolsHelpContextIds;
-import org.eclipse.ui.help.WorkbenchHelp;
-import org.eclipse.ui.texteditor.IUpdate;
-
-/**
- * Action which runs the selected target or the default target of the selected
- * project in the AntView.
- */
-public class RunTargetAction extends Action implements IUpdate {
-	
-	private AntView view;
-	
-	/**
-	 * Creates a new <code>RunTargetAction</code> which will execute
-	 * targets in the given view.
-	 * @param view the Ant view whose selection this action will use when
-	 * determining which target to run.
-	 */
-	public RunTargetAction(AntView view) {
-		super(AntViewActionMessages.getString("RunTargetAction.Run_1"), AntUIImages.getImageDescriptor(IAntUIConstants.IMG_RUN)); //$NON-NLS-1$
-		setToolTipText(AntViewActionMessages.getString("RunTargetAction.Run_Default")); //$NON-NLS-1$
-		this.view= view;
-		WorkbenchHelp.setHelp(this, IExternalToolsHelpContextIds.RUN_TARGET_ACTION);
-	}
-
-	/**
-	 * Executes the selected target or project in the Ant view.
-	 */
-	public void run() {
-		TargetNode target= getSelectedTarget();
-		if (target == null) {
-			return;
-		}
-		run(target);
-	}
-	
-	/**
-	 * Executes the given target
-	 * @param target the target to execute
-	 */
-	public void run(TargetNode target) {
-		IFile file= AntUtil.getFile(target.getProject().getBuildFileName());
-		if (file == null) {
-			AntUIPlugin.getStandardDisplay().beep();
-			return;
-		}
-		AntLaunchShortcut shortcut= new AntLaunchShortcut();
-		shortcut.launch(file, ILaunchManager.RUN_MODE, target.getName());
-	}
-
-	/**
-	 * Updates the enablement of this action based on the user's selection
-	 */
-	public void update() {
-		AntNode selection= getSelectedElement();
-		boolean enabled= false;
-		if (selection instanceof TargetNode) {
-			if (!((TargetNode) selection).isErrorNode()) {
-				enabled= true;
-			}
-		} else if (selection instanceof ProjectNode) {
-			if (!((ProjectNode) selection).isErrorNode()) {
-				enabled= true;
-			}
-		}
-		setEnabled(enabled);
-	}
-	
-	/**
-	 * Returns the selected target or project node or <code>null</code> if no target or
-	 * project is selected or if more than one element is selected.
-	 * 
-	 * @return AntNode the selected <code>TargetNode</code> or <code>ProjectNode</code>
-	 */
-	private AntNode getSelectedElement() {
-		IStructuredSelection selection= (IStructuredSelection) view.getProjectViewer().getSelection();
-		if (selection.isEmpty()) {
-			return null;
-		}
-		Iterator iter= selection.iterator();
-		Object data= iter.next();
-		if (iter.hasNext() || (!(data instanceof TargetNode) && !(data instanceof ProjectNode))) {
-			// Only return a TargetNode or ProjectNode
-			return null;
-		}
-		return (AntNode) data;
-	}
-	
-	/**
-	 * Returns the selected target in the project viewer or <code>null</code> if
-	 * no target is selected or more than one element is selected.
-	 * 
-	 * @return TargetNode the selected target
-	 */
-	private TargetNode getSelectedTarget() {
-		AntNode selectedNode= getSelectedElement();
-		if (selectedNode instanceof TargetNode) {
-			return (TargetNode) selectedNode;
-		} else if (selectedNode instanceof ProjectNode) {
-			return ((ProjectNode) selectedNode).getDefaultTarget();
-		}
-		return null;
-	}
-
-}
diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/views/actions/SearchForBuildFilesAction.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/views/actions/SearchForBuildFilesAction.java
deleted file mode 100644
index 7e1b807..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/views/actions/SearchForBuildFilesAction.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.ui.internal.views.actions;
-import java.lang.reflect.InvocationTargetException;
-import java.text.MessageFormat;
-
-import org.eclipse.ant.ui.internal.model.AntUIImages;
-import org.eclipse.ant.ui.internal.model.AntUIPlugin;
-import org.eclipse.ant.ui.internal.model.IAntUIConstants;
-import org.eclipse.ant.ui.internal.views.AntView;
-import org.eclipse.ant.ui.internal.views.elements.ProjectNode;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.ProgressMonitorDialog;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.externaltools.internal.model.IExternalToolsHelpContextIds;
-import org.eclipse.ui.help.WorkbenchHelp;
-
-/**
- * This action opens a dialog to search for build files and adds the resulting
- * projects to the ant view.
- */
-public class SearchForBuildFilesAction extends Action {
-	private AntView view;
-	
-	public SearchForBuildFilesAction(AntView view) {
-		super(AntViewActionMessages.getString("SearchForBuildFilesAction.Search_1"), AntUIImages.getImageDescriptor(IAntUIConstants.IMG_SEARCH)); //$NON-NLS-1$
-		setToolTipText(AntViewActionMessages.getString("SearchForBuildFilesAction.Add_build_files_with_search_2")); //$NON-NLS-1$
-		this.view= view;
-		WorkbenchHelp.setHelp(this, IExternalToolsHelpContextIds.SEARCH_FOR_BUILDFILES_ACTION);
-	}
-	
-	/**
-	 * Opens the <code>SearchForBuildFilesDialog</code> and adds the results to
-	 * the ant view.
-	 */
-	public void run() {
-		SearchForBuildFilesDialog dialog= new SearchForBuildFilesDialog();
-		if (dialog.open() != Dialog.CANCEL) {
-			final IFile[] files= dialog.getResults();
-			final boolean includeErrorNodes= dialog.getIncludeErrorResults();
-			final ProgressMonitorDialog progressDialog= new ProgressMonitorDialog(AntUIPlugin.getStandardDisplay().getActiveShell());
-			final ProjectNode[] existingProjects= view.getProjects();
-			try {
-				progressDialog.run(true, true, new IRunnableWithProgress() {
-					public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
-						monitor.beginTask(AntViewActionMessages.getString("SearchForBuildFilesAction.Processing_search_results_3"), files.length); //$NON-NLS-1$
-						for (int i = 0; i < files.length && !monitor.isCanceled(); i++) {
-							String buildFileName= files[i].getFullPath().toString();
-							monitor.subTask(MessageFormat.format(AntViewActionMessages.getString("SearchForBuildFilesAction.Adding_{0}_4"), new String[] {buildFileName})); //$NON-NLS-1$
-							if (alreadyAdded(buildFileName)) {
-								// Don't parse projects that have already been added.
-								continue;
-							}
-							final ProjectNode project= new ProjectNode(buildFileName);
-							// Force the project to be parsed so the error state is set.
-							project.getName();
-							monitor.worked(1);
-							if (includeErrorNodes || !(project.isErrorNode())) {
-								Display.getDefault().asyncExec(new Runnable() {
-									public void run() {
-										view.addProject(project);
-									}
-								});
-							}
-						}
-					}
-					/**
-					 * Returns whether or not the given build file already
-					 * exists in the ant view.
-					 */
-					private boolean alreadyAdded(String buildFileName) {
-						for (int j = 0; j < existingProjects.length; j++) {
-							ProjectNode existingProject = existingProjects[j];
-							if (existingProject.getBuildFileName().equals(buildFileName)) {
-								return true;
-							}
-						}
-						return false;
-					}
-				});
-			} catch (InvocationTargetException e) {
-			} catch (InterruptedException e) {
-			}
-		}
-	}
-
-}
diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/views/actions/SearchForBuildFilesDialog.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/views/actions/SearchForBuildFilesDialog.java
deleted file mode 100644
index de9debf..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/views/actions/SearchForBuildFilesDialog.java
+++ /dev/null
@@ -1,410 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.ui.internal.views.actions;
-
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.ant.ui.internal.model.AntUIPlugin;
-import org.eclipse.ant.ui.internal.model.IAntUIPreferenceConstants;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceProxy;
-import org.eclipse.core.resources.IResourceProxyVisitor;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.IDialogSettings;
-import org.eclipse.jface.dialogs.IInputValidator;
-import org.eclipse.jface.dialogs.InputDialog;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.IWorkingSet;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.dialogs.IWorkingSetSelectionDialog;
-import org.eclipse.ui.externaltools.internal.model.IExternalToolsHelpContextIds;
-import org.eclipse.ui.externaltools.internal.model.StringMatcher;
-import org.eclipse.ui.help.WorkbenchHelp;
-
-/**
- * This dialog allows the user to search for Ant build files whose names match a
- * given pattern. The search may be performed on the entire workspace or it can
- * be limited to a particular working set.
- */
-public class SearchForBuildFilesDialog extends InputDialog {
-
-	/**
-	 * List of <code>IFile</code> objects that were found
-	 */
-	private List results = new ArrayList();
-	/**
-	 * List of <code>IResource</code> objects in which to search.
-	 * 
-	 * If the searchScopes are <code>null</code>, the user has asked to search
-	 * the workspace. If the searchScopes are empty, the user has asked to
-	 * search a working set that has no resources.
-	 */
-	private List searchScopes = null;
-	/**
-	 * The working set scope radio button.
-	 */
-	private Button workingSetScopeButton;
-	/**
-	 * The workspace scope radio button.
-	 */
-	private Button workspaceScopeButton;
-	/**
-	 * The text field that displays the current working set name
-	 */
-	private Text workingSetText;
-	/**
-	 * The button that allows the user to decide if error results should be
-	 * parsed
-	 */
-	private Button includeErrorResultButton;
-	/**
-	 * The dialog settings used to persist this dialog's settings.
-	 */
-	private static IDialogSettings settings= AntUIPlugin.getDefault().getDialogSettings();
-	
-	/**
-	 * Initialize any dialog settings that haven't been set.
-	 */
-	static {
-		if (settings.get(IAntUIPreferenceConstants.ANTVIEW_LAST_SEARCH_STRING) == null) {
-			settings.put(IAntUIPreferenceConstants.ANTVIEW_LAST_SEARCH_STRING, "build.xml"); //$NON-NLS-1$
-		}
-		if (settings.get(IAntUIPreferenceConstants.ANTVIEW_LAST_WORKINGSET_SEARCH_SCOPE) == null) {
-			settings.put(IAntUIPreferenceConstants.ANTVIEW_LAST_WORKINGSET_SEARCH_SCOPE, ""); //$NON-NLS-1$
-		} 
-	}
-
-	/**
-	 * Creates a new dialog to search for build files.
-	 */
-	public SearchForBuildFilesDialog() {
-		super(Display.getCurrent().getActiveShell(), AntViewActionMessages.getString("SearchForBuildFilesDialog.Search_for_Build_Files_1"), AntViewActionMessages.getString("SearchForBuildFilesDialog.&Input"), //$NON-NLS-1$ //$NON-NLS-2$
-				settings.get(IAntUIPreferenceConstants.ANTVIEW_LAST_SEARCH_STRING), new IInputValidator() {
-			public String isValid(String newText) {
-				String trimmedText = newText.trim();
-				if (trimmedText.length() == 0) {
-					return AntViewActionMessages.getString("SearchForBuildFilesDialog.Build_name_cannot_be_empty_3"); //$NON-NLS-1$
-				}
-				return null;
-			}
-		});
-	}
-
-	/**
-	 * Change the label on the "Ok" button and initialize the enabled state
-	 */
-	protected void createButtonsForButtonBar(Composite parent) {
-		super.createButtonsForButtonBar(parent);
-		getOkButton().setText(AntViewActionMessages.getString("SearchForBuildFilesDialog.&Search_4")); //$NON-NLS-1$
-
-		String workingSetName= settings.get(IAntUIPreferenceConstants.ANTVIEW_LAST_WORKINGSET_SEARCH_SCOPE);
-		if (workingSetName.length() > 0) {
-			setWorkingSet(PlatformUI.getWorkbench().getWorkingSetManager().getWorkingSet(workingSetName));
-		}
-		if (!settings.getBoolean(IAntUIPreferenceConstants.ANTVIEW_USE_WORKINGSET_SEARCH_SCOPE)) {
-			selectRadioButton(workspaceScopeButton);
-			handleRadioButtonPressed();
-		}
-	}
-
-	/**
-	 * Add the scope selection widgets to the dialog area
-	 */
-	protected Control createDialogArea(Composite parent) {
-		Font font = parent.getFont();
-		
-		Composite composite = (Composite) super.createDialogArea(parent);
-		createIncludeErrorResultButton(composite, font);
-		createScopeGroup(composite, font);
-		return composite;
-	}
-	
-	private void createScopeGroup(Composite composite, Font font) {
-		Group scope= new Group(composite, SWT.NONE);
-		scope.setText(AntViewActionMessages.getString("SearchForBuildFilesDialog.Scope_5")); //$NON-NLS-1$
-		GridData data= new GridData(GridData.FILL_BOTH);
-		scope.setLayoutData(data);
-		GridLayout layout= new GridLayout(3, false);
-		scope.setLayout(layout);
-		scope.setFont(font);
-		
-		// Create a composite for the radio buttons
-		Composite radioComposite= new Composite(scope, SWT.NONE);
-		GridLayout radioLayout= new GridLayout();
-		radioLayout.marginHeight= 0;
-		radioComposite.setLayout(radioLayout);
-
-		SelectionAdapter selectionListener= new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				handleRadioButtonPressed();
-			}
-		};
-
-		workspaceScopeButton= new Button(radioComposite, SWT.RADIO);
-		workspaceScopeButton.setFont(font);
-		workspaceScopeButton.setText(AntViewActionMessages.getString("SearchForBuildFilesDialog.&Workspace_6")); //$NON-NLS-1$
-		workspaceScopeButton.addSelectionListener(selectionListener);
-
-		workingSetScopeButton=new Button(radioComposite, SWT.RADIO);
-		workingSetScopeButton.setFont(font);
-		workingSetScopeButton.setText(AntViewActionMessages.getString("SearchForBuildFilesDialog.Wor&king_Set__7")); //$NON-NLS-1$
-		workingSetScopeButton.addSelectionListener(selectionListener);
-		
-		selectRadioButton(workspaceScopeButton);
-
-		workingSetText= new Text(scope, SWT.BORDER);
-		workingSetText.setEditable(false);
-		data= new GridData(GridData.FILL_HORIZONTAL | GridData.VERTICAL_ALIGN_END);
-		workingSetText.setLayoutData(data);
-		workingSetText.setFont(font);
-
-		Button chooseButton = new Button(scope, SWT.PUSH);
-		data= new GridData(GridData.VERTICAL_ALIGN_END);
-		chooseButton.setLayoutData(data);
-		chooseButton.setFont(font);
-		chooseButton.setText(AntViewActionMessages.getString("SearchForBuildFilesDialog.&Choose..._8")); //$NON-NLS-1$
-		chooseButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent evt) {
-				handleChooseButtonPressed();
-			}
-		});
-	}
-	
-	/**
-	 * Programatically selects the given radio button, deselecting the other
-	 * radio button.
-	 * 
-	 * @param button the radio button to select. This parameter must be one of
-	 * either the <code>workingSetScopeButton</code> or the
-	 * <code>workspaceScopeButton</code> or this method will have no effect.
-	 */
-	private void selectRadioButton(Button button) {
-		if (button == workingSetScopeButton) {
-			workingSetScopeButton.setSelection(true);
-			workspaceScopeButton.setSelection(false);
-		} else if (button == workspaceScopeButton) {
-			workspaceScopeButton.setSelection(true);
-			workingSetScopeButton.setSelection(false);
-		}
-	}
-	
-	/**
-	 * One of the search scope radio buttons has been pressed. Update the dialog
-	 * accordingly.
-	 */
-	private void handleRadioButtonPressed() {
-		if (workingSetScopeButton.getSelection()) {
-			IWorkingSet set= PlatformUI.getWorkbench().getWorkingSetManager().getWorkingSet(getWorkingSetName());
-			if (set != null) {
-				setWorkingSet(set);
-				return;
-			}
-		}
-		setWorkingSet(null);
-	}
-	
-	/**
-	 * Returns the working set name currently displayed.
-	 */
-	private String getWorkingSetName() {
-		return workingSetText.getText().trim();
-	}
-	
-	/**
-	 * Creates the button that allows the user to specify whether or not build
-	 * files should that cannot be parsed should be included in the results.
-	 */
-	private void createIncludeErrorResultButton(Composite composite, Font font) {
-		includeErrorResultButton= new Button(composite, SWT.CHECK);
-		includeErrorResultButton.setFont(font);
-		includeErrorResultButton.setText(AntViewActionMessages.getString("SearchForBuildFilesDialog.Include_errors")); //$NON-NLS-1$
-		includeErrorResultButton.setSelection(settings.getBoolean(IAntUIPreferenceConstants.ANTVIEW_INCLUDE_ERROR_SEARCH_RESULTS));
-	}
-	
-	/**
-	 * Updates the enablement of the "Search" button based on the validity of
-	 * the user's selections.
-	 */
-	private void updateOkEnabled() {
-		if (workingSetScopeButton.getSelection()) {
-			String error= null;
-			if (searchScopes == null) {
-				error= AntViewActionMessages.getString("SearchForBuildFilesDialog.Must_select_a_working_set_10"); //$NON-NLS-1$
-			} else if (searchScopes.isEmpty()) {
-				error= AntViewActionMessages.getString("SearchForBuildFilesDialog.No_searchable"); //$NON-NLS-1$
-			}
-			if (error != null) {
-				getErrorMessageLabel().setText(error);
-				getErrorMessageLabel().getParent().update();
-				getOkButton().setEnabled(false);
-				return;
-			}
-		}
-		getOkButton().setEnabled(true);
-		getErrorMessageLabel().setText(""); //$NON-NLS-1$
-		getErrorMessageLabel().getParent().update();
-	}
-
-	/**
-	 * Handles the working set choose button pressed. Returns the name of the
-	 * chosen working set or <code>null</code> if none.
-	 */
-	private void handleChooseButtonPressed() {
-		IWorkingSetSelectionDialog dialog= PlatformUI.getWorkbench().getWorkingSetManager().createWorkingSetSelectionDialog(getShell(), false);
-		if (dialog.open() == Dialog.CANCEL) {
-			return;
-		}
-		IWorkingSet[] sets= dialog.getSelection();
-		if (sets == null) {
-			return;
-		}
-		if (sets.length == 0) {
-			setWorkingSet(null); //ok pressed with no working set selected
-		} else {
-			setWorkingSet(sets[0]); // We disallowed multi-select
-		}
-	}
-	
-	/**
-	 * Sets the current working set search scope. This populates the search
-	 * scope with resources found in the given working set and updates the
-	 * enabled state of the dialog based on the sets contents.
-	 * 
-	 * @param set the working set scope for the search
-	 */
-	private void setWorkingSet(IWorkingSet set) {
-		if (set == null) {
-			searchScopes= null;
-			workingSetText.setText(""); //$NON-NLS-1$
-			updateOkEnabled();
-			return;
-		}
-		IAdaptable[] elements= set.getElements();
-		searchScopes= new ArrayList();
-		for (int i = 0; i < elements.length; i++) {
-			// Try to get an IResource object from each element
-			IResource resource= null;
-			IAdaptable adaptable = elements[i];
-			if (adaptable instanceof IResource) {
-				resource= (IResource) adaptable;
-			} else {
-				resource= (IResource) adaptable.getAdapter(IResource.class);
-			}
-			if (resource != null) {
-				searchScopes.add(resource);
-			}
-		}
-		workingSetText.setText(set.getName());
-		selectRadioButton(workingSetScopeButton);
-		
-		updateOkEnabled();
-	}
-
-	/**
-	 * Returns the trimmed user input
-	 */
-	private String getInput() {
-		return getText().getText().trim();
-	}
-
-	/**
-	 * Returns the search results
-	 */
-	public IFile[] getResults() {
-		return (IFile[]) results.toArray(new IFile[results.size()]);
-	}
-	
-	/**
-	 * Returns whether the user wishes to include results which cannot be
-	 * parsed.
-	 */
-	protected boolean getIncludeErrorResults() {
-		return settings.getBoolean(IAntUIPreferenceConstants.ANTVIEW_INCLUDE_ERROR_SEARCH_RESULTS);
-	}
-
-	/**
-	 * When the user presses the search button (tied to the OK id), search the
-	 * workspace for files matching the regular expression in the input field.
-	 */
-	protected void okPressed() {
-		String input = getInput();
-		settings.put(IAntUIPreferenceConstants.ANTVIEW_LAST_SEARCH_STRING, input);
-		settings.put(IAntUIPreferenceConstants.ANTVIEW_INCLUDE_ERROR_SEARCH_RESULTS, includeErrorResultButton.getSelection());
-		settings.put(IAntUIPreferenceConstants.ANTVIEW_LAST_WORKINGSET_SEARCH_SCOPE, getWorkingSetName());
-		settings.put(IAntUIPreferenceConstants.ANTVIEW_USE_WORKINGSET_SEARCH_SCOPE, workingSetScopeButton.getSelection());
-		results = new ArrayList(); // Clear previous results
-		ResourceProxyVisitor visitor= new ResourceProxyVisitor();
-		if (searchScopes == null || searchScopes.isEmpty()) {
-			try {
-				ResourcesPlugin.getWorkspace().getRoot().accept(visitor, IResource.NONE);
-			} catch (CoreException ce) {
-				//Closed project...don't want build files from there
-			}
-		} else {
-			Iterator iter= searchScopes.iterator();
-			while(iter.hasNext()) {
-				try {
-					((IResource) iter.next()).accept(visitor, IResource.NONE);
-				} catch (CoreException ce) {
-					//Closed project...don't want build files from there
-				}
-			}
-		}
-		super.okPressed();
-	}
-	
-	/**
-	 * Searches for files whose name matches the given regular expression.
-	 */
-	class ResourceProxyVisitor implements IResourceProxyVisitor {
-		StringMatcher matcher= new StringMatcher(getInput(), true, false);
-
-		/**
-		 * @see org.eclipse.core.resources.IResourceProxyVisitor#visit(org.eclipse.core.resources.IResourceProxy)
-		 */
-		public boolean visit(IResourceProxy proxy) throws CoreException {
-			if (proxy.getType() == IResource.FILE) {
-				if (matcher.match(proxy.getName())) {
-					results.add(proxy.requestResource());
-				}
-				return false;
-			}
-			return true;
-		}
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.window.Window#configureShell(org.eclipse.swt.widgets.Shell)
-	 */
-	protected void configureShell(Shell shell) {
-		super.configureShell(shell);
-		WorkbenchHelp.setHelp(shell, IExternalToolsHelpContextIds.SEARCH_FOR_BUILDFILES_DIALOG);
-	}
-
-}
diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/views/elements/AntNode.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/views/elements/AntNode.java
deleted file mode 100644
index 4e35212..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/views/elements/AntNode.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.ui.internal.views.elements;
-
-
-public abstract class AntNode {
-	
-	private AntNode parent= null;
-	private String name= null;
-	private String description= null;
-	
-	/**
-	 * Creates a new node with no parent
-	 */
-	private AntNode() {
-	}
-	
-	/**
-	 * Creates a new node with the given name
-	 * 
-	 * @param name the new node's name
-	 */
-	public AntNode(String name) {
-		this(null, name);
-	}
-	
-	/**
-	 * Creates a new node with the given parent and the given name
-	 * 
-	 * @param parent the new node's parent node
-	 * @param name the new node's name
-	 */
-	public AntNode(AntNode parent, String name) {
-		this.parent= parent;
-		this.name= name;
-	}
-	
-	/**
-	 * Returns this node's parent or <code>null</code> if none.
-	 * 
-	 * @return AntNode this node's parent node
-	 */
-	public AntNode getParent() {
-		return parent;
-	}
-	
-	/**
-	 * Sets this node's parent node to the given node
-	 * 
-	 * @param parent the parent node
-	 */
-	public void setParent(AntNode parent) {
-		this.parent= parent;
-	}
-	
-	/**
-	 * Returns this node's name or <code>null</code> if none. Subclasses which
-	 * represent an ant build element that has a required name must override
-	 * this method to never return <code>null</code>
-	 * 
-	 * @return String this node's name or <code>null</code> if the name
-	 * attribute is optional for this node.
-	 */
-	public String getName() {
-		return name;
-	}
-	
-	/**
-	 * Sets this node's name to the given name
-	 * 
-	 * @param name the new name
-	 */
-	public void setName(String name) {
-		this.name= name;
-	}
-	
-	public String toString() {
-		if (getName() != null) {
-			return getName();
-		}
-		return super.toString();
-	}
-	
-	/**
-	 * Sets this node's description to the given description
-	 * 
-	 * @param description the new description
-	 */
-	public void setDescription(String description) {
-		this.description= description;
-	}
-	
-	/**
-	 * Returns this node's description or <code>null</code> if none. Subclasses
-	 * which represent an ant build element that has a required description must
-	 * override this method to never return <code>null</code>
-	 * 
-	 * @return String this node's description or <code>null</code> if the
-	 * description attribute is optional for this node.
-	 */
-	public String getDescription() {
-		return description;
-	}
-}
diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/views/elements/AntViewElementsMessages.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/views/elements/AntViewElementsMessages.java
deleted file mode 100644
index 0fe9e2e..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/views/elements/AntViewElementsMessages.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.ui.internal.views.elements;
-
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-public class AntViewElementsMessages {
-
-	private static final String BUNDLE_NAME = "org.eclipse.ant.ui.internal.views.elements.AntViewElementsMessages"; //$NON-NLS-1$
-
-	private static final ResourceBundle RESOURCE_BUNDLE =
-		ResourceBundle.getBundle(BUNDLE_NAME);
-
-	private AntViewElementsMessages() {
-	}
-
-	public static String getString(String key) {
-		try {
-			return RESOURCE_BUNDLE.getString(key);
-		} catch (MissingResourceException e) {
-			return '!' + key + '!';
-		}
-	}
-}
diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/views/elements/AntViewElementsMessages.properties b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/views/elements/AntViewElementsMessages.properties
deleted file mode 100644
index fedbf89..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/views/elements/AntViewElementsMessages.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2003 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Common Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/cpl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-ProjectNode.No_targets=No targets found
-ProjectNode.No_default=No default target found
-ProjectNode.<name_unspecified>_1=<name unspecified>
-ProjectNode.Build_file_not_found_1=Buildfile not found
diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/views/elements/ProjectNode.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/views/elements/ProjectNode.java
deleted file mode 100644
index bdc90eb..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/views/elements/ProjectNode.java
+++ /dev/null
@@ -1,303 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.ui.internal.views.elements;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Enumeration;
-import java.util.List;
-
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.Target;
-import org.eclipse.ant.core.ProjectInfo;
-import org.eclipse.ant.core.TargetInfo;
-import org.eclipse.ant.ui.internal.model.AntUtil;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-
-/**
- * Representation of an ant build project.
- */
-public class ProjectNode extends AntNode {
-
-	private List targets= null;
-	private TargetNode defaultTarget= null;
-	private String buildFileName;
-	private boolean isErrorNode= false;
-	
-	private String defaultTargetName;
-	/**
-	 * Creates a new project node with the given name and the given build file
-	 * name.
-	 * 
-	 * @param name the project's name or <code>null</code> if the project's
-	 * name is not known. If this value is <code>null</code>, the file will be
-	 * parsed the first time a value is requested that requires it.
-	 * @param buildFileName
-	 */
-	public ProjectNode(String name, String buildFileName) {
-		super(name);
-		this.buildFileName= buildFileName;
-	}
-	
-	/**
-	 * Creates a new project node on the given build file.
-	 */
-	public ProjectNode(String buildFileName) {
-		this(null, buildFileName);
-	}
-
-	/**
-	 * Returns the targets in this project
-	 * 
-	 * @return TargetNode[] the targets in this project
-	 */
-	public TargetNode[] getTargets() {
-		if (targets == null) {
-			// Lazily parse the file to populate the targets
-			parseBuildFile();
-		}
-		return (TargetNode[])targets.toArray(new TargetNode[targets.size()]);
-	}
-	
-	/**
-	 * Adds the given target to this project
-	 * 
-	 * @param target the target to add
-	 */
-	private void addTarget(TargetNode target) {
-		targets.add(target);
-		target.setParent(this);
-	}
-	
-	/**
-	 * Sets this project's default target to the given target
-	 * 
-	 * @param target this project's default target
-	 */
-	public void setDefaultTarget(TargetNode target) {
-		defaultTarget= target;
-		if (target != null) {
-			defaultTargetName= target.getName();
-		}
-	}
-	
-	/**
-	 * Returns the name of the build file containing this project
-	 * 
-	 * @return String the name of this project's build file
-	 */
-	public String getBuildFileName() {
-		return buildFileName;
-	}
-	
-	/**
-	 * Returns the default target in this project or <code>null</code> if none
-	 * has been set
-	 * 
-	 * @return TargetNode the default target or <code>null</code> if none has
-	 * been set
-	 */
-	public TargetNode getDefaultTarget() {
-		if (targets == null) {
-			// Lazily parse the file to populate the targets
-			parseBuildFile();
-		}
-		return defaultTarget;
-	}
-	
-	/**
-	 * Returns the default target name. If this project has not been parsed yet, this
-	 * method will return the default target name specified via setDefaultTargetName(String)
-	 * or <code>null</code> if no default target name has been specified.
-	 * 
-	 * This method is intended to be used by clients who want to access the name of this
-	 * project's default target without forcing the build file to be parsed.
-	 *   
-	 * @return String the name of the default target in this project.
-	 */
-	public String getDefaultTargetName() {
-		return defaultTargetName;
-	}
-	
-	/**
-	 * Sets the name of this project node's default target.
-	 * 
-	 * @param name the name of this project node's default target
-	 * @see ProjectNode#getDefaultTargetName()
-	 */
-	public void setDefaultTargetName(String name) {
-		defaultTargetName= name;
-	}
-	
-	/**
-	 * Sets this project's error node state
-	 * 
-	 * @param boolean whether or not an error occurred while parsing this node
-	 */
-	public void setIsErrorNode(boolean isErrorNode) {
-		this.isErrorNode= isErrorNode;
-	}
-	
-	/**
-	 * Returns whether an error occurred while parsing this Ant node
-	 * 
-	 * @return whether an error occurred while parsing this Ant node
-	 */
-	public boolean isErrorNode() {
-		return isErrorNode;
-	}
-	
-	/**
-	 * Parses the given build file and populates the targets contained in the
-	 * build file. If an error occurs while parsing the file, the error
-	 * state will be set and a target error node will be added
-	 */
-	public void parseBuildFile() {
-		clear();
-		TargetInfo[] infos = null;
-		IPath buildFilePath= AntUtil.getFile(getBuildFileName()).getLocation();
-		if (buildFilePath == null) {
-			setErrorMessage(AntViewElementsMessages.getString("ProjectNode.Build_file_not_found_1")); //$NON-NLS-1$
-			return;
-		}
-		try {
-			infos = AntUtil.getTargets(buildFilePath.toString());
-		} catch (CoreException e) {
-			setErrorMessage(e.getMessage());
-			return;
-		}
-		if (infos.length < 1) {
-			setErrorMessage(AntViewElementsMessages.getString("ProjectNode.No_targets")); //$NON-NLS-1$
-			return;
-		}
-		ProjectInfo projectInfo= infos[0].getProject();
-		// Create Apache Ant objects
-		Project project = new Project();
-		if (projectInfo.getName() != null) {
-			project.setName(projectInfo.getName());
-		}
-		
-		for (int i = 0; i < infos.length; i++) {
-			TargetInfo info = infos[i];
-			if (info.isDefault()) {
-				project.setDefault(info.getName());
-			}
-			Target target = new Target();
-			target.setName(info.getName());
-			String[] dependencies = info.getDependencies();
-			StringBuffer depends = new StringBuffer();
-			int numDependencies = dependencies.length;
-			if (numDependencies > 0) {
-				// Onroll the loop to avoid trailing comma
-				depends.append(dependencies[0]);
-			}
-			for (int j = 1; j < numDependencies; j++) {
-				depends.append(',').append(dependencies[j]);
-			}
-			target.setDepends(depends.toString());
-			target.setDescription(info.getDescription());
-			project.addTarget(target);
-		}
-		if (project.getDefaultTarget() == null) {
-			setErrorMessage(AntViewElementsMessages.getString("ProjectNode.No_default")); //$NON-NLS-1$
-			return;
-		}
-		// Set the project node data based on the Apache Ant data
-		String projectName = project.getName();
-		if (projectName == null) {
-			projectName = AntViewElementsMessages.getString("ProjectNode.<name_unspecified>_1"); //$NON-NLS-1$
-		}
-		// Update the project name
-		setName(projectName);
-		setDescription(projectInfo.getDescription());
-		Enumeration projTargets = project.getTargets().elements();
-		while (projTargets.hasMoreElements()) {
-			Target target = (Target) projTargets.nextElement();
-			// Target Node -----------------
-			Enumeration targetDependencies = target.getDependencies();
-			TargetNode targetNode = new TargetNode(target.getName(), target.getDescription());
-			while (targetDependencies.hasMoreElements()) {
-				targetNode.addDependency((String) targetDependencies.nextElement());
-			}
-			addTarget(targetNode);
-			if (target.getName().equals(project.getDefaultTarget())) {
-				setDefaultTarget(targetNode);
-			}
-		}
-		Collections.sort(targets, new Comparator() {
-			/**
-			 * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object)
-			 */
-			public int compare(Object o1, Object o2) {
-				String name1=""; //$NON-NLS-1$
-				String name2= ""; //$NON-NLS-1$
-				if (o1 instanceof TargetNode) {
-					name1= ((TargetNode)o1).getName();
-				}
-				if (o2 instanceof TargetNode) {
-					name2= ((TargetNode)o2).getName();
-				}
-				return name1.compareToIgnoreCase(name2);
-			}
-		});
-	}
-	
-	/**
-	 * Clear's this node's internally stored data
-	 */
-	private void clear() {
-		targets= new ArrayList();
-		setIsErrorNode(false);
-		setDefaultTarget(null);
-		setDefaultTargetName(null);
-	}
-	
-	/**
-	 * Sets the error message of this project and creates a new target child
-	 * node with the message
-	 *
-	 * @param errorMessage the error message generated while parsing this
-	 * project
-	 */
-	private void setErrorMessage(String errorMessage) {
-		setName(getBuildFileName());
-		setIsErrorNode(true);
-		TargetNode target= new TargetNode(errorMessage, errorMessage);
-		target.setIsErrorNode(true);
-		addTarget(target);
-	}
-
-	/**
-	 * Returns the name of this project, parsing the build file first if
-	 * necessary.
-	 * 
-	 * @return String this project's name
-	 */
-	public String getName() {
-		if (super.getName() == null) {
-			parseBuildFile();
-		}
-		String name= super.getName();
-		if (name == null || name.length() == 0) {
-			name= AntViewElementsMessages.getString("ProjectNode.<name_unspecified>_1"); //$NON-NLS-1$
-		}
-		return name;
-	}
-
-	/**
-	 * @see java.lang.Object#toString()
-	 */
-	public String toString() {
-		return getName();
-	}
-}
diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/views/elements/RootNode.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/views/elements/RootNode.java
deleted file mode 100644
index f3c4298..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/views/elements/RootNode.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.ui.internal.views.elements;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * The root node of an ant node tree
- */
-public class RootNode extends AntNode {
-
-	private List projects= new ArrayList();
-	
-	public RootNode() {
-		super(null);
-	}
-	
-	/**
-	 * Creates a new root node containing the given projects
-	 * 
-	 * @param projects the projects to add to this node
-	 */
-	public RootNode(ProjectNode[] projects) {
-		super(null);
-		for (int i = 0; i < projects.length; i++) {
-			this.projects.add(projects[i]);
-		}
-	}
-	
-	/**
-	 * Returns the list of projects stored in this root node
-	 * 
-	 * @return ProjectNode[] the projects in this node
-	 */
-	public ProjectNode[] getProjects() {
-		return (ProjectNode[])projects.toArray(new ProjectNode[projects.size()]);
-	}
-	
-	/**
-	 * Returns whether this root node contains any projects
-	 * 
-	 * @return boolean Whether there are any projects
-	 */
-	public boolean hasProjects() {
-		return !projects.isEmpty();
-	}
-	
-	/**
-	 * Adds the given project to this root node
-	 * 
-	 * @param project the project to add
-	 */
-	public void addProject(ProjectNode project) {
-		projects.add(project);
-	}
-	
-	/**
-	 * Removes the given project from this root node. Has no effect if the given
-	 * project is not a child of this root
-	 * 
-	 * @param project the project to remove
-	 */
-	public void removeProject(ProjectNode project) {
-		projects.remove(project);
-	}
-	
-	/**
-	 * Removes all projects from this root node. Has no effect if this node has
-	 * no projects.
-	 */
-	public void removeAllProjects() {
-		projects.clear();
-	}
-
-}
diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/views/elements/TargetNode.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/views/elements/TargetNode.java
deleted file mode 100644
index c459ae9..0000000
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/ui/internal/views/elements/TargetNode.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ant.ui.internal.views.elements;
-
-import java.util.ArrayList;
-import java.util.List;
-
-
-/**
- * Representation of an ant target
- */
-public class TargetNode extends AntNode {
-	private List dependencies= new ArrayList();
-	private boolean isErrorNode= false;
-	
-	/**
-	 * Creates a new target node with the given parent node, name, and target
-	 * dependencies
-	 * 
-	 * @param parent the new node's parent
-	 * @param name the new node's name
-	 * @param description the target description or <code>null</code> if the
-	 * target has no description
-	 */
-	public TargetNode(String name, String description) {
-		super(name);
-		setDescription(description);
-	}
-	
-	/**
-	 * Adds the given dependency to the list of this target's dependencies
-	 * 
-	 * @param dependency the dependency to add
-	 */
-	public void addDependency(String dependency) {
-		dependencies.add(dependency);
-	}
-
-	/**
-	 * Returns the dependency node containing the names of the targets on which
-	 * this target depends
-	 * 
-	 * @return DependencyNode the node containing the names of this target's
-	 * dependencies
-	 */
-	public String[] getDependencies() {
-		return (String[]) dependencies.toArray(new String[dependencies.size()]);
-	}
-	
-	/**
-	 * Returns the ProjectNode containing this target. This method is equivalent
-	 * to calling getParent() and casting the result to a ProjectNode.
-	 * 
-	 * @return ProjectNode the project containing this target
-	 */
-	public ProjectNode getProject() {
-		return (ProjectNode) getParent();
-	}
-	
-	/**
-	 * Sets this target's error node state
-	 *
-	 * @param boolean whether or not an error occurred while parsing this node
-	 */
-	public void setIsErrorNode(boolean isErrorNode) {
-		this.isErrorNode= isErrorNode;
-	}
-
-	/**
-	 * Returns whether an error occurred while parsing this Ant node
-	 *
-	 * @return whether an error occurred while parsing this Ant node
-	 */
-	public boolean isErrorNode() {
-		return isErrorNode;
-	}
-}
diff --git a/ant/org.eclipse.ant.ui/about.html b/ant/org.eclipse.ant.ui/about.html
deleted file mode 100644
index 98755cb..0000000
--- a/ant/org.eclipse.ant.ui/about.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>24th April, 2003</p>	
-<h3>License</h3>
-<p>Eclipse.org makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Common Public License Version 1.0 (&quot;CPL&quot;).  A copy of the CPL is available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>.
-For purposes of the CPL, &quot;Program&quot; will mean the Content.</p>
-
-<h3>Contributions</h3>
-
-<p>If this Content is licensed to you under the terms and conditions of the CPL, any Contributions, as defined in the CPL, uploaded, submitted, or otherwise
-made available to Eclipse.org, members of Eclipse.org and/or the host of Eclipse.org web site, by you that relate to such
-Content are provided under the terms and conditions of the CPL and can be made available to others under the terms of the CPL.</p>
-
-<p>If this Content is licensed to you under license terms and conditions other than the CPL (&quot;Other License&quot;), any modifications, enhancements and/or
-other code and/or documentation (&quot;Modifications&quot;) uploaded, submitted, or otherwise made available to Eclipse.org, members of Eclipse.org and/or the
-host of Eclipse.org, by you that relate to such Content are provided under terms and conditions of the Other License and can be made available
-to others under the terms of the Other License.  In addition, with regard to Modifications for which you are the copyright holder, you are also
-providing the Modifications under the terms and conditions of the CPL and such Modifications can be made available to others under the terms of
-the CPL.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/ant/org.eclipse.ant.ui/build.properties b/ant/org.eclipse.ant.ui/build.properties
deleted file mode 100644
index e22255b..0000000
--- a/ant/org.eclipse.ant.ui/build.properties
+++ /dev/null
@@ -1,27 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2003 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Common Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/cpl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-source.antui.jar = Ant Tools Support/,\
-				Ant Editor/
-
-source.lib/antrunner.jar = Ant Runner Support/
-
-src.includes=about.html
-
-bin.includes = icons/,\
-		.options,\
-		plugin.properties,\
-		plugin.xml,\
-		about.html,\
-		*.jar,\
-		lib/*.jar
-				
-jars.compile.order=antui.jar,lib/antrunner.jar
-jars.extra.classpath=../org.apache.ant/ant.jar
diff --git a/ant/org.eclipse.ant.ui/buildfiles/buildExtraJAR.xml b/ant/org.eclipse.ant.ui/buildfiles/buildExtraJAR.xml
deleted file mode 100644
index 7c4a788..0000000
--- a/ant/org.eclipse.ant.ui/buildfiles/buildExtraJAR.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="Build AntUI Ant support JAR" default="build" basedir="..">
-
-	<target name="build" description="Cleans, builds and refreshes">
-		<antcall target="clean"/>
-		<antcall target="lib/antrunnerlib.jar"/>
-		<antcall target="refresh"/>
-	</target>
-
-	<target name="init" depends="properties">
-		<property name="bootclasspath" value=""/>
-		<property name="plugin" value="org.eclipse.ant.ui"/>
-		<property name="temp.folder" value="${basedir}/temp.folder"/>
-		<property name="build.result.folder" value="${basedir}"/>
-		<property name="win32.jar" value="${basedir}/../org.eclipse.swt.win32/ws/win32/swt.jar"/>
-		<property name="gtk.jar" value="${basedir}/../org.eclipse.swt.gtk/ws/gtk/swt.jar"/>
-		<property name="motif.jar" value="${basedir}/../org.eclipse.swt.motif/ws/motif/swt.jar"/>
-		<property name="osx.jar" value="${basedir}/../org.eclipse.swt.carbon/ws/carbon/swt.jar"/>
-		<available file="${win32.jar}" property="swt.jar" value="${win32.jar}"/>
-		<available file="${gtk.jar}" property="swt.jar" value="${gtk.jar}"/>
-		<available file="${motif.jar}" property="swt.jar" value="${motif.jar}"/>
-		<available file="${osx.jar}" property="swt.jar" value="${osx.jar}"/>
-	</target>
-
-	<target name="properties" if="eclipse.running">
-		<property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter"/>
-	</target>
-	
-	<target name="lib/antrunnerlib.jar" description= "Creates the antrunner.jar" depends="init">
-		<property name="destdir" value="${temp.folder}/lib/antrunner.jar.bin"/>
-		<delete dir="${temp.folder}/lib/antrunner.jar.bin"/>
-		<mkdir dir="${temp.folder}/lib/antrunner.jar.bin"/>
-		<!-- compile the source code -->
-		<javac target="1.3" source="1.3" destdir="${temp.folder}/lib/antrunner.jar.bin" failonerror="true" verbose="false" debug="on" includeJavaRuntime= "yes" includeAntRuntime="no"
-			 	bootclasspath="${bootclasspath}" 
-			 	classpath="${basedir}/../org.eclipse.debug.core/dtcore.jar;
-			 		${basedir}/../org.eclipse.core.runtime/runtime.jar;
-			 		${basedir}/../org.eclipse.core.resources/resources.jar;
-			 		${basedir}/../org.apache.ant/ant.jar;
-			 		${basedir}/bin;
-			 		${swt.jar};
-			 		${basedir}/../org.eclipse.jface/jface.jar;
-			 		${basedir}/../org.eclipse.text/text.jar;
-			 		${basedir}/../org.eclipse.ant.core/bin;
-			 		${basedir}/../org.eclipse.core.resources/bin;
-			 		${basedir}/../org.eclipse.debug.core/bin;
-			 		${basedir}/../org.eclipse.debug.ui/bin;
-			 		${basedir}/../org.eclipse.jface/bin;
-			 		${basedir}/../org.eclipse.text/bin;
-			 		${basedir}/../org.eclipse.swt/bin;">
-			<src path="Ant Runner Support/"/>
-		</javac>
-		<!-- copy necessary resources -->
-		<copy todir="${temp.folder}/lib/antrunner.jar.bin">
-			<fileset dir="Ant Runner Support/" excludes="**/*.java"/>
-		</copy>
-		<mkdir dir="${build.result.folder}/lib"/>
-		<jar jarfile="${build.result.folder}/lib/antrunner.jar" basedir="${temp.folder}/lib/antrunner.jar.bin"/>
-		<delete dir="${temp.folder}"/>
-	</target>
-
-	<target name="clean" description="Deletes previous build remnants" depends="init">
-		<delete file="${build.result.folder}/lib/antrunner.jar"/>
-		<delete dir="${temp.folder}"/>
-	</target>
-
-	<target name="refresh" description= "Re-synchs resources" depends="init" if="eclipse.running">
-		<eclipse.refreshLocal resource="${plugin}" depth="infinite"/>
-	</target>
-
-</project>
diff --git a/ant/org.eclipse.ant.ui/buildfiles/exportplugin.xml b/ant/org.eclipse.ant.ui/buildfiles/exportplugin.xml
deleted file mode 100644
index 2a7ff38..0000000
--- a/ant/org.eclipse.ant.ui/buildfiles/exportplugin.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<!-- Export a jar of .class files for the org.eclipse.ant.ui Eclipse plug-in
-     along with other important plugin files to the "plugin-export" subdirectory
-     of the target Eclipse installation -->
-<project name="Export antui" default="export" basedir="..">
-
-	<!-- Set the timestamp and important properties -->
-	<target name="init">
-		<tstamp/>
-		<property name="destdir" value="../../plugin-export" />
-		<property name="dest"  value="${destdir}/org.eclipse.ant.ui_2.1.0" />
-	</target>
-
-	<!-- Create the jar of .class files, and copy other important files to export dir -->
-	<target name="export" depends="init">
-		<mkdir dir="${destdir}" />
-		<delete dir="${dest}" />
-		<mkdir dir="${dest}" />
-		<delete dir="${dest}/lib"/>
-		<mkdir dir="${dest}/lib"/>
-		<jar jarfile="${dest}/antui.jar">
-			<fileset dir="bin">
-				<exclude name="org/eclipse/ant/ui/internal/antsupport/*"/>
-				<exclude name="org/eclipse/ant/ui/internal/antsupport/inputhandler/*"/>
-				<exclude name="org/eclipse/ant/ui/internal/antsupport/logger/*"/>
-			</fileset>
-		</jar>
-		<!-- Create the source zip -->
-		<zip zipfile="${dest}/antuisrc.zip">
-			<fileset dir="Ant Tools Support"/>
-			<fileset dir="Ant Runner Support"/>
-			<fileset dir="Ant Editor"/>
-		</zip>
-		<copy file="plugin.xml" todir="${dest}"/>
-		<copy file="plugin.properties" todir="${dest}"/>
-		<copy file=".classpath" todir="${dest}"/>
-		<copy file=".options" todir="${dest}"/>
-		<copy file="lib/antrunner.jar" todir="${dest}/lib"/>
-		<copy todir="${dest}/icons">
-			<fileset dir="icons" />
-		</copy>		
-	</target>
-	
-</project>
diff --git a/ant/org.eclipse.ant.ui/icons/full/clcl16/add_co.gif b/ant/org.eclipse.ant.ui/icons/full/clcl16/add_co.gif
deleted file mode 100644
index dad7260..0000000
--- a/ant/org.eclipse.ant.ui/icons/full/clcl16/add_co.gif
+++ /dev/null
Binary files differ
diff --git a/ant/org.eclipse.ant.ui/icons/full/clcl16/ant_targets.gif b/ant/org.eclipse.ant.ui/icons/full/clcl16/ant_targets.gif
deleted file mode 100644
index 5996823..0000000
--- a/ant/org.eclipse.ant.ui/icons/full/clcl16/ant_targets.gif
+++ /dev/null
Binary files differ
diff --git a/ant/org.eclipse.ant.ui/icons/full/clcl16/properties.gif b/ant/org.eclipse.ant.ui/icons/full/clcl16/properties.gif
deleted file mode 100644
index ec0cba1..0000000
--- a/ant/org.eclipse.ant.ui/icons/full/clcl16/properties.gif
+++ /dev/null
Binary files differ
diff --git a/ant/org.eclipse.ant.ui/icons/full/clcl16/refresh.gif b/ant/org.eclipse.ant.ui/icons/full/clcl16/refresh.gif
deleted file mode 100644
index a063c23..0000000
--- a/ant/org.eclipse.ant.ui/icons/full/clcl16/refresh.gif
+++ /dev/null
Binary files differ
diff --git a/ant/org.eclipse.ant.ui/icons/full/clcl16/removeAll_co.gif b/ant/org.eclipse.ant.ui/icons/full/clcl16/removeAll_co.gif
deleted file mode 100644
index 2c069ab..0000000
--- a/ant/org.eclipse.ant.ui/icons/full/clcl16/removeAll_co.gif
+++ /dev/null
Binary files differ
diff --git a/ant/org.eclipse.ant.ui/icons/full/clcl16/remove_co.gif b/ant/org.eclipse.ant.ui/icons/full/clcl16/remove_co.gif
deleted file mode 100644
index 12a9167..0000000
--- a/ant/org.eclipse.ant.ui/icons/full/clcl16/remove_co.gif
+++ /dev/null
Binary files differ
diff --git a/ant/org.eclipse.ant.ui/icons/full/clcl16/run_tool.gif b/ant/org.eclipse.ant.ui/icons/full/clcl16/run_tool.gif
deleted file mode 100644
index 2088548..0000000
--- a/ant/org.eclipse.ant.ui/icons/full/clcl16/run_tool.gif
+++ /dev/null
Binary files differ
diff --git a/ant/org.eclipse.ant.ui/icons/full/clcl16/search.gif b/ant/org.eclipse.ant.ui/icons/full/clcl16/search.gif
deleted file mode 100644
index 6dc3ebe..0000000
--- a/ant/org.eclipse.ant.ui/icons/full/clcl16/search.gif
+++ /dev/null
Binary files differ
diff --git a/ant/org.eclipse.ant.ui/icons/full/cview16/ant_view.gif b/ant/org.eclipse.ant.ui/icons/full/cview16/ant_view.gif
deleted file mode 100644
index 6da365c..0000000
--- a/ant/org.eclipse.ant.ui/icons/full/cview16/ant_view.gif
+++ /dev/null
Binary files differ
diff --git a/ant/org.eclipse.ant.ui/icons/full/dlcl16/refresh.gif b/ant/org.eclipse.ant.ui/icons/full/dlcl16/refresh.gif
deleted file mode 100644
index b2281b4..0000000
--- a/ant/org.eclipse.ant.ui/icons/full/dlcl16/refresh.gif
+++ /dev/null
Binary files differ
diff --git a/ant/org.eclipse.ant.ui/icons/full/dlcl16/run_tool.gif b/ant/org.eclipse.ant.ui/icons/full/dlcl16/run_tool.gif
deleted file mode 100644
index a281bc1..0000000
--- a/ant/org.eclipse.ant.ui/icons/full/dlcl16/run_tool.gif
+++ /dev/null
Binary files differ
diff --git a/ant/org.eclipse.ant.ui/icons/full/elcl16/refresh.gif b/ant/org.eclipse.ant.ui/icons/full/elcl16/refresh.gif
deleted file mode 100644
index 919423d..0000000
--- a/ant/org.eclipse.ant.ui/icons/full/elcl16/refresh.gif
+++ /dev/null
Binary files differ
diff --git a/ant/org.eclipse.ant.ui/icons/full/elcl16/run_tool.gif b/ant/org.eclipse.ant.ui/icons/full/elcl16/run_tool.gif
deleted file mode 100644
index 053738c..0000000
--- a/ant/org.eclipse.ant.ui/icons/full/elcl16/run_tool.gif
+++ /dev/null
Binary files differ
diff --git a/ant/org.eclipse.ant.ui/icons/full/obj16/ant.gif b/ant/org.eclipse.ant.ui/icons/full/obj16/ant.gif
deleted file mode 100644
index f3e45a4..0000000
--- a/ant/org.eclipse.ant.ui/icons/full/obj16/ant.gif
+++ /dev/null
Binary files differ
diff --git a/ant/org.eclipse.ant.ui/icons/full/obj16/ant_buildfile.gif b/ant/org.eclipse.ant.ui/icons/full/obj16/ant_buildfile.gif
deleted file mode 100644
index 1aa3ae0..0000000
--- a/ant/org.eclipse.ant.ui/icons/full/obj16/ant_buildfile.gif
+++ /dev/null
Binary files differ
diff --git a/ant/org.eclipse.ant.ui/icons/full/obj16/ant_target_err.gif b/ant/org.eclipse.ant.ui/icons/full/obj16/ant_target_err.gif
deleted file mode 100644
index c2bfdd6..0000000
--- a/ant/org.eclipse.ant.ui/icons/full/obj16/ant_target_err.gif
+++ /dev/null
Binary files differ
diff --git a/ant/org.eclipse.ant.ui/icons/full/obj16/classpath.gif b/ant/org.eclipse.ant.ui/icons/full/obj16/classpath.gif
deleted file mode 100644
index 98ec3b3..0000000
--- a/ant/org.eclipse.ant.ui/icons/full/obj16/classpath.gif
+++ /dev/null
Binary files differ
diff --git a/ant/org.eclipse.ant.ui/icons/full/obj16/defaulttarget_obj.gif b/ant/org.eclipse.ant.ui/icons/full/obj16/defaulttarget_obj.gif
deleted file mode 100644
index 9e80502..0000000
--- a/ant/org.eclipse.ant.ui/icons/full/obj16/defaulttarget_obj.gif
+++ /dev/null
Binary files differ
diff --git a/ant/org.eclipse.ant.ui/icons/full/obj16/jar_l_obj.gif b/ant/org.eclipse.ant.ui/icons/full/obj16/jar_l_obj.gif
deleted file mode 100644
index 11e04e2..0000000
--- a/ant/org.eclipse.ant.ui/icons/full/obj16/jar_l_obj.gif
+++ /dev/null
Binary files differ
diff --git a/ant/org.eclipse.ant.ui/icons/full/obj16/main_tab.gif b/ant/org.eclipse.ant.ui/icons/full/obj16/main_tab.gif
deleted file mode 100644
index f9fb6b0..0000000
--- a/ant/org.eclipse.ant.ui/icons/full/obj16/main_tab.gif
+++ /dev/null
Binary files differ
diff --git a/ant/org.eclipse.ant.ui/icons/full/obj16/prop_ps.gif b/ant/org.eclipse.ant.ui/icons/full/obj16/prop_ps.gif
deleted file mode 100644
index ec0cba1..0000000
--- a/ant/org.eclipse.ant.ui/icons/full/obj16/prop_ps.gif
+++ /dev/null
Binary files differ
diff --git a/ant/org.eclipse.ant.ui/icons/full/obj16/property_obj.gif b/ant/org.eclipse.ant.ui/icons/full/obj16/property_obj.gif
deleted file mode 100644
index 836e65c..0000000
--- a/ant/org.eclipse.ant.ui/icons/full/obj16/property_obj.gif
+++ /dev/null
Binary files differ
diff --git a/ant/org.eclipse.ant.ui/icons/full/obj16/targetprivate_obj.gif b/ant/org.eclipse.ant.ui/icons/full/obj16/targetprivate_obj.gif
deleted file mode 100644
index 194a159..0000000
--- a/ant/org.eclipse.ant.ui/icons/full/obj16/targetprivate_obj.gif
+++ /dev/null
Binary files differ
diff --git a/ant/org.eclipse.ant.ui/icons/full/obj16/targetpublic_obj.gif b/ant/org.eclipse.ant.ui/icons/full/obj16/targetpublic_obj.gif
deleted file mode 100644
index 9bc6c91..0000000
--- a/ant/org.eclipse.ant.ui/icons/full/obj16/targetpublic_obj.gif
+++ /dev/null
Binary files differ
diff --git a/ant/org.eclipse.ant.ui/icons/full/obj16/task_obj.gif b/ant/org.eclipse.ant.ui/icons/full/obj16/task_obj.gif
deleted file mode 100644
index dcf0083..0000000
--- a/ant/org.eclipse.ant.ui/icons/full/obj16/task_obj.gif
+++ /dev/null
Binary files differ
diff --git a/ant/org.eclipse.ant.ui/icons/full/obj16/type.gif b/ant/org.eclipse.ant.ui/icons/full/obj16/type.gif
deleted file mode 100644
index 2db7604..0000000
--- a/ant/org.eclipse.ant.ui/icons/full/obj16/type.gif
+++ /dev/null
Binary files differ
diff --git a/ant/org.eclipse.ant.ui/icons/full/ovr16/error_co.gif b/ant/org.eclipse.ant.ui/icons/full/ovr16/error_co.gif
deleted file mode 100644
index 8612eaf..0000000
--- a/ant/org.eclipse.ant.ui/icons/full/ovr16/error_co.gif
+++ /dev/null
Binary files differ
diff --git a/ant/org.eclipse.ant.ui/plugin.properties b/ant/org.eclipse.ant.ui/plugin.properties
deleted file mode 100644
index c2da442..0000000
--- a/ant/org.eclipse.ant.ui/plugin.properties
+++ /dev/null
@@ -1,34 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2003 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Common Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/cpl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-pluginName = Ant UI
-providerName = Eclipse.org
-
-AntBuild.externalTools = Ant Build
-AntLaunchShortcut.label = &Ant Build
-
-AntEditor.name=Ant Editor
-AddBookmark.label=Add Boo&kmark...
-AddBookmark.tooltip=Add Bookmark...
-AddTask.label=Add &Task...
-AddTask.tooltip=Add Task...
-
-ActionDefinition.antContentAssistProposals.name=Ant Content Assist
-ActionDefinition.antContentAssistProposals.description=Content Assist in the Ant Editor
-
-CategoryView.antViews = Ant
-
-View.antView = Ant
-PreferencePage.antPreferences = Ant
-PreferencePage.antRuntimePreferences = Runtime
-PreferencePage.antEditorPreferences = Editor
-PopupMenu.runAnt = Run &Ant...
-PopupMenu.runAntTip = Run Ant With The Selected File
\ No newline at end of file
diff --git a/ant/org.eclipse.ant.ui/plugin.xml b/ant/org.eclipse.ant.ui/plugin.xml
deleted file mode 100644
index 0d4ca74..0000000
--- a/ant/org.eclipse.ant.ui/plugin.xml
+++ /dev/null
@@ -1,279 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-   id="org.eclipse.ant.ui"
-   name="%pluginName"
-   version="2.1.0"
-   provider-name="%providerName"
-   class="org.eclipse.ant.ui.internal.model.AntUIPlugin">
-
-	<runtime>
-      <library name="antui.jar">
-         <export name="*"/>
-         <packages prefixes="org.eclipse.ant.ui"/>
-      </library>
-   </runtime>
-   
-   <requires>
-   	  <import plugin="org.apache.ant"/>
-      <import plugin="org.apache.xerces"/>
-      <import plugin="org.eclipse.ant.core"/>
-      <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.ui.externaltools"/>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.debug.core"/>
-      <import plugin="org.eclipse.debug.ui"/>
-      <import plugin="org.eclipse.jdt.debug.ui"/>
-      <import plugin="org.eclipse.jdt.launching"/>  
-   </requires>
-   
-   <extension point="org.eclipse.ui.editors">
-      <editor
-            name="%AntEditor.name"
-            icon="icons/full/obj16/ant_buildfile.gif"
-            filenames="build.xml"
-            contributorClass="org.eclipse.ant.ui.internal.editor.AntEditorActionContributor"
-            class="org.eclipse.ant.ui.internal.editor.AntEditor"
-            id="org.eclipse.ant.ui.internal.editor.AntEditor">
-      </editor>
-   </extension>
-   
-    <extension point = "org.eclipse.debug.ui.launchConfigurationTabGroups">
-		<launchConfigurationTabGroup
-			id="org.eclipse.ant.ui.launchConfigurationTabGroup.ant"
-			type ="org.eclipse.ant.AntLaunchConfigurationType"
-			helpContextId="org.eclipse.ui.externaltools.launchConfigHelpContext.ant"
-			class="org.eclipse.ant.ui.internal.launchConfigurations.AntTabGroup">
-		</launchConfigurationTabGroup>
-	</extension>
-	
-	<extension point="org.eclipse.debug.core.launchConfigurationTypes">
-	    <launchConfigurationType
-	    	id = "org.eclipse.ant.AntLaunchConfigurationType"
-    		name = "%AntBuild.externalTools"
-    		delegate = "org.eclipse.ant.ui.internal.launchConfigurations.AntLaunchDelegate"
-	    	modes = "run"
-    		category = "org.eclipse.ui.externaltools">
-    	</launchConfigurationType>
-	 </extension>
-	 
-	 <extension point="org.eclipse.jdt.launching.classpathProviders">
-		 <classpathProvider
-			id = "org.eclipse.ant.ui.AntClasspathProvider"
-			class ="org.eclipse.ant.ui.internal.launchConfigurations.AntClasspathProvider">
-		 </classpathProvider>
-	</extension>
-	
-	<extension point="org.eclipse.ui.views">
-		<category 
-			id="org.eclipse.ant.ui.views"
-			name="%CategoryView.antViews">
-		</category>
-      <view
-            id="org.eclipse.ant.ui.views.AntView"
-            name="%View.antView"
-            icon="icons/full/cview16/ant_view.gif"
-            category="org.eclipse.ant.ui.views"
-            fastViewWidthRatio="0.40"
-            class="org.eclipse.ant.ui.internal.views.AntView">
-      </view>
-	</extension>
-	
-	<extension point="org.eclipse.ui.perspectiveExtensions">
-		<perspectiveExtension 
-    		targetID="org.eclipse.ui.resourcePerspective">
-    		<view id="org.eclipse.ant.ui.views.AntView" 
-       		 	relative="org.eclipse.ui.views.ContentOutline" 
-    			relationship="stack"
-    			visible="false"/> 
-    		<viewShortcut id="org.eclipse.ant.ui.views.AntView"/>
-	    </perspectiveExtension>
-    	<perspectiveExtension 
-    		targetID="org.eclipse.jdt.ui.JavaBrowsingPerspective">
-    		<view id="org.eclipse.ant.ui.views.AntView" 
-       		 	relative="org.eclipse.ui.views.ContentOutline" 
-    			relationship="stack"
-    			visible="false"/> 
-    		<viewShortcut id="org.eclipse.ant.ui.views.AntView"/>
-	    </perspectiveExtension>
-    	<perspectiveExtension 
-    		targetID="org.eclipse.jdt.ui.JavaPerspective">
-	    	<view id="org.eclipse.ant.ui.views.AntView" 
-	        	relative="org.eclipse.ui.views.ContentOutline" 
-	    		relationship="stack"
-	    		visible="false"/> 
-	    	<viewShortcut id="org.eclipse.ant.ui.views.AntView"/>
-	    </perspectiveExtension>
-	    <perspectiveExtension 
-	    	targetID="org.eclipse.jdt.ui.JavaHierarchyPerspective">
-	    	<view id="org.eclipse.ant.ui.views.AntView" 
-	        	relative="org.eclipse.ui.views.ContentOutline" 
-	    		relationship="stack"
-	    		visible="false"/> 
-	    	<viewShortcut id="org.eclipse.ant.ui.views.AntView"/>
-	    </perspectiveExtension>
-	    <perspectiveExtension 
-	    	targetID="org.eclipse.debug.ui.DebugPerspective">
-	    	<view id="org.eclipse.ant.ui.views.AntView" 
-	        	relative="org.eclipse.ui.views.ContentOutline" 
-	    		relationship="stack"
-	    		visible="false"/> 
-	    	<viewShortcut id="org.eclipse.ant.ui.views.AntView"/>
-	    </perspectiveExtension>
-	</extension>
-	
-	<extension point="org.eclipse.ui.preferencePages">
-		<page 
-			id="org.eclipse.ant.ui.AntPreferencePage" 
-			name="%PreferencePage.antPreferences"
-			class="org.eclipse.ant.ui.internal.preferences.AntPreferencePage">
-		</page>
-		<page 
-			id="org.eclipse.ant.ui.AntRuntimePreferencePage" 
-			name="%PreferencePage.antRuntimePreferences"
-			class="org.eclipse.ant.ui.internal.preferences.AntRuntimePreferencePage"
-			category="org.eclipse.ant.ui.AntPreferencePage">
-		</page>
-		<page
-			id="org.eclipse.ant.ui.AntEditorPreferencePage"
-			name="%PreferencePage.antEditorPreferences"
-			class="org.eclipse.ant.ui.internal.preferences.AntEditorPreferencePage"
-			category="org.eclipse.ant.ui.AntPreferencePage">
-		</page>
-	</extension>
-
-	<extension point="org.eclipse.ui.popupMenus">
-		<viewerContribution
-			targetID="org.eclipse.ant.ui.internal.editor.AntEditor.RulerContext"
-            id="org.eclipse.ant.ui.internal.editor.AntEditor.RulerContext">
-			<action
-				label="%AddTask.label"
-				helpContextId="org.eclipse.ui.AddTask_action_context"
-				tooltip="%AddTask.tooltip"
-				class="org.eclipse.ui.texteditor.TaskRulerAction"
-				menubarPath="additions"
-				id="org.eclipse.ui.texteditor.TaskRulerAction">
-			</action>
-			<action
-				label="%AddBookmark.label"
-				helpContextId="org.eclipse.ui.bookmark_action_context"
-				tooltip="%AddBookmark.tooltip"
-				class="org.eclipse.ui.texteditor.BookmarkRulerAction"
-				menubarPath="additions"
-				id="org.eclipse.ui.texteditor.BookmarkRulerAction">
-			</action>
-		</viewerContribution>
-		<objectContribution
-			id="org.eclipse.ant.ui.RunAnt"
-			objectClass="org.eclipse.core.resources.IFile"
-			adaptable="true"
-			nameFilter="*.xml">
-			<action
-				id="org.eclipse.ant.ui.RunAntAction"
-				label="%PopupMenu.runAnt"
-				tooltip="%PopupMenu.runAntTip"
-				menubarPath="additions"
-				enablesFor="1"
-				class="org.eclipse.ant.ui.internal.launchConfigurations.AntRunActionDelegate">
-			</action>
-		</objectContribution>			
-	</extension>
-	
-	<extension point="org.eclipse.ant.core.extraClasspathEntries">
-     	<extraClasspathEntry
-         	library="lib/antrunner.jar">
-      	</extraClasspathEntry>
-    </extension>
-	
-	<extension point="org.eclipse.debug.ui.consoleColorProviders">
-		<consoleColorProvider 
-			id="org.eclipse.ant.consoleColorProvider" 
-			class="org.eclipse.ant.ui.internal.launchConfigurations.AntConsoleColorProvider"
-			processType="org.eclipse.ant.ui.antProcess">
-		</consoleColorProvider>
-	</extension>
-	
-	<extension point="org.eclipse.debug.core.launchConfigurationTypes">
-    	<launchConfigurationType
-    		id = "org.eclipse.ant.AntBuilderLaunchConfigurationType"
-    		name = "%AntBuild.externalTools"
-    		delegate = "org.eclipse.ant.ui.internal.launchConfigurations.AntLaunchDelegate"
-    		modes = "run"
-    		category = "org.eclipse.ui.externaltools.builder">
-    	</launchConfigurationType>
-    </extension>
-    
-    <extension point = "org.eclipse.ui.externaltools.configurationDuplicationMaps">
-    	<configurationMap
-    		sourceType="org.eclipse.ant.AntLaunchConfigurationType"
-    		builderType="org.eclipse.ant.AntBuilderLaunchConfigurationType">
-    	</configurationMap>
-    </extension>
-    
-    <extension point = "org.eclipse.debug.ui.launchConfigurationTabGroups">
-		<launchConfigurationTabGroup
-			id="org.eclipse.ant.ui.launchConfigurationTabGroup.ant"
-			type ="org.eclipse.ant.AntLaunchConfigurationType"
-			helpContextId="org.eclipse.ui.externaltools.launchConfigHelpContext.ant"
-			class="org.eclipse.ant.ui.internal.launchConfigurations.AntTabGroup">
-		</launchConfigurationTabGroup>
-		<launchConfigurationTabGroup
-			id="org.eclipse.ant.ui.launchConfigurationTabGroup.ant.builder"
-			type ="org.eclipse.ant.AntBuilderLaunchConfigurationType"
-			helpContextId="org.eclipse.ui.externaltools.launchConfigHelpContext.ant_builder"
-			class="org.eclipse.ant.ui.internal.launchConfigurations.AntBuilderTabGroup">
-		</launchConfigurationTabGroup>
-	</extension>
-	
-	<extension point="org.eclipse.debug.ui.launchConfigurationTypeImages">
-		<launchConfigurationTypeImage
-			id="org.eclipse.ant.launchConfigurationTypeImage.ant"
-			configTypeID="org.eclipse.ant.AntLaunchConfigurationType"
-			icon="icons/full/obj16/ant.gif">
-		</launchConfigurationTypeImage>
-		<launchConfigurationTypeImage
-			id="org.eclipse.ant.launchConfigurationTypeImage.ant.builder"
-			configTypeID="org.eclipse.ant.AntBuilderLaunchConfigurationType"
-			icon="icons/full/obj16/ant.gif">
-		</launchConfigurationTypeImage>	
-	</extension>
-	
-	<extension point = "org.eclipse.debug.ui.launchShortcuts">
-		<shortcut
-			id="org.eclipse.ant.ui.antShortcut"
-			helpContextId="org.eclipse.ui.externaltools.launchShortcutHelpContext.antShortcut"
-			class="org.eclipse.ant.ui.internal.launchConfigurations.AntLaunchShortcut"
-			label="%AntLaunchShortcut.label"
-			icon="icons/full/obj16/ant.gif"
-			modes="run"
-			category ="org.eclipse.ui.externaltools">
-		</shortcut>
-	</extension>
-	
-	<!-- Console Extensions -->
-	<extension point = "org.eclipse.debug.ui.consoleLineTrackers">
-		<consoleLineTracker
-			id = "org.eclipse.ant.ui.javacLineTracker"
-			class = "org.eclipse.ant.ui.internal.console.JavacLineTracker"
-			processType = "org.eclipse.ant.ui.antProcess">
-		</consoleLineTracker>
-		<consoleLineTracker
-			id = "org.eclipse.ant.ui.taskLineTracker"
-			class = "org.eclipse.ant.ui.internal.console.TaskLineTracker"
-			processType = "org.eclipse.ant.ui.antProcess">
-		</consoleLineTracker>		
-		<consoleLineTracker
-			id = "org.eclipse.ant.ui.buildFailedTracker"
-			class = "org.eclipse.ant.ui.internal.console.BuildFailedTracker"
-			processType = "org.eclipse.ant.ui.antProcess">
-		</consoleLineTracker>		
-	</extension>
-	
-	<extension point = "org.eclipse.debug.core.statusHandlers">
-		<statusHandler
-			id="org.eclipse.ant.ui.statusHandler.runAntInit"
-			class="org.eclipse.ant.ui.internal.launchConfigurations.RunAntStatusHandler"
-			plugin ="org.eclipse.ant.ui"
-			code="1000">
-		</statusHandler>	
-	</extension>
-</plugin>
\ No newline at end of file
diff --git a/platform/org.eclipse.platform/.classpath b/platform/org.eclipse.platform/.classpath
deleted file mode 100644
index dbbc1d8..0000000
--- a/platform/org.eclipse.platform/.classpath
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-    <classpathentry kind="var" path="JRE_LIB" rootpath="JRE_SRCROOT" sourcepath="JRE_SRC"/>
-    <classpathentry kind="src" path="src"/>
-    <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/platform/org.eclipse.platform/.cvsignore b/platform/org.eclipse.platform/.cvsignore
deleted file mode 100644
index ba077a4..0000000
--- a/platform/org.eclipse.platform/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
diff --git a/platform/org.eclipse.platform/.eclipseproduct b/platform/org.eclipse.platform/.eclipseproduct
deleted file mode 100644
index 389203b..0000000
--- a/platform/org.eclipse.platform/.eclipseproduct
+++ /dev/null
@@ -1,3 +0,0 @@
-name=Eclipse Platform
-id=org.eclipse.platform
-version=2.1.0
\ No newline at end of file
diff --git a/platform/org.eclipse.platform/.project b/platform/org.eclipse.platform/.project
deleted file mode 100644
index 2f66f29..0000000
--- a/platform/org.eclipse.platform/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.platform</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/platform/org.eclipse.platform/about.html b/platform/org.eclipse.platform/about.html
deleted file mode 100644
index 9db411a..0000000
--- a/platform/org.eclipse.platform/about.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>20th June, 2002</p>	
-<h3>License</h3>
-<p>Eclipse.org makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Common Public License Version 1.0 (&quot;CPL&quot;).  A copy of the CPL is available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>.
-For purposes of the CPL, &quot;Program&quot; will mean the Content.</p>
-
-<h3>Contributions</h3>
-
-<p>If this Content is licensed to you under the terms and conditions of the CPL, any Contributions, as defined in the CPL, uploaded, submitted, or otherwise
-made available to Eclipse.org, members of Eclipse.org and/or the host of Eclipse.org web site, by you that relate to such
-Content are provided under the terms and conditions of the CPL and can be made available to others under the terms of the CPL.</p>
-
-<p>If this Content is licensed to you under license terms and conditions other than the CPL (&quot;Other License&quot;), any modifications, enhancements and/or
-other code and/or documentation (&quot;Modifications&quot;) uploaded, submitted, or otherwise made available to Eclipse.org, members of Eclipse.org and/or the
-host of Eclipse.org, by you that relate to such Content are provided under terms and conditions of the Other License and can be made available
-to others under the terms of the Other License.  In addition, with regard to Modifications for which you are the copyright holder, you are also
-providing the Modifications under the terms and conditions of the CPL and such Modifications can be made available to others under the terms of
-the CPL.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/platform/org.eclipse.platform/about.ini b/platform/org.eclipse.platform/about.ini
deleted file mode 100644
index c6c9da0..0000000
--- a/platform/org.eclipse.platform/about.ini
+++ /dev/null
@@ -1,38 +0,0 @@
-# about.ini
-# contains information about a feature
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# "%key" are externalized strings defined in about.properties
-# This file does not need to be translated.
-
-# Property "aboutText" contains blurb for "About" dialog (translated)
-# Maximum 15 lines and 75 characters per line.
-aboutText=%blurb
-
-# Property "windowImage" contains path to window icon (16x16)
-windowImage=eclipse.gif
-
-# Property "featureImage" contains path to feature image (32x32)
-featureImage=eclipse32.gif
-
-# Property "aboutImage" contains path to product image.
-# Full-sized product image: no larger than 500x330 pixels
-# Half-sized product image: no larger than 250x330 pixels
-# A full-sized product image is shown without the "aboutText" blurb.
-# A half-sized product image is shown with the "aboutText" blurb beside it.
-aboutImage=eclipse_lg.gif
-
-# Property "appName" contains name of the application (not translated)
-appName=Eclipse
-
-# Property "welcomePage" contains path to welcome page (special XML-based format)
-# ($nl$/ prefix to permit locale-specific translations of entire file)
-welcomePage=$nl$/welcome.xml
-
-# Property "welcomePerspective" contains the id of the perspective in which the
-# welcome page is to be opened.
-# optional
-
-# Property "tipsAndTricksHref" contains the Help topic href to a tips and tricks page 
-# optional
-tipsAndTricksHref=/org.eclipse.platform.doc.user/tips/platform_tips.html
-
diff --git a/platform/org.eclipse.platform/about.mappings b/platform/org.eclipse.platform/about.mappings
deleted file mode 100644
index bddaab4..0000000
--- a/platform/org.eclipse.platform/about.mappings
+++ /dev/null
@@ -1,6 +0,0 @@
-# about.mappings
-# contains fill-ins for about.properties
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file does not need to be translated.
-
-0=@build@
\ No newline at end of file
diff --git a/platform/org.eclipse.platform/about.properties b/platform/org.eclipse.platform/about.properties
deleted file mode 100644
index 002bc45..0000000
--- a/platform/org.eclipse.platform/about.properties
+++ /dev/null
@@ -1,28 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2003 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Common Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/cpl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-# about.properties
-# contains externalized strings for about.ini
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# fill-ins are supplied by about.mappings
-# This file should be translated.
-#
-# Do not translate any values surrounded by {}
-
-blurb=Eclipse Platform\n\
-\n\
-Version: {featureVersion}\n\
-Build id: {0}\n\
-\n\
-(c) Copyright IBM Corp. and others 2000, 2003.  All rights reserved.\n\
-Visit http://www.eclipse.org/platform\n\
-\n\
-This product includes software developed by the\n\
-Apache Software Foundation http://www.apache.org/
diff --git a/platform/org.eclipse.platform/build.properties b/platform/org.eclipse.platform/build.properties
deleted file mode 100644
index f8397e9..0000000
--- a/platform/org.eclipse.platform/build.properties
+++ /dev/null
@@ -1,35 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2003 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Common Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/cpl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-source.startup.jar=src/
-
-src.includes=about.html
-
-bin.includes=\
-about.html,\
-about.ini,\
-about.mappings,\
-about.properties,\
-eclipse_lg.gif,\
-eclipse.gif,\
-eclipse32.gif,\
-plugin_customization.ini,\
-plugin_customization.properties,\
-plugin.xml,\
-plugin.properties,\
-splash.bmp,\
-welcome.xml
-
-# note: the following files are intentionally not listed in bin.includes
-#    install.ini
-#    cpl-v10.html
-#    notice.html
-#    startup.jar
-# these files need to end up as root files in <install>/eclipse/
diff --git a/platform/org.eclipse.platform/cpl-v10.html b/platform/org.eclipse.platform/cpl-v10.html
deleted file mode 100644
index 36aa208..0000000
--- a/platform/org.eclipse.platform/cpl-v10.html
+++ /dev/null
@@ -1,125 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-<HEAD>
-<TITLE>Common Public License - v 1.0</TITLE>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-</HEAD>
-
-<BODY BGCOLOR="#FFFFFF" VLINK="#800000">
-
-
-<P ALIGN="CENTER"><B>Common Public License - v 1.0</B>
-<P><B></B><FONT SIZE="3"></FONT>
-<P><FONT SIZE="3"></FONT><FONT SIZE="2">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS COMMON PUBLIC LICENSE ("AGREEMENT").  ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.</FONT>
-<P><FONT SIZE="2"></FONT>
-<P><FONT SIZE="2"><B>1.  DEFINITIONS</B></FONT>
-<P><FONT SIZE="2">"Contribution" means:</FONT>
-
-<UL><FONT SIZE="2">a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and<BR CLEAR="LEFT">
-b) in the case of each subsequent Contributor:</FONT></UL>
-
-
-<UL><FONT SIZE="2">i)	 	changes to the Program, and</FONT></UL>
-
-
-<UL><FONT SIZE="2">ii)		additions to the Program;</FONT></UL>
-
-
-<UL><FONT SIZE="2">where such changes and/or additions to the Program originate from and are distributed by that particular Contributor.  </FONT><FONT SIZE="2">A Contribution 'originates' from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor's behalf.  </FONT><FONT SIZE="2">Contributions do not include additions to the Program which:  (i) are separate modules of software distributed in conjunction with the Program under their own license agreement, and (ii) are not derivative works of the Program.  </FONT></UL>
-
-<P><FONT SIZE="2"></FONT>
-<P><FONT SIZE="2">"Contributor" means any person or entity that distributes the Program.</FONT>
-<P><FONT SIZE="2"></FONT><FONT SIZE="2"></FONT>
-<P><FONT SIZE="2">"Licensed Patents " mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program.  </FONT>
-<P><FONT SIZE="2"></FONT><FONT SIZE="2"></FONT>
-<P><FONT SIZE="2"></FONT><FONT SIZE="2">"Program" means the Contributions distributed in accordance with this Agreement.</FONT>
-<P><FONT SIZE="2"></FONT>
-<P><FONT SIZE="2">"Recipient" means anyone who receives the Program under this Agreement, including all Contributors.</FONT>
-<P><FONT SIZE="2"><B></B></FONT>
-<P><FONT SIZE="2"><B>2.  GRANT OF RIGHTS</B></FONT>
-
-<UL><FONT SIZE="2"></FONT><FONT SIZE="2">a)	</FONT><FONT SIZE="2">Subject to the terms of this Agreement, each Contributor hereby grants</FONT><FONT SIZE="2"> Recipient a non-exclusive, worldwide, royalty-free copyright license to</FONT><FONT SIZE="2" COLOR="#FF0000"> </FONT><FONT SIZE="2">reproduce, prepare derivative works of, publicly display, publicly perform, distribute and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code and object code form.</FONT></UL>
-
-
-<UL><FONT SIZE="2"></FONT></UL>
-
-
-<UL><FONT SIZE="2"></FONT><FONT SIZE="2">b) 	Subject to the terms of this Agreement, each Contributor hereby grants </FONT><FONT SIZE="2">Recipient a non-exclusive, worldwide,</FONT><FONT SIZE="2" COLOR="#008000"> </FONT><FONT SIZE="2">royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in source code and object code form.  This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such addition of the Contribution causes such combination to be covered by the Licensed Patents.  The patent license shall not apply to any other combinations which include the Contribution.  No hardware per se is licensed hereunder.   </FONT></UL>
-
-
-<UL><FONT SIZE="2"></FONT></UL>
-
-
-<UL><FONT SIZE="2">c)	Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity.  Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise.  As a condition to exercising the rights and licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property rights needed, if any.  For example, if a third party patent license is required to allow Recipient to distribute the Program, it is Recipient's responsibility to acquire that license before distributing the Program.</FONT></UL>
-
-
-<UL><FONT SIZE="2"></FONT></UL>
-
-
-<UL><FONT SIZE="2">d)	Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement. </FONT></UL>
-
-
-<UL><FONT SIZE="2"></FONT></UL>
-
-<P><FONT SIZE="2"><B>3.  REQUIREMENTS</B></FONT>
-<P><FONT SIZE="2"><B></B>A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that:</FONT>
-
-<UL><FONT SIZE="2">a)	it complies with the terms and conditions of this Agreement; and</FONT></UL>
-
-
-<UL><FONT SIZE="2">b)	its license agreement:</FONT></UL>
-
-
-<UL><FONT SIZE="2">i)	effectively disclaims</FONT><FONT SIZE="2"> on behalf of all Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose; </FONT></UL>
-
-
-<UL><FONT SIZE="2">ii) 	effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits; </FONT></UL>
-
-
-<UL><FONT SIZE="2">iii)</FONT><FONT SIZE="2">	states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any other party; and</FONT></UL>
-
-
-<UL><FONT SIZE="2">iv)	states that source code for the Program is available from such Contributor, and informs licensees how to obtain it in a reasonable manner on or through a medium customarily used for software exchange.</FONT><FONT SIZE="2" COLOR="#0000FF"> </FONT><FONT SIZE="2" COLOR="#FF0000"></FONT></UL>
-
-
-<UL><FONT SIZE="2" COLOR="#FF0000"></FONT><FONT SIZE="2"></FONT></UL>
-
-<P><FONT SIZE="2">When the Program is made available in source code form:</FONT>
-
-<UL><FONT SIZE="2">a)	it must be made available under this Agreement; and </FONT></UL>
-
-
-<UL><FONT SIZE="2">b)	a copy of this Agreement must be included with each copy of the Program.  </FONT></UL>
-
-<P><FONT SIZE="2"></FONT><FONT SIZE="2" COLOR="#0000FF"><STRIKE></STRIKE></FONT>
-<P><FONT SIZE="2" COLOR="#0000FF"><STRIKE></STRIKE></FONT><FONT SIZE="2">Contributors may not remove or alter any copyright notices contained within the Program.  </FONT>
-<P><FONT SIZE="2"></FONT>
-<P><FONT SIZE="2">Each Contributor must identify itself as the originator of its Contribution, if any, in a manner that reasonably allows subsequent Recipients to identify the originator of the Contribution.  </FONT>
-<P><FONT SIZE="2"></FONT>
-<P><FONT SIZE="2"><B>4.  COMMERCIAL DISTRIBUTION</B></FONT>
-<P><FONT SIZE="2">Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and the like.  While this license is intended to facilitate the commercial use of the Program, the Contributor who includes the Program in a commercial product offering should do so in a manner which does not create potential liability for other Contributors.   Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor ("Commercial Contributor") hereby agrees to defend and indemnify every other Contributor ("Indemnified Contributor") against any losses, damages and costs (collectively "Losses") arising from claims, lawsuits and other legal actions brought by a third party against the Indemnified Contributor to the extent caused by the acts or omissions of such Commercial Contributor in connection with its distribution of the Program in a commercial product offering.  The obligations in this section do not apply to any claims or Losses relating to any actual or alleged intellectual property infringement.  In order to qualify, an Indemnified Contributor must: a) promptly notify the Commercial Contributor in writing of such claim, and b) allow the Commercial Contributor to control, and cooperate with the Commercial Contributor in, the defense and any related settlement negotiations.  The Indemnified Contributor may participate in any such claim at its own expense.</FONT>
-<P><FONT SIZE="2"></FONT>
-<P><FONT SIZE="2">For example, a Contributor might include the Program in a commercial product offering, Product X.  That Contributor is then a Commercial Contributor.  If that Commercial Contributor then makes performance claims, or offers warranties related to Product X, those performance claims and warranties are such Commercial Contributor's responsibility alone.  Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to those performance claims and warranties, and if a court requires any other Contributor to pay any damages as a result, the Commercial Contributor must pay those damages.</FONT>
-<P><FONT SIZE="2"></FONT><FONT SIZE="2" COLOR="#0000FF"></FONT>
-<P><FONT SIZE="2" COLOR="#0000FF"></FONT><FONT SIZE="2"><B>5.  NO WARRANTY</B></FONT>
-<P><FONT SIZE="2">EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is</FONT><FONT SIZE="2"> solely responsible for determining the appropriateness of using and distributing </FONT><FONT SIZE="2">the Program</FONT><FONT SIZE="2"> and assumes all risks associated with its exercise of rights under this Agreement</FONT><FONT SIZE="2">, including but not limited to the risks and costs of program errors, compliance with applicable laws, damage to or loss of data, </FONT><FONT SIZE="2">programs or equipment, and unavailability or interruption of operations</FONT><FONT SIZE="2">.  </FONT><FONT SIZE="2"></FONT>
-<P><FONT SIZE="2"></FONT>
-<P><FONT SIZE="2"></FONT><FONT SIZE="2"><B>6.  DISCLAIMER OF LIABILITY</B></FONT>
-<P><FONT SIZE="2"></FONT><FONT SIZE="2">EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES </FONT><FONT SIZE="2">(INCLUDING WITHOUT LIMITATION LOST PROFITS),</FONT><FONT SIZE="2"> 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 OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</FONT>
-<P><FONT SIZE="2"></FONT><FONT SIZE="2"></FONT>
-<P><FONT SIZE="2"><B>7.  GENERAL</B></FONT>
-<P><FONT SIZE="2"></FONT><FONT SIZE="2">If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.</FONT>
-<P><FONT SIZE="2"></FONT>
-<P><FONT SIZE="2">If Recipient institutes patent litigation against a Contributor with respect to a patent applicable to software (including a cross-claim or counterclaim in a lawsuit), then any patent licenses granted by that Contributor to such Recipient under this Agreement shall terminate as of the date such litigation is filed.  In addition, if Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such Recipient's patent(s), then such Recipient's rights granted under Section 2(b) shall terminate as of the date such litigation is filed. </FONT><FONT SIZE="2"></FONT>
-<P><FONT SIZE="2"></FONT>
-<P><FONT SIZE="2">All Recipient's rights under this Agreement shall terminate if it fails to comply with any of the material terms or conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such noncompliance.  If all Recipient's rights under this Agreement terminate, Recipient agrees to cease use and distribution of the Program as soon as reasonably practicable.  However, Recipient's obligations under this Agreement and any licenses granted by Recipient relating to the Program shall continue and survive.  </FONT><FONT SIZE="2"></FONT>
-<P><FONT SIZE="2"></FONT>
-<P><FONT SIZE="2"></FONT><FONT SIZE="2">Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted  and may only be modified in the following manner. The Agreement Steward reserves the right to </FONT><FONT SIZE="2">publish new versions (including revisions) of this Agreement from time to </FONT><FONT SIZE="2">time. No one other than the Agreement Steward has the right to modify this Agreement. IBM is the initial Agreement Steward.   IBM may assign the responsibility to serve as the Agreement Steward to a suitable separate entity.  </FONT><FONT SIZE="2">Each new version of the Agreement will be given a distinguishing version number.  The Program (including Contributions) may always be distributed subject to the version of the Agreement under which it was received. In addition, after a new version of the Agreement is published, Contributor may elect to distribute the Program (including its Contributions) under the new </FONT><FONT SIZE="2">version.  </FONT><FONT SIZE="2">Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, </FONT><FONT SIZE="2">by implication, estoppel or otherwise</FONT><FONT SIZE="2">.</FONT><FONT SIZE="2">  All rights in the Program not expressly granted under this Agreement are reserved.</FONT>
-<P><FONT SIZE="2"></FONT>
-<P><FONT SIZE="2">This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose.  Each party waives its rights to a jury trial in any resulting litigation.</FONT>
-<P><FONT SIZE="2"></FONT><FONT SIZE="2"></FONT>
-<P><FONT SIZE="2"></FONT>
-
-</BODY>
-
-</HTML>
\ No newline at end of file
diff --git a/platform/org.eclipse.platform/eclipse.gif b/platform/org.eclipse.platform/eclipse.gif
deleted file mode 100644
index 6ca37e0..0000000
--- a/platform/org.eclipse.platform/eclipse.gif
+++ /dev/null
Binary files differ
diff --git a/platform/org.eclipse.platform/eclipse32.gif b/platform/org.eclipse.platform/eclipse32.gif
deleted file mode 100644
index f71a8f6..0000000
--- a/platform/org.eclipse.platform/eclipse32.gif
+++ /dev/null
Binary files differ
diff --git a/platform/org.eclipse.platform/eclipse_lg.gif b/platform/org.eclipse.platform/eclipse_lg.gif
deleted file mode 100644
index 27c0838..0000000
--- a/platform/org.eclipse.platform/eclipse_lg.gif
+++ /dev/null
Binary files differ
diff --git a/platform/org.eclipse.platform/install.ini b/platform/org.eclipse.platform/install.ini
deleted file mode 100644
index aa240f5..0000000
--- a/platform/org.eclipse.platform/install.ini
+++ /dev/null
@@ -1,14 +0,0 @@
-# install.ini 
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file does not need to be translated.
-
-# Required property "feature.default.id" contains id of the primary feature
-# (the primary feature controls product branding, splash screens, and plug-in
-# customization)
-feature.default.id=org.eclipse.platform
-
-# Required property "feature.default.application" contains id of the core
-# application that gets control on startup. For products with a UI, this
-# is always org.eclipse.ui.workbench; for "headless" products, this is
-# product-specific.
-feature.default.application=org.eclipse.ui.workbench
diff --git a/platform/org.eclipse.platform/notice.html b/platform/org.eclipse.platform/notice.html
deleted file mode 100644
index 00d784b..0000000
--- a/platform/org.eclipse.platform/notice.html
+++ /dev/null
@@ -1,53 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-<title>Eclipse.org Software User Agreement</title>
-</head>
-
-<body lang="EN-US" link=blue vlink=purple>
-<h2>Eclipse.org Software User Agreement</h2>
-<p>17th June, 2002</p>
-
-<p>ECLIPSE.ORG MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-
-<p>Unless otherwise indicated, all Content made available by Eclipse.org is provided to you under the terms and conditions of the Common Public License Version 1.0
-   (&quot;CPL&quot;).  A copy of the CPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>.
-   For purposes of the CPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository (&quot;Repository&quot;) in CVS
-   modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
-
-<p>Content may be apportioned into plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;). A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. Files named &quot;feature.xml&quot; may contain a list of the names and version numbers of  the Plug-ins and/or Fragments associated with a Feature.   Plug-ins and Fragments are located in directories
-   named &quot;plugins&quot; and Features are located in directories named &quot;features&quot;.</p>
-  
-<p>Features may also include other Features (&quot;Included Features&quot;). Files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</p>
-  
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;). Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-	<li>The top-level (root) directory</li>
-	<li>Plug-in and Fragment directories</li>
-	<li>Subdirectories of the directory named &quot;src&quot; of certain Plug-ins</li>
-	<li>Feature directories</li>
-</ul>
-		
-<p>Note: if a Feature made available by Eclipse.org is installed using the Eclipse Update Manager, you must agree to a license (&quot;Feature Update License&quot;) during the
-installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them. Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot;.
-Such Abouts, Feature Licenses and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.  The Abouts, Feature Licenses and Feature Update Licenses may refer to the CPL or other license agreements, notices or terms and conditions . It is your obligation to read and accept all such all terms and conditions prior to use of the Content.
-If no About, Feature License or Feature Update License is provided, please contact Eclipse.org to determine what terms and conditions govern that particular Content.</p>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-</body>
-</html>
diff --git a/platform/org.eclipse.platform/plugin.properties b/platform/org.eclipse.platform/plugin.properties
deleted file mode 100644
index e0d87df..0000000
--- a/platform/org.eclipse.platform/plugin.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2003 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Common Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/cpl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-pluginName=Eclipse Platform
-providerName=Eclipse.org
\ No newline at end of file
diff --git a/platform/org.eclipse.platform/plugin.xml b/platform/org.eclipse.platform/plugin.xml
deleted file mode 100644
index e5ec1d0..0000000
--- a/platform/org.eclipse.platform/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="%pluginName"
-  id="org.eclipse.platform"
-  version="2.1.0"
-  provider-name="%providerName">
-  
-  <runtime>
-  	<library name="startup.jar" />
-  </runtime>
-  
-</plugin>
diff --git a/platform/org.eclipse.platform/plugin_customization.ini b/platform/org.eclipse.platform/plugin_customization.ini
deleted file mode 100644
index 2a8e223..0000000
--- a/platform/org.eclipse.platform/plugin_customization.ini
+++ /dev/null
@@ -1,16 +0,0 @@
-# plugin_customization.ini 
-# sets default values for plug-in-specific preferences
-# keys are qualified by plug-in id
-# e.g., com.example.acmeplugin/myproperty=myvalue
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# "%key" are externalized strings defined in plugin_customization.properties
-# This file does not need to be translated.
-
-# Property "org.eclipse.ui/defaultPerspectiveId" controls the 
-# perspective that the workbench opens initially
-org.eclipse.ui/defaultPerspectiveId=org.eclipse.ui.resourcePerspective
-
-
-
-
-
diff --git a/platform/org.eclipse.platform/plugin_customization.properties b/platform/org.eclipse.platform/plugin_customization.properties
deleted file mode 100644
index dfdc241..0000000
--- a/platform/org.eclipse.platform/plugin_customization.properties
+++ /dev/null
@@ -1,14 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2003 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Common Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/cpl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-# plugin_customization.properties
-# contains externalized strings for plugin_customization.ini
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
diff --git a/platform/org.eclipse.platform/splash.bmp b/platform/org.eclipse.platform/splash.bmp
deleted file mode 100644
index f298300..0000000
--- a/platform/org.eclipse.platform/splash.bmp
+++ /dev/null
Binary files differ
diff --git a/platform/org.eclipse.platform/src/org/eclipse/core/launcher/Main.java b/platform/org.eclipse.platform/src/org/eclipse/core/launcher/Main.java
deleted file mode 100644
index 4244704..0000000
--- a/platform/org.eclipse.platform/src/org/eclipse/core/launcher/Main.java
+++ /dev/null
@@ -1,1458 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.core.launcher;
-
-import java.io.*;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.net.*;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.*;
-
-/**
- * Startup class for Eclipse. Creates a class loader using
- * supplied URL of platform installation, loads and calls
- * the Eclipse Boot Loader.  The startup arguments are as follows:
- * <dl>
- * <dd>
- *    -application &lt;id&gt;: the identifier of the application to run
- * </dd>
- * <dd>
- *    -arch &lt;architecture&gt;: sets the processor architecture value
- * </dd>
- * <dd>
- *    -boot &lt;location&gt;: the location, expressed as a URL, of the platform's boot.jar.
- * <i>Deprecated: replaced by -configuration</i>
- * </dd>
- * <dd>
- *    -classloaderproperties [properties file]: activates platform class loader enhancements using 
- * the class loader properties file at the given location, if specified. The (optional) file argument 
- * can be either a file path or an absolute URL.
- * </dd>
- * <dd>
- *    -configuration &lt;location&gt;: the location, expressed as a URL, for the Eclipse platform 
- * configuration file. The configuration file determines the location of the Eclipse platform, the set 
- * of available plug-ins, and the primary feature.
- * </dd>
- * <dd>
- *    -consolelog : enables log to the console. Handy when combined with -debug
- * </dd>
- * <dd>
- *    -data &lt;location&gt;: sets the workspace location and the default location for projects
- * </dd>
- * <dd>
- *    -debug [options file]: turns on debug mode for the platform and optionally specifies a location
- * for the .options file. This file indicates what debug points are available for a
- * plug-in and whether or not they are enabled. If a location is not specified, the platform searches
- * for the .options file under the install directory.
- * </dd>
- * <dd>
- *    -dev [entries]: turns on dev mode and optionally specifies comma-separated class path entries
- * which are added to the class path of each plug-in
- * </dd>
- * <dd>
- *    -feature &lt;id&gt;: the identifier of the primary feature. The primary feature gives the launched 
- * instance of Eclipse its product personality, and determines the product customization 
- * information.
- * </dd>
- * <dd>
- *    -keyring &lt;location&gt;: the location of the authorization database on disk. This argument
- * has to be used together with the -password argument.
- * </dd>
- * <dd>
- *    -nl &lt;locale&gt;: sets the name of the locale on which Eclipse platform will run
- * </dd>
- * <dd>
- *    -nolazyregistrycacheloading : deactivates platform plug-in registry cache loading optimization. 
- * By default, extensions' configuration elements will be loaded from the registry cache (when 
- * available) only on demand, reducing memory footprint. This option will force the registry cache 
- * to be fully loaded at startup.
- * </dd>
- *  <dd>
- *    -nopackageprefixes: deactivates classloader package prefixes optimization
- * </dd> 
- *  <dd>
- *    -noregistrycache: bypasses the reading and writing of an internal plug-in registry cache file
- * </dd>
- * <dd>
- *    -os &lt;operating system&gt;: sets the operating system value
- * </dd>
- * <dd>
- *    -password &lt;passwd&gt;: the password for the authorization database
- * </dd>
- * <dd>
- *    -plugins &lt;location&gt;: the arg is a URL pointing to a file which specs the plugin 
- * path for the platform.  The file is in property file format where the keys are user-defined 
- * names and the values are comma separated lists of either explicit paths to plugin.xml 
- * files or directories containing plugins (e.g., .../eclipse/plugins). 
- * <i>Deprecated: replaced by -configuration</i>
- * </dd>
- * <dd>
- *    -plugincustomization &lt;properties file&gt;: the location of a properties file containing default 
- * settings for plug-in preferences. These default settings override default settings specified in the 
- * primary feature. Relative paths are interpreted relative to the directory that eclipse was started 
- * from.
- * </dd> 
- * <dd>
- *    -ws &lt;window system&gt;: sets the window system value
- * </dd>
- * </dl>
- */
-public class Main {
-	/**
-	 * Indicates whether this instance is running in debug mode.
-	 */
-	protected boolean debug = false;
-	
-	/**
-	 * The location of the launcher to run.
-	 */
-	protected String bootLocation = null;
-	
-	/**
-	 * The location of the install root
-	 */
-	protected String rootLocation = null;
-	
-	/**
-	 * The identifier of the application to run.
-	 */
-	protected String application;
-	
-	/**
-	 * The identifier of the feature to run.
-	 */
-	protected String feature;
-	
-	/**
-	 * The identifier of the configuration to use.
-	 */
-	protected String configuration;
-	
-	/**
-	 * The path for finding find plugins.
-	 */
-	protected URL pluginPathLocation;
-	
-	/**
-	 * The boot path location.
-	 */
-	protected String location;		
-		
-	/**
-	 * The class path entries.
-	 */
-	protected String devClassPath = null;
-	
-	/**
-	 * Indicates whether this instance is running in development mode.
-	 */
-	protected boolean inDevelopmentMode = false;
-
-	// splash handling
-	private String showSplash = null; 
-	private String endSplash = null; 
-	private boolean cmdInitialize = false;
-	private boolean cmdFirstUse = false;
-	private Process showProcess = null;
-	private boolean splashDown = false; 
-	private final Runnable endSplashHandler = new Runnable() {
-		public void run() {
-			takeDownSplash();
-		}
-	}; 
-	
-	// configuration properties
-	private Properties props = new Properties();
-	private HashMap featureIndex = new HashMap();
-	private String baseLocation = null;
-	
-	// constants
-	private static final String APPLICATION = "-application"; //$NON-NLS-1$
-	private static final String BOOT = "-boot"; //$NON-NLS-1$
-	private static final String INSTALL = "-install"; //$NON-NLS-1$
-	private static final String INITIALIZE = "-initialize"; //$NON-NLS-1$
-	private static final String DEBUG = "-debug"; //$NON-NLS-1$
-	private static final String DEV = "-dev"; //$NON-NLS-1$
-	private static final String DATA = "-data"; //$NON-NLS-1$
-	private static final String CONFIGURATION = "-configuration"; //$NON-NLS-1$
-	private static final String FEATURE = "-feature"; //$NON-NLS-1$
-	private static final String SHOWSPLASH = "-showsplash"; //$NON-NLS-1$
-	private static final String ENDSPLASH = "-endsplash"; //$NON-NLS-1$
-	private static final String FIRST_USE = "-firstuse"; //$NON-NLS-1$
-	private static final String SPLASH_IMAGE = "splash.bmp"; //$NON-NLS-1$
-	private static final String PI_BOOT = "org.eclipse.core.boot"; //$NON-NLS-1$
-	private static final String BOOTLOADER = "org.eclipse.core.boot.BootLoader"; //$NON-NLS-1$
-	private static final String BOOTJAR = "boot.jar"; //$NON-NLS-1$
-	private static final String PLATFORM_URL = "platform:/base/"; //$NON-NLS-1$
-	
-	// constants: configuration file location
-	private static final String CONFIG_FILE = "platform.cfg"; //$NON-NLS-1$
-	private static final String CONFIG_FILE_TEMP_SUFFIX = ".tmp"; //$NON-NLS-1$
-	private static final String CONFIG_FILE_BAK_SUFFIX = ".bak"; //$NON-NLS-1$
-	private static final String ARG_USER_DIR = "user.dir"; //$NON-NLS-1$
-	
-	// constants: configuration file elements
-	private static final String CFG_CORE_BOOT = "bootstrap." + PI_BOOT;  //$NON-NLS-1$
-	private static final String CFG_FEATURE_ENTRY = "feature"; //$NON-NLS-1$
-	private static final String CFG_FEATURE_ENTRY_DEFAULT = "feature.default.id"; //$NON-NLS-1$
-	private static final String CFG_FEATURE_ENTRY_ID = "id"; //$NON-NLS-1$
-	private static final String CFG_FEATURE_ENTRY_ROOT = "root"; //$NON-NLS-1$
-	private static final String CFG_EOF = "eof"; //$NON-NLS-1$
-
-	// log file handling
-	protected static final String SESSION = "!SESSION"; //$NON-NLS-1$
-	protected static final String ENTRY = "!ENTRY"; //$NON-NLS-1$
-	protected static final String MESSAGE = "!MESSAGE"; //$NON-NLS-1$
-	protected static final String STACK = "!STACK"; //$NON-NLS-1$
-	protected static final int ERROR = 4;
-	protected static final String PLUGIN_ID = "org.eclipse.core.launcher"; //$NON-NLS-1$
-	protected static File logFile = null;
-	protected static BufferedWriter log = null;
-	protected static String[] arguments;
-	protected static boolean newSession = true;
-
-	static class Identifier {
-		private static final String DELIM = ". "; //$NON-NLS-1$
-		private int major, minor, service;
-		private Identifier(int major, int minor, int service) {
-			super();
-			this.major = major;
-			this.minor = minor;
-			this.service = service;
-		}
-		private Identifier(String versionString) {
-			super();
-			StringTokenizer tokenizer = new StringTokenizer(versionString, DELIM);
-			
-			// major
-			if (tokenizer.hasMoreTokens())
-				major = Integer.parseInt(tokenizer.nextToken());
-
-			// minor
-			if (tokenizer.hasMoreTokens())
-				minor = Integer.parseInt(tokenizer.nextToken());
-
-			// service
-			if (tokenizer.hasMoreTokens())
-				service = Integer.parseInt(tokenizer.nextToken());
-		}
-		/**
-		 * Returns true if this id is considered to be greater than or equal to the given baseline.
-		 * e.g. 
-		 * 1.2.9 >= 1.3.1 -> false
-		 * 1.3.0 >= 1.3.1 -> false
-		 * 1.3.1 >= 1.3.1 -> true
-		 * 1.3.2 >= 1.3.1 -> true
-		 * 2.0.0 >= 1.3.1 -> true
-		 */
-		private boolean isGreaterEqualTo(Identifier minimum) {
-			if (major < minimum.major)
-				return false;
-			if (major > minimum.major)
-				return true;
-			// major numbers are equivalent so check minor
-			if (minor < minimum.minor)
-				return false;
-			if (minor > minimum.minor)
-				return true;
-			// minor numbers are equivalent so check service
-			return service >= minimum.service;
-		}
-	}
-/**
- * Executes the launch.
- * 
- * @return the result of performing the launch
- * @param args command-line arguments
- * @exception Exception thrown if a problem occurs during the launch
- */
-protected Object basicRun(String[] args) throws Exception {
-	// locate boot plugin (may return -dev mode variations)
-	URL[] bootPath = getBootPath(bootLocation);
-	
-	// splash handling is done here, because the default case needs to know
-	// the location of the boot plugin we are going to use
-	handleSplash(bootPath);
-	
-	// load the BootLoader and startup the platform
-	Class clazz = getBootLoader(bootPath);
-	Method method = clazz.getDeclaredMethod("run", new Class[] { String.class, URL.class, String.class, String[].class, Runnable.class }); //$NON-NLS-1$
-	try {
-		return method.invoke(clazz, new Object[] { application, pluginPathLocation, location, args, endSplashHandler });
-	} catch (InvocationTargetException e) {
-		if (e.getTargetException() instanceof Error)
-			throw (Error) e.getTargetException();
-		else
-			throw e;
-	}
-}
-/**
- * Returns a string representation of the given URL String.  This converts
- * escaped sequences (%..) in the URL into the appropriate characters.
- * NOTE: due to class visibility there is a copy of this method
- *       in InternalBootLoader
- */
-protected String decode(String urlString) {
-	//try to use Java 1.4 method if available
-	try {
-		Class clazz = URLDecoder.class;
-		Method method = clazz.getDeclaredMethod("decode", new Class[] {String.class, String.class});//$NON-NLS-1$
-		//first encode '+' characters, because URLDecoder incorrectly converts 
-		//them to spaces on certain class library implementations.
-		if (urlString.indexOf('+') >= 0) {
-			int len = urlString.length();
-			StringBuffer buf = new StringBuffer(len);
-			for (int i = 0; i < len; i++) {
-				char c = urlString.charAt(i);
-				if (c == '+')
-					buf.append("%2B");//$NON-NLS-1$
-				else
-					buf.append(c);
-			}
-			urlString = buf.toString();
-		}
-		Object result = method.invoke(null, new Object[] {urlString, "UTF-8"});//$NON-NLS-1$
-		if (result != null)
-			return (String)result;
-	} catch (Exception e) {
-		//JDK 1.4 method not found -- fall through and decode by hand
-	}
-	//decode URL by hand
-	boolean replaced = false;
-	byte[] encodedBytes = urlString.getBytes();
-	int encodedLength = encodedBytes.length;
-	byte[] decodedBytes = new byte[encodedLength];
-	int decodedLength = 0;
-	for (int i = 0; i < encodedLength; i++) {
-		byte b = encodedBytes[i];
-		if (b == '%') {
-			byte enc1 = encodedBytes[++i];
-			byte enc2 = encodedBytes[++i];
-			b = (byte) ((hexToByte(enc1) << 4) + hexToByte(enc2));
-			replaced = true;
-		}
-		decodedBytes[decodedLength++] = b;
-	}
-	if (!replaced)
-		return urlString;
-	try {
-		return new String(decodedBytes, 0, decodedLength, "UTF-8");//$NON-NLS-1$
-	} catch (UnsupportedEncodingException e) {
-		//use default encoding
-		return new String(decodedBytes, 0, decodedLength);
-	}
-}
-/**
- * Returns the result of converting a list of comma-separated tokens into an array
- * 
- * @return the array of string tokens
- * @param prop the initial comma-separated string
- */
-private String[] getArrayFromList(String prop) {
-	if (prop == null || prop.trim().equals("")) //$NON-NLS-1$
-		return new String[0];
-	Vector list = new Vector();
-	StringTokenizer tokens = new StringTokenizer(prop, ","); //$NON-NLS-1$
-	while (tokens.hasMoreTokens()) {
-		String token = tokens.nextToken().trim();
-		if (!token.equals("")) //$NON-NLS-1$
-			list.addElement(token);
-	}
-	return list.isEmpty() ? new String[0] : (String[]) list.toArray(new String[0]);
-}
-/**
- * Creates and returns a platform <code>BootLoader</code> which can be used to start
- * up and run the platform.  
- * 
- * @return the new boot loader
- * @param path search path for the BootLoader
- */
-public Class getBootLoader(URL[] path) throws Exception {
-	URLClassLoader loader = new URLClassLoader(path, null);
-	return loader.loadClass(BOOTLOADER);
-}
-/**
- * Returns the <code>URL</code>-based class path describing where the boot classes
- * are located when running in development mode.
- * 
- * @return the url-based class path
- * @param base the base location
- * @exception MalformedURLException if a problem occurs computing the class path
- */
-protected URL[] getDevPath(URL base) throws MalformedURLException {
-	URL url;
-	String devBase = base.toExternalForm();
-	if (!inDevelopmentMode) {
-		url = new URL(devBase + BOOTJAR);
-		return new URL[] {url};
-	}
-	String[] locations = getArrayFromList(devClassPath);
-	ArrayList result = new ArrayList(locations.length);
-	for (int i = 0; i < locations.length; i++) {
-		String spec = devBase + locations[i];
-		char lastChar = spec.charAt(spec.length() - 1);
-		if ((spec.endsWith(".jar") || (lastChar == '/' || lastChar == '\\'))) //$NON-NLS-1$
-			url = new URL (spec);
-		else
-			url = new URL(spec + "/"); //$NON-NLS-1$
-		//make sure URL exists before adding to path
-		if (new java.io.File(url.getFile()).exists())
-			result.add(url);
-	}
-	url = new URL(devBase + BOOTJAR);
-	if (new java.io.File(url.getFile()).exists())
-		result.add(url);
-	return (URL[])result.toArray(new URL[result.size()]);
-}
-
-/**
- * Returns the <code>URL</code>-based class path describing where the boot classes are located.
- * 
- * @return the url-based class path
- * @param base the base location
- * @exception MalformedURLException if a problem occurs computing the class path
- */
-protected URL[] getBootPath(String base) throws MalformedURLException {
-	URL url = null;
-	// if the given location is not null, assume it is correct and use it. 
-	if (base != null) {
-		url = new URL(base);
-		if (debug)
-			System.out.println("Boot URL: " + url.toExternalForm()); //$NON-NLS-1$
-		return new URL[] {url};	
-	}
-	// search for boot in root location
-	URL[] result = null;
-	url = new URL(rootLocation);
-	String path = url.getFile();
-	path = searchForBoot(path);
-	// add on any dev path elements
-	url = new URL(url.getProtocol(), url.getHost(), url.getPort(), path);
-	result = getDevPath(url);
-	if (debug) {
-		System.out.println("Boot URL:"); //$NON-NLS-1$
-		for (int i = 0; i < result.length; i++)
-			System.out.println("    " + result[i].toExternalForm()); //$NON-NLS-1$
-	}
-	return result;
-}
-
-/**
- * Searches for a boot directory starting in the "plugins" subdirectory
- * of the given location.  If one is found then this location is returned; 
- * otherwise an exception is thrown.
- * 
- * @return the location where boot directory was found
- * @param start the location to begin searching at
- */
-protected String searchForBoot(String start) {
-	FileFilter filter = new FileFilter() {
-		public boolean accept(File candidate) {
-			return candidate.isDirectory() &&
-				(candidate.getName().equals(PI_BOOT)
-				|| candidate.getName().startsWith(PI_BOOT + "_")); //$NON-NLS-1$
-		}
-	};
-	File[] boots = new File(start, "plugins").listFiles(filter); //$NON-NLS-1$
-	if (boots == null)
-		throw new RuntimeException("Could not find bootstrap code. Check location of boot plug-in or specify -boot."); //$NON-NLS-1$
-	String result = null;
-	Object maxVersion = null;
-	for (int i = 0; i < boots.length; i++) {
-		String name = boots[i].getName();
-		int index = name.indexOf('_');
-		String version;
-		Object currentVersion;
-		if (index == -1)
-			version = "";  //$NON-NLS-1$ // Note: directory with version suffix is always > than directory without version suffix
-		else
-			version = name.substring(index + 1);
-		currentVersion = getVersionElements(version);			
-		if (maxVersion == null) {
-			result = boots[i].getAbsolutePath();
-			maxVersion = currentVersion;
-		} else {
-			if (compareVersion((Object[])maxVersion, (Object[])currentVersion) < 0) {
-				result = boots[i].getAbsolutePath();
-				maxVersion = currentVersion;
-			}
-		}
-	}
-	if (result == null)
-		throw new RuntimeException("Could not find bootstrap code. Check location of boot plug-in or specify -boot."); //$NON-NLS-1$
-	return result.replace(File.separatorChar, '/') + "/"; //$NON-NLS-1$
-}
-
-/**
- * Compares version strings. 
- * @return result of comparison, as integer;
- * <code><0</code> if left < right;
- * <code>0</code> if left == right;
- * <code>>0</code> if left > right;
- */
-private int compareVersion(Object[] left, Object[] right) {
-	
-	int result = ((Integer)left[0]).compareTo((Integer)right[0]); // compare major
-	if (result != 0)
-		return result;
-		
-	result = ((Integer)left[1]).compareTo((Integer)right[1]); // compare minor
-	if (result != 0)
-		return result;
-		
-	result = ((Integer)left[2]).compareTo((Integer)right[2]); // compare service
-	if (result != 0)
-		return result;
-		
-	return ((String)left[3]).compareTo((String)right[3]); // compare qualifier
-}
-
-/**
- * Do a quick parse of version identifier so its elements can be correctly compared.
- * If we are unable to parse the full version, remaining elements are initialized
- * with suitable defaults.
- * @return an array of size 4; first three elements are of type Integer (representing
- * major, minor and service) and the fourth element is of type String (representing
- * qualifier). Note, that returning anything else will cause exceptions in the caller.
- */
-private Object[] getVersionElements(String version) {
-	Object[] result = {new Integer(0), new Integer(0), new Integer(0), ""}; //$NON-NLS-1$
-	StringTokenizer t = new StringTokenizer(version, "."); //$NON-NLS-1$
-	String token;
-	int i = 0;
-	while(t.hasMoreTokens() && i<4) {
-		token = t.nextToken();
-		if (i<3) {
-			// major, minor or service ... numeric values
-			try {
-				result[i++] = new Integer(token);
-			} catch(Exception e) {
-				// invalid number format - use default numbers (0) for the rest
-				break; 
-			}
-		} else {
-			// qualifier ... string value
-			result[i++] = token;
-		}
-	}
-	return result;
-}
-
-/**
- * Runs the platform with the given arguments.  The arguments must identify
- * an application to run (e.g., <code>-application com.example.application</code>).
- * After running the application <code>System.exit(N)</code> is executed.
- * The value of N is derived from the value returned from running the application.
- * If the application's return value is an <code>Integer</code>, N is this value.
- * In all other cases, N = 0.
- * <p>
- * Clients wishing to run the platform without a following <code>System.exit</code>
- * call should use <code>run()</code>.
- *
- * @see #run
- * 
- * @param args the command line arguments
- */
-public static void main(String[] args) {
-	Object result = null;
-	arguments = args;
-	// Check to see if we are running with a compatible VM.
-	// If not, then return exit code "14" which will be recognized
-	// by the executable and an appropriate message will be displayed
-	// to the user.
-	if (!isCompatible())
-		System.exit(14);
-	// Check to see if there is already a platform running in
-	// this workspace. If there is, then return an exit code of "15" which
-	// will be recognized by the executable and an appropriate message
-	// will be displayed to the user.
-	if (isAlreadyRunning())
-		System.exit(15);
-	Main launcher = new Main();
-	try {
-		result = launcher.run(args);
-	} catch (Throwable e) {
-		// try and take down the splash screen.
-		launcher.takeDownSplash();
-		log("Exception launching the Eclipse Platform:"); //$NON-NLS-1$
-		log(e);
-		// Return "unlucky" 13 as the exit code. The executable will recognize
-		// this constant and display a message to the user telling them that
-		// there is information in their log file.
-		System.exit(13);
-	}
-	int exitCode = result instanceof Integer ? ((Integer) result).intValue() : 0;
-	System.exit(exitCode);
-}
-
-/**
- * Runs this launcher with the arguments specified in the given string.
- * 
- * @param argString the arguments string
- * @exception Exception thrown if a problem occurs during launching
- */
-public static void main(String argString) throws Exception {
-	Vector list = new Vector(5);
-	for (StringTokenizer tokens = new StringTokenizer(argString, " "); tokens.hasMoreElements();) //$NON-NLS-1$
-		list.addElement((String) tokens.nextElement());
-	main((String[]) list.toArray(new String[list.size()]));
-}
-
-/**
- * Processes the command line arguments
- * 
- * @return the arguments to pass through to the launched application
- * @param args the command line arguments
- */
-protected String[] processCommandLine(String[] args) throws Exception {
-	int[] configArgs = new int[100];
-	configArgs[0] = -1; // need to initialize the first element to something that could not be an index.
-	int configArgIndex = 0;
-	for (int i = 0; i < args.length; i++) {
-		boolean found = false;
-		// check for args without parameters (i.e., a flag arg)
-		// check if debug should be enabled for the entire platform
-		if (args[i].equalsIgnoreCase(DEBUG)) {
-			debug = true;
-			// passed thru this arg (i.e., do not set found = true
-			continue;
-		}
-		
-		// check if this is initialization pass
-		if (args[i].equalsIgnoreCase(INITIALIZE)) {
-			cmdInitialize = true;
-			// passed thru this arg (i.e., do not set found = true
-			continue;
-		}
-		
-		// check if development mode should be enabled for the entire platform
-		// If this is the last arg or there is a following arg (i.e., arg+1 has a leading -), 
-		// simply enable development mode.  Otherwise, assume that that the following arg is
-		// actually some additional development time class path entries.  This will be processed below.
-		if (args[i].equalsIgnoreCase(DEV) && ((i + 1 == args.length) || ((i + 1 < args.length) && (args[i + 1].startsWith("-"))))) { //$NON-NLS-1$
-			inDevelopmentMode = true;
-			// do not mark the arg as found so it will be passed through
-			continue;
-		}
-
-		// done checking for args.  Remember where an arg was found 
-		if (found) {
-			configArgs[configArgIndex++] = i;
-			continue;
-		}
-		// check for args with parameters. If we are at the last argument or if the next one
-		// has a '-' as the first character, then we can't have an arg with a parm so continue.
-		if (i == args.length - 1 || args[i + 1].startsWith("-"))  //$NON-NLS-1$
-			continue;
-		String arg = args[++i];
-
-		// look for the laucher to run
-		if (args[i - 1].equalsIgnoreCase(BOOT)) {
-			bootLocation = arg;
-			found = true;
-		}
-
-		// look explicitly set install root
-		if (args[i - 1].equalsIgnoreCase(INSTALL)) {
-			rootLocation = arg;
-			found = true;
-		}
-
-		// look for the development mode and class path entries.  
-		if (args[i - 1].equalsIgnoreCase(DEV)) {
-			inDevelopmentMode = true;
-			devClassPath = arg;
-			continue;
-		}
-
-		// look for the location of workspace
-		if (args[i - 1].equalsIgnoreCase(DATA)) {
-			baseLocation = arg;
-			continue; // pass the arg on
-		}
-
-		// look for the application to run
-		if (args[i - 1].equalsIgnoreCase(APPLICATION)) {
-			application = arg;
-			found = true;
-		}
-
-		// look for the feature to run
-		if (args[i - 1].equalsIgnoreCase(FEATURE)) {
-			feature = arg;
-			continue; // pass the arg on [20063]
-		}
-
-		// look for the configuration to use
-		if (args[i - 1].equalsIgnoreCase(CONFIGURATION)) {
-			configuration = arg;
-			// we  mark -configuration for removal. It will be
-			// reinserted after we determine the actual URL of
-			// the configuration file to use.
-			found = true;
-		}
-
-		// look for token to use to show the splash screen
-		if (args[i - 1].equalsIgnoreCase(SHOWSPLASH)) {
-			showSplash = arg;
-			found = true;
-		}
-
-		// look for token to use to end the splash screen
-		if (args[i - 1].equalsIgnoreCase(ENDSPLASH)) {
-			endSplash = arg;
-			found = true;
-		}
-
-		// done checking for args.  Remember where an arg was found 
-		if (found) {
-			configArgs[configArgIndex++] = i - 1;
-			configArgs[configArgIndex++] = i;
-		}
-	}
-	// remove all the arguments consumed by this argument parsing
-	if (configArgIndex == 0)
-		return args;
-	String[] passThruArgs = new String[args.length - configArgIndex];
-	configArgIndex = 0;
-	int j = 0;
-	for (int i = 0; i < args.length; i++) {
-		if (i == configArgs[configArgIndex])
-			configArgIndex++;
-		else
-			passThruArgs[j++] = args[i];
-	}
-	return passThruArgs;
-}
-/**
- * Runs the application to be launched.
- * 
- * @return the return value from the launched application
- * @param args the arguments to pass to the application
- * @exception thrown if a problem occurs during launching
- */
-public Object run(String[] args) throws Exception {
-	String[] passThruArgs = processCommandLine(args);
-	passThruArgs = processConfiguration(passThruArgs);
-	return basicRun(passThruArgs);
-}
-
-/*
- * After the command line arguments have been processed, we try
- * to locate and load the platform configuration file. It contains
- * information maintained by the install/ update support. In 
- * particular, the following are needed at this point
- * in the startup sequence:
- * -> if -boot was not specified, which boot.jar to load 
- *    BootLoader from (original core.boot plugin may have been updated)
- * -> if -feature was not specified, what is the default feature
- *    (product packagers can set the default)
- * -> if we were requested to put up the splash (-showsplash
- *    was specified), which one (based on defaulted or
- *    specified feature information)
- * Note, that if we can't find the platform configuration file,
- * or it does not contain the information we are looking for,
- * the startup support ends up computing "reasonable" defaults
- * as before (based on relative locations within the file system)
- */
-private String[] processConfiguration(String[] passThruArgs) throws MalformedURLException {
-	// get install root location, if not specified
-	if (rootLocation == null)
-		rootLocation = getRootURL().toExternalForm();
-		
-	// attempt to locate configuration file
-	URL configURL = null;
-	if (configuration != null && !configuration.trim().equals("")) { //$NON-NLS-1$
-		configuration = configuration.replace(File.separatorChar, '/');
-		if (configuration.equalsIgnoreCase(ARG_USER_DIR)) {
-			// configuration is in current working directory
-			String tmp = System.getProperty("user.dir"); //$NON-NLS-1$
-			if (!tmp.endsWith(File.separator))
-				tmp += File.separator;
-			configURL = new URL("file:" + tmp.replace(File.separatorChar,'/') + CONFIG_FILE); //$NON-NLS-1$
-		} else if(configuration.endsWith("/")) { //$NON-NLS-1$
-			// configuration specified as directory URL		
-			configURL = new URL(configuration + CONFIG_FILE);
-		} else {
-			// configuration specified down to a file			
-			configURL = new URL(configuration);
-		}
-	} else {
-		// configuration not specified - defer to BootLoader
-	}
-		
-	// load configuration
-	loadConfiguration(configURL);
-	
-	// get boot url, if none was specified
-	if (bootLocation == null) {
-		String urlString = loadAttribute(props, CFG_CORE_BOOT, null);
-		if (urlString != null) {
-			try {
-				urlString = resolve(urlString);
-				URL bootDir = new URL(urlString);
-				URL bootURL = new URL(bootDir, BOOTJAR);
-				if (bootDir.getProtocol().equals("file")) { //$NON-NLS-1$
-					File jar = new File(bootURL.getFile());
-					if (jar.exists())
-						// verify boot dir exists
-						bootLocation = bootURL.toExternalForm();
-					else
-						// Somebody turned the tables on us. The info in
-						// platform.cfg is stale, or the workspace is being used
-						// with a new install. Do default search for boot and force
-						// "first use" processing (optimistic reconciliation)
-						cmdFirstUse = true;
-				} else
-					bootLocation = bootURL.toExternalForm();
-			} catch(MalformedURLException e) {
-				// continue ... will do default search for boot
-			}
-		}
-	}
-		
-	// reconstruct command line arguments for configuration elements
-	// (-boot and -application are not passed to BootLoader)
-	if (configURL == null && rootLocation == null)
-		return passThruArgs;
-			
-	ArrayList args = new ArrayList(Arrays.asList(passThruArgs));
-	
-	if (configURL != null) {
-		args.add(CONFIGURATION);
-		args.add(decode(configURL.toExternalForm()));
-	}
-	
-	if (cmdFirstUse) {
-		args.add(FIRST_USE);
-	}
-	
-	// pass root location downstream
-	if (rootLocation != null) {
-		args.add(INSTALL);
-		args.add(rootLocation);
-	}
-	
-	return (String[])args.toArray(new String[0]);
-}
-
-/**
- * Returns url of the location this class was loaded from
- */
-private URL getRootURL() throws MalformedURLException {
-	if (rootLocation != null)
-		return new URL(rootLocation);
-		
-	URL	url = getClass().getProtectionDomain().getCodeSource().getLocation();
-	String path = decode(url.getFile());
-	path = new File(path).getAbsolutePath().replace(File.separatorChar,'/');
-	if (path.endsWith(".jar")) //$NON-NLS-1$
-		path = path.substring(0, path.lastIndexOf("/")+1); //$NON-NLS-1$
-	url = new URL(url.getProtocol(), url.getHost(), url.getPort(), path);
-	rootLocation = url.toExternalForm();
-	return url;
-}
-
-/*
- * Load the configuration file. If not specified, default to the workspace
- */
-private void loadConfiguration(URL url) {
-	if (url == null) {
-		// configuration URL was not specified ..... search
-		String base = baseLocation;
-		if (base == null) {
-			// determine default workspace
-			base = System.getProperty("user.dir"); //$NON-NLS-1$
-			if (!base.endsWith(File.separator))
-				base += File.separator;
-			base += "workspace" + File.separator; //$NON-NLS-1$
-		} else {
-			base = base.replace('/',File.separatorChar);
-		}
-		if (!base.endsWith(File.separator))
-			base += File.separator;
-		
-		File cfg = null;	
-		try {
-			// first look for configuration in base location (workspace or as specified)
-			cfg = new File(base + ".metadata" + File.separator + ".config" + File.separator + CONFIG_FILE); //$NON-NLS-1$ //$NON-NLS-2$
-			url = new URL("file", null, 0, cfg.getAbsolutePath()); //$NON-NLS-1$
-			props = loadProperties(url);
-			if (debug)
-				System.out.println("Startup: using configuration " + url.toString()); //$NON-NLS-1$
-			return; // we're done looking
-		} catch(IOException e) {
-			// continue ...
-		}
-		
-		try {
-			// look for configuration in install root (set up by -initialize)
-			String install = getRootURL().getFile().replace('/',File.separatorChar);
-			if (!install.endsWith(File.separator))
-				install += File.separator;
-			cfg = new File(install + ".config" + File.separator + CONFIG_FILE); //$NON-NLS-1$
-			url = new URL("file", null, 0, cfg.getAbsolutePath()); //$NON-NLS-1$
-			props = loadProperties(url);
-			if (debug)
-				System.out.println("Startup: using configuration " + url.toString()); //$NON-NLS-1$
-		} catch(IOException e) {
-			// continue ...
-			if (debug)
-				System.out.println("Startup: unable to load configuration\n" + e); //$NON-NLS-1$
-		}
-	} else {
-		try {
-			// configuration url was specified ... use it
-			props = loadProperties(url);
-			if (debug)
-				System.out.println("Startup: using configuration " + url.toString()); //$NON-NLS-1$
-		} catch(IOException e) {
-			// continue ...
-			if (debug)
-				System.out.println("Startup: unable to load configuration\n" + e); //$NON-NLS-1$
-		}
-	}
-}
-
-private Properties loadProperties(URL url) throws IOException {
-		
-	// try to load saved configuration file (watch for failed prior save())
-	Properties props = null;
-	IOException originalException = null;
-	try {
-		props = load(url, null); // try to load config file
-	} catch(IOException e1) {
-		originalException = e1;
-		try {
-			props = load(url, CONFIG_FILE_TEMP_SUFFIX); // check for failures on save
-		} catch(IOException e2) {
-			try {
-				props = load(url, CONFIG_FILE_BAK_SUFFIX); // check for failures on save
-			} catch(IOException e3) {
-				throw originalException; // we tried, but no config here ...
-			}
-		}
-	}
-	
-	return props;
-}
- 
-/*
- * Load the configuration  
- */ 
-private Properties load(URL url, String suffix) throws IOException {
-	// figure out what we will be loading
-	if (suffix != null && !suffix.equals("")) //$NON-NLS-1$
-		url = new URL(url.getProtocol(),url.getHost(),url.getPort(),url.getFile()+suffix);
-			
-	// try to load saved configuration file
-	Properties props = new Properties();
-	InputStream is = null;
-	try {
-		is = url.openStream();
-		props.load(is);
-		// check to see if we have complete config file
-		if (!CFG_EOF.equals(props.getProperty(CFG_EOF))) {
-			throw new IOException();
-		}
-	} finally {
-		if (is!=null) {
-			try {
-				is.close();
-			} catch(IOException e) {
-				//ignore failure to close
-			}
-		}
-	}
-	
-	// load feature index
-	if (props != null) {
-		String id = props.getProperty(CFG_FEATURE_ENTRY+".0."+CFG_FEATURE_ENTRY_ID); //$NON-NLS-1$
-		for (int i=1; id != null; i++) {
-			featureIndex.put(id, Integer.toString(i-1));
-			id = props.getProperty(CFG_FEATURE_ENTRY+"."+i+"."+CFG_FEATURE_ENTRY_ID); //$NON-NLS-1$ //$NON-NLS-2$
-		}
-	}
-	
-	return props;
-}	
-	
-/*
- * Load a configuration attribute
- */	
-private String loadAttribute(Properties props, String name, String dflt) {
-	if (props == null)
-		return dflt;
-		
-	String prop = props.getProperty(name);
-	if (prop == null)
-		return dflt;
-	else
-		return prop.trim();
-}
-
-/*
- * Handle splash screen.
- * We support 2 startup scenarios:
- * 
- * (1) the executable launcher put up the splash screen. In that
- *     scenario we are invoked with -endsplash command which is
- *     fully formed to take down the splash screen
- * 
- * (2) the executable launcher did not put up the splash screen,
- *     but invokes Eclipse with partially formed -showsplash command.
- *     In this scenario we determine which splash to display (based on 
- *     feature information) and then call -showsplash command. 
- * 
- * In both scenarios we pass a handler (Runnable) to the platform.
- * The handler is called as a result of the launched application calling
- * Platform.endSplash(). In the first scenario this results in the
- * -endsplash command being executed. In the second scenarios this
- * results in the process created as a result of the -showsplash command
- * being destroyed.
- * 
- * @param bootPath search path for the boot plugin
- */
-private void handleSplash(URL[] bootPath) {
-	
-	// run without splash if we are initializing
-	if (cmdInitialize) {
-		showSplash = null;
-		endSplash = null;
-		return;
-	}
-	
-	// if -endsplash is specified, use it and ignore any -showsplash command
-	if (endSplash != null) {
-		showSplash = null;
-		return;
-	}
-	
-	// check if we are running without a splash screen
-	if (showSplash == null)
-		return;
-
-	// determine the splash path
-	String path  = getSplashPath(bootPath);
-	if (debug && path != null) {
-		System.out.println("Startup: splash path = "+path); //$NON-NLS-1$
-	}
-		
-	// Parse the showsplash command into its separate arguments.
-	// The command format is: 
-	//     <executable> -show <magicArg> [<splashPath>]
-	// If either the <executable> or the <splashPath> arguments contain a
-	// space, Runtime.getRuntime().exec( String ) will not work, even
-	// if both arguments are enclosed in double-quotes. The solution is to
-	// use the Runtime.getRuntime().exec( String[] ) method.
-	String[] cmd = new String[ (path != null ? 4 : 3) ];
-	int sIndex = 0;
-	int eIndex = showSplash.indexOf( " -show" ); //$NON-NLS-1$
-	if (eIndex == -1)
-		return; // invalid -showsplash command
-	cmd[0] = showSplash.substring( sIndex, eIndex );
-	sIndex = eIndex + 1;
-	eIndex = showSplash.indexOf( " ", sIndex ); //$NON-NLS-1$
-	if (eIndex == -1)
-		return; // invalid -showsplash command
-	cmd[1] = showSplash.substring( sIndex, eIndex );
-	cmd[2] = showSplash.substring( eIndex+1 );
-	if (path != null)
-		cmd[3] = path;
-	try {
-		showProcess = Runtime.getRuntime().exec(cmd);
-	} catch (Exception e) {
-		// continue without splash ...
-		log("Exception showing splash screen."); //$NON-NLS-1$
-		log(e);
-	}
-	return;
-}
-
-/*
- * take down the splash screen. Try both take-down methods just in case
- * (only one should ever be set)
- */
-private void takeDownSplash() {
-	if (splashDown) // splash is already down
-		return;
-		
-	// check if -endsplash was specified
-	if (endSplash != null) {
-		try {
-			Runtime.getRuntime().exec(endSplash);
-		} catch (Exception e) {
-			//ignore failure to end splash
-		}
-	}
-	
-	// check if -showsplash was specified and executed
-	if (showProcess != null) {
-		showProcess.destroy();
-		showProcess = null;
-	}
-	
-	splashDown = true;
-}
-
-/*
- * Return path of the splash image to use
- */
-private String getSplashPath(URL[] bootPath) {
-	
-	// see if we can get a splash for the launched feature
-	String[] featurePath = getFeatureRoot();	
-	String path = lookupSplash(featurePath);
-	if (path != null)
-		return path;
-	
-	// no feature path, default to current boot plugin
-	String temp = bootPath[0].getFile(); // take the first path element
-	temp = temp.replace('/', File.separatorChar);
-	int ix = temp.lastIndexOf("plugins"+File.separator); //$NON-NLS-1$
-	if (ix != -1) {
-		int pix = temp.indexOf(File.separator, ix+8);
-		if (pix != -1) {
-			temp = temp.substring(0,pix);
-			path = lookupSplash(new String[] { temp });
-			return path;
-		}
-	}
-		
-	// sorry, no splash found
-	return null;
-}
-
-/*
- * Do a locale-sensitive lookup of splash image
- */
- private String lookupSplash(String[] searchPath) {
- 	if (searchPath == null)
- 		return null;
- 	
- 	// get current locale information
- 	String localePath = Locale.getDefault().toString().replace('_', File.separatorChar);
- 	
- 	// search the specified path
- 	while (localePath != null) {
- 		String suffix;
- 		if (localePath.equals("")) { //$NON-NLS-1$
- 			// look for nl'ed splash image
- 			suffix = SPLASH_IMAGE;
- 		} else {
- 			// look for default splash image
- 			suffix = "nl" + File.separator + localePath + File.separator + SPLASH_IMAGE; //$NON-NLS-1$
- 		}
- 			
- 		// check for file in searchPath
- 		for (int i=0; i<searchPath.length; i++) {
- 			String path = searchPath[i];
- 			if (!path.endsWith(File.separator))
- 				path += File.separator;
- 			path += suffix;
- 			File splash = new File(path);
- 			if (splash.exists())
- 				return splash.getAbsolutePath(); // return the first match found [20063]
- 		}
- 		
- 		// try the next variant
- 		if (localePath.equals("")) //$NON-NLS-1$
- 			localePath = null;
- 		else {
- 			int ix = localePath.lastIndexOf(File.separator);
- 			if (ix == -1)
- 				localePath = ""; //$NON-NLS-1$
- 			else
- 				localePath = localePath.substring(0,ix);
- 		}
- 	} 
- 	
- 	// sorry, could not find splash image
- 	return null;
- }
-
-/*
- * Return the feature identifier to use (specified or defaulted)
- */
-private String getFeatureIdentifier() {
-		
-	if (feature != null) // -feature was specified on command line
-		return feature; 
-		
-	// feature was not specified on command line
-	String dflt = props.getProperty(CFG_FEATURE_ENTRY_DEFAULT);
-	if (dflt != null)
-		return dflt; // return customized default if set.
-	else
-		return null; // otherwise let BootLoader pick default
-}
-
-/*
- * Return the feature root if known
- */
-private String[] getFeatureRoot() {
-	String ix = featureIndex(getFeatureIdentifier());
-	String urlString = props.getProperty(CFG_FEATURE_ENTRY + "." + ix + "." + CFG_FEATURE_ENTRY_ROOT + ".0"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-	if (urlString == null)
-		return null;
-	
-	ArrayList result = new ArrayList();
-	URL url = null;
-	for (int i=1; urlString != null; i++) {
-		try {	
-			urlString = resolve(urlString); // resolve platform relative URLs
-			url = new URL(urlString);
-			if (url.getProtocol().equals("file")) { //$NON-NLS-1$
-				result.add(url.getFile().replace('/', File.separatorChar));
-			} else
-				continue; // in the future may cache
-		} catch(MalformedURLException e) {
-			// skip bad entries
-		}
-		urlString = props.getProperty(CFG_FEATURE_ENTRY + "." + ix + "." + CFG_FEATURE_ENTRY_ROOT + "." + i); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-	}
-	
-	if (result.size()>0)
-		return (String[])result.toArray(new String[0]);
-	else 
-		return null;
-}
-
-/*
- * resolve platform:/base/ URLs
- */
- private String resolve(String urlString) throws MalformedURLException { 	
- 	if (urlString.startsWith(PLATFORM_URL)) {
- 		String root = getRootURL().toExternalForm();
- 		if (!root.endsWith("/")) //$NON-NLS-1$
- 			root += "/"; //$NON-NLS-1$
- 		String path = urlString.substring(PLATFORM_URL.length());
- 		return root + path;
- 	} else
- 		return urlString;
- }
-
-/*
- * 
- */
-private String featureIndex(String id) {
-	if (id==null)
-		return null;
-	return (String)featureIndex.get(id);
-}
-
-/*
- * Entry point for logging.
- */
-private static synchronized void log(Object obj) {
-	if (obj == null)
-		return;
-	try {
-		openLogFile();
-		try {
-			if (newSession) {
-				log.write(SESSION);
-				log.write(' ');
-				for (int i=SESSION.length(); i<78; i++)
-					log.write('-');
-				log.newLine();
-				newSession = false;
-			}
-			write(obj);
-		} finally {
-			if (logFile == null) {
-				if (log != null)
-					log.flush();
-			} else
-				closeLogFile();
-		}
-	} catch (Exception e) {
-		System.err.println("An exception occurred while writing to the platform log:");//$NON-NLS-1$
-		e.printStackTrace(System.err);
-		System.err.println("Logging to the console instead.");//$NON-NLS-1$
-		//we failed to write, so dump log entry to console instead
-		try {
-			log = logForStream(System.err);
-			write(obj);
-			log.flush();
-		} catch (Exception e2) {
-			System.err.println("An exception occurred while logging to the console:");//$NON-NLS-1$
-			e2.printStackTrace(System.err);
-		}
-	} finally {
-			log = null;
-	}
-}
-/*
- * This should only be called from #log()
- */
-private static void write(Object obj) throws IOException {
-	if (obj == null)
-		return;
-	if (obj instanceof Throwable) {
-		log.write(STACK);
-		log.newLine();
-		((Throwable) obj).printStackTrace(new PrintWriter(log));
-	} else {
-		log.write(ENTRY);
-		log.write(' ');
-		log.write(PLUGIN_ID);
-		log.write(' ');
-		log.write(String.valueOf(ERROR));
-		log.write(' ');
-		log.write(String.valueOf(0));
-		log.write(' ');
-		try {
-			DateFormat formatter = new SimpleDateFormat("MMM dd, yyyy kk:mm:ss.SS"); //$NON-NLS-1$
-			log.write(formatter.format(new Date()));
-		} catch (Exception e) {
-			// continue if we can't write out the date
-			log.write(Long.toString(System.currentTimeMillis()));
-		}
-		log.newLine();
-		log.write(MESSAGE);
-		log.write(' ');
-		log.write(String.valueOf(obj));
-	}
-	log.newLine();
-}
-private static void computeLogFileLocation() {
-	if (logFile != null)
-		return;
-	// compute the base location and then append the name of the log file
-	File base = computeMetadataLocation();
-	logFile = new File(base, ".log"); //$NON-NLS-1$
-	logFile.getParentFile().mkdirs();
-}
-private static File computeLockFileLocation() {
-	// compute the base location and then append the name of the lock file
-	File base = computeMetadataLocation();
-	File result = new File(base, ".lock"); //$NON-NLS-1$
-	result.getParentFile().mkdirs();
-	return result;
-}
-private static File computeMetadataLocation() {
-
-	File result = null;
-	// check to see if the user specified a workspace location in the command-line args
-	for (int i=0; arguments != null && result == null && i<arguments.length; i++) {
-		if (arguments[i].equalsIgnoreCase(DATA)) {
-			// found the -data command line argument so the next argument should be the
-			// workspace location. Ensure that we have another arg to check
-			if (i+1<arguments.length)
-				result = new File(arguments[i+1]);
-		}
-	}
-	// otherwise use the default location
-	if (result == null)
-		result = new File(System.getProperty("user.dir"), "workspace");//$NON-NLS-1$ //$NON-NLS-2$
-	
-	// append the .metadata directory to the path
-	return new File(result, ".metadata"); //$NON-NLS-1$
-}
-/**
- * Converts an ASCII character representing a hexadecimal
- * value into its integer equivalent.
- */
-private int hexToByte(byte b) {
-	switch (b) {
-		case '0':return 0;
-		case '1':return 1;
-		case '2':return 2;
-		case '3':return 3;
-		case '4':return 4;
-		case '5':return 5;
-		case '6':return 6;
-		case '7':return 7;
-		case '8':return 8;
-		case '9':return 9;
-		case 'A':
-		case 'a':return 10;
-		case 'B':
-		case 'b':return 11;
-		case 'C':
-		case 'c':return 12;
-		case 'D':
-		case 'd':return 13;
-		case 'E':
-		case 'e':return 14;
-		case 'F':
-		case 'f':return 15;
-		default:
-			throw new IllegalArgumentException("Switch error decoding URL");
-	}
-}
-
-
-private static void openLogFile() throws IOException {
-	computeLogFileLocation();
-	try {
-		log = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(logFile.getAbsolutePath(), true), "UTF-8"));//$NON-NLS-1$
-	} catch (IOException e) {
-		logFile = null;
-		throw e;
-	}
-}
-private static BufferedWriter logForStream(OutputStream output) {
-	try {
-		return new BufferedWriter(new OutputStreamWriter(output, "UTF-8"));//$NON-NLS-1$
-	} catch (UnsupportedEncodingException e) {
-		return new BufferedWriter(new OutputStreamWriter(output));
-	}
-}
-private static void closeLogFile() throws IOException {
-	try {
-		if (log != null) {
-			log.flush();
-			log.close();
-		}
-	} finally {
-		log = null;
-	}
-}
-/**
- * Return a boolean value indicating whether or not the version of the JVM is
- * deemed to be compatible with Eclipse.
- */
-private static boolean isCompatible() {
-	try {
-		String vmVersionString = System.getProperty("java.version"); //$NON-NLS-1$
-		Identifier minimum = new Identifier(1, 3, 0);
-		Identifier version = new Identifier(vmVersionString);
-		return version.isGreaterEqualTo(minimum);
-	} catch (SecurityException e) {
-		// If the security manager won't allow us to get the system property, continue for
-		// now and let things fail later on their own if necessary.
-		return true;
-	} catch (NumberFormatException e) {
-		// If the version string was in a format that we don't understand, continue and
-		// let things fail later on their own if necessary.
-		return true;
-	}
-}
-/**
- * Return a boolean value indicating whether or not the platform is already
- * running in this workspace.
- */
-private static boolean isAlreadyRunning() {
-	// Calculate the location of the lock file
-	File lockFile = computeLockFileLocation();
-
-	// if the lock file already exists, try to delete,
-	// assume failure means another eclipse has it open
-	if (lockFile.exists())
-		lockFile.delete();
-	return lockFile.exists();
-}
-
-}
diff --git a/platform/org.eclipse.platform/src/org/eclipse/core/launcher/package.html b/platform/org.eclipse.platform/src/org/eclipse/core/launcher/package.html
deleted file mode 100644
index ca2e7ce..0000000
--- a/platform/org.eclipse.platform/src/org/eclipse/core/launcher/package.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
-<html>
-<head>
-   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-   <meta name="Author" content="IBM">
-   <meta name="GENERATOR" content="Mozilla/4.75 [en] (Windows NT 5.0; U) [Netscape]">
-   <title>Package-level Javadoc</title>
-</head>
-<body>
-Launches the Eclipse Platform.
-<h2>
-Package Specification</h2>
-
-This package is the main entry point to the Eclipse Platform.  To start the platform invoke the Main
-class in this package.
-<br>&nbsp;
-</body>
-</html>
diff --git a/platform/org.eclipse.platform/welcome.xml b/platform/org.eclipse.platform/welcome.xml
deleted file mode 100644
index 6ecc559..0000000
--- a/platform/org.eclipse.platform/welcome.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?> 
-<welcomePage 
-	title="Eclipse Platform"
-	format="nowrap">
-	<intro>This page will help familiarize you with the Eclipse Workbench.
-To get started, read the sections below and click on the related links. </intro>
-
-<item><b>Installed Features </b>
-To find out more about the features installed in your workbench, choose <action pluginId="org.eclipse.ui"  class="org.eclipse.ui.internal.QuickStartAction">Help > Welcome...</action>
-and select the feature you are interested in.</item>
-
-<item><b>Perspectives, views and editors </b>
-A window contains one or more perspectives. A perspective consists of views (e.g. Navigator) 
-and editors for working with your resources.
-
-The shortcut bar at the far left of the window allows you to open new perspectives and move
-between perspectives that are already open. The perspective you are currently working with 
-is shown in the title of the window and in the shortcut bar as a pushed-in icon.</item>
-
-<item><b>Configuring your perspectives</b>
-You can move views and editors around the workbench by dragging their titlebars. You can
-also add more views to your current perspective by using Window > Show View. 
-To reset the perspective to its original state, choose <action pluginId="org.eclipse.ui"  class="org.eclipse.ui.internal.ResetPerspectiveAction">Window > Reset Perspective</action>. 
-
-Once you have arranged your perspective, you can save it using Window > Save Perspective As.... 
-You can customize the views, perspectives and New menu operations that show up for 
-your perspective. To do this choose <action pluginId="org.eclipse.ui"  class="org.eclipse.ui.internal.EditActionSetsAction">Window > Customize Perspective...</action> .  A view can
-additionally be converted into a Fast View by dragging it to the shortcut bar (at the 
-far left of the window). </item> 
-
-<item><b>Join a CVS team</b>
-To join a CVS development team, open the <action pluginId="org.eclipse.team.cvs.ui" class="org.eclipse.team.internal.ccvs.ui.actions.ShowCVSPerspectiveAction">CVS Repository Exploring perspective</action>. Next, specify
-the location of your CVS repository. To do this, choose <action pluginId="org.eclipse.team.cvs.ui" class="org.eclipse.team.internal.ccvs.ui.repo.NewCVSRepositoryAction">New > Repository Location...</action> from the
-CVS Repositories view popup menu. When the location wizard opens, fill in the details of your
-CVS repository and click Finish. 
-
-A repository location will appear in the CVS Repositories view. Expand the location, then expand
-the HEAD branch. You will see a list of the modules in that repository. Select a module and choose 
-<b>Checkout as Project</b> from the context menu. This will checkout the module from the CVS 
-repository and create a project by that name in your workspace.</item>
-
-<item><b>Running an Ant Buildfile</b>
-To run an Ant buildfile, click on Run > External Tools > External Tools.... Select Ant Build as the launch
-configuration type and click New. Identify the buildfile in the Location field and then click Run.</item>
-
-<item><b>Learn more </b>
-To learn more you can browse the <topic id="/org.eclipse.platform.doc.user/toc.xml">Workbench User Guide</topic>. Browse the <topic href="/org.eclipse.platform.doc.user/reference/ref-anticons.htm">External Tools and Ant Icons</topic>
-section to recognize the various External Tools and Ant elements. </item>
-
-
-</welcomePage>
\ No newline at end of file
diff --git a/update/org.eclipse.update.core.linux/.classpath b/update/org.eclipse.update.core.linux/.classpath
deleted file mode 100644
index 5921923..0000000
--- a/update/org.eclipse.update.core.linux/.classpath
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-    <classpathentry kind="src" path="src"/>
-    <classpathentry kind="src" path="/org.eclipse.update.core"/>
-    <classpathentry kind="src" path="/org.eclipse.core.runtime"/>
-    <classpathentry kind="src" path="/org.eclipse.help"/>
-    <classpathentry kind="src" path="/org.apache.xerces"/>
-    <classpathentry kind="src" path="/org.eclipse.core.boot"/>
-    <classpathentry kind="var" path="JRE_LIB" rootpath="JRE_SRCROOT" sourcepath="JRE_SRC"/>
-    <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/update/org.eclipse.update.core.linux/.cvsignore b/update/org.eclipse.update.core.linux/.cvsignore
deleted file mode 100644
index c5e82d7..0000000
--- a/update/org.eclipse.update.core.linux/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
\ No newline at end of file
diff --git a/update/org.eclipse.update.core.linux/.project b/update/org.eclipse.update.core.linux/.project
deleted file mode 100644
index d41874c..0000000
--- a/update/org.eclipse.update.core.linux/.project
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.update.core.linux</name>

-	<comment></comment>

-	<projects>

-		<project>org.apache.xerces</project>

-		<project>org.eclipse.core.boot</project>

-		<project>org.eclipse.core.runtime</project>

-		<project>org.eclipse.help</project>

-		<project>org.eclipse.update.core</project>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-		<nature>org.eclipse.pde.PluginNature</nature>

-	</natures>

-</projectDescription>

diff --git a/update/org.eclipse.update.core.linux/about.html b/update/org.eclipse.update.core.linux/about.html
deleted file mode 100644
index 9db411a..0000000
--- a/update/org.eclipse.update.core.linux/about.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>20th June, 2002</p>	
-<h3>License</h3>
-<p>Eclipse.org makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Common Public License Version 1.0 (&quot;CPL&quot;).  A copy of the CPL is available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>.
-For purposes of the CPL, &quot;Program&quot; will mean the Content.</p>
-
-<h3>Contributions</h3>
-
-<p>If this Content is licensed to you under the terms and conditions of the CPL, any Contributions, as defined in the CPL, uploaded, submitted, or otherwise
-made available to Eclipse.org, members of Eclipse.org and/or the host of Eclipse.org web site, by you that relate to such
-Content are provided under the terms and conditions of the CPL and can be made available to others under the terms of the CPL.</p>
-
-<p>If this Content is licensed to you under license terms and conditions other than the CPL (&quot;Other License&quot;), any modifications, enhancements and/or
-other code and/or documentation (&quot;Modifications&quot;) uploaded, submitted, or otherwise made available to Eclipse.org, members of Eclipse.org and/or the
-host of Eclipse.org, by you that relate to such Content are provided under terms and conditions of the Other License and can be made available
-to others under the terms of the Other License.  In addition, with regard to Modifications for which you are the copyright holder, you are also
-providing the Modifications under the terms and conditions of the CPL and such Modifications can be made available to others under the terms of
-the CPL.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/update/org.eclipse.update.core.linux/build.properties b/update/org.eclipse.update.core.linux/build.properties
deleted file mode 100644
index 9862f0a..0000000
--- a/update/org.eclipse.update.core.linux/build.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2003 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Common Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/cpl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-bin.includes = fragment.xml,\
-               os/,\
-               fragment.properties,\
-               about.html
-source.updatecorelinux.zip = src/
diff --git a/update/org.eclipse.update.core.linux/fragment.xml b/update/org.eclipse.update.core.linux/fragment.xml
deleted file mode 100644
index a21f2ae..0000000
--- a/update/org.eclipse.update.core.linux/fragment.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-   id="org.eclipse.update.core.linux"
-   name="%fragmentNameLinux"
-   version="2.1.0"
-   provider-name="%providerName"
-   plugin-id="org.eclipse.update.core"
-   plugin-version="2.1.0"
-   match="compatible">
-
-   <runtime>
-   </runtime>
-
-
-</fragment>
diff --git a/update/org.eclipse.update.core.linux/src/build.xml b/update/org.eclipse.update.core.linux/src/build.xml
deleted file mode 100644
index 59f9799..0000000
--- a/update/org.eclipse.update.core.linux/src/build.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0"?>
-<project name="buildlibrary" default="run" basedir="."> 
-  
-  <!-- The properties ${eclipse-home} ${jdk-path} should be passed into this script -->
-  <!-- Set a meaningful default value for when it is not. -->
-  <property name="eclipse-home" value="${basedir}/../.."/>
-  <property name="jdk-path" value="${java.home}"/>  
-  <property name="destination" value="${eclipse-home}/org.eclipse.update.core.linux/os/linux/x86/"/>
-  <property name="obj-path" value="${eclipse-home}/org.eclipse.update.core/src/"/>
-  <property name="src-path" value="${eclipse-home}/org.eclipse.update.core/src/"/>  
-  
-  <!-- sets the properties -->
-  <property name="library-name" value="libupdate"/>  
-  <property name="library-platform" value="so"/>    
-  <property name="library-file" value="${library-name}.${library-platform}"/>
-  
-  <!-- This target holds all initialization code that needs to be done for -->
-  <!-- all tests that are to be run. Initialization for individual tests -->
-  <!-- should be done within the body of the suite target. -->
-  <target name="init">
-    <tstamp/>
-    <delete>
-      <fileset dir="${obj-path}" includes="${library-file}"/>
-      <fileset dir="${obj-path}" includes="${library-name}.o"/>
-    </delete>
-  </target>
-  
-  <!-- This target holds code to cleanup the testing environment after -->
-  <!-- after all of the tests have been run. You can use this target to -->
-  <!-- delete temporary files that have been created. -->
-  <target name="cleanup">
-      <delete>
-      <fileset dir="${obj-path}" includes="${library-file}"/>
-      <fileset dir="${obj-path}" includes="${library-name}.o"/>
-    </delete>
-  </target>
-  
-  
-  <!-- This target runs the build. -->
-  <target name="run" depends="init,build,cleanup">
-  </target>
-  
-  <!-- This target build the library -->
-  <target name="build">
-    <echo message="Building ${library-file}"/>
-
-    <property name="header-path" value="${jdk-path}/include"/>
-    <property name="header-linux-path" value="${header-path}/linux" />
-
-	<echo message="gcc -o  ${library-file} -shared -I${src-path} -I${header-linux-path} ${library-file} -static -lc"/>
-
-    <apply executable="gcc" dest="${eclipse-home}/" parallel="false">
-      <arg value="-o"/>
-      <arg value="${library-file}"/>
-      <arg value="-shared"/>
-      <arg value="-I${src-path}"/>
-      <arg value="-I${header-path}"/>      
-      <arg value="-I${header-linux-path}"/>  
-	  <srcfile/>
-	  <arg value="-static"/>           
-      <arg value="-lc"/>	  
-      <fileset dir="${src-path}" includes="*.cpp"/>
-      <mapper type="glob" from="*.cpp" to="*.o"/>
-    </apply>
-    
-	<move file="${library-file}" todir="${destination}"/>
-  </target>
-  
-  
-</project>
\ No newline at end of file
diff --git a/update/org.eclipse.update.core.linux/src/update.cpp b/update/org.eclipse.update.core.linux/src/update.cpp
deleted file mode 100644
index 84ef705..0000000
--- a/update/org.eclipse.update.core.linux/src/update.cpp
+++ /dev/null
@@ -1,160 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2000, 2002 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials 

- * are made available under the terms of the Common Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/cpl-v10.html

- * 

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-

-# include <sys/types.h>

-# include <sys/statfs.h>

-# include <update.h>

-

-/*

- * Class:     org_eclipse_update_configuration_LocalSystemInfo

- * Method:    nativeGetFreeSpace

- * Signature: (Ljava/io/File;)J

- */

-JNIEXPORT jlong JNICALL Java_org_eclipse_update_configuration_LocalSystemInfo_nativeGetFreeSpace(

-	JNIEnv * jnienv,

-	jclass javaClass,

-	jobject file) {

-

-	// to retrive the String

-	jclass cls;

-	jmethodID id;

-	jobject obj;

-

-	// java.io.File.getAbsolutePath()

-	const char * lpDirectoryName;

-

-	// Linux Parameters

-	struct statfs buffer;

-

-	// the result

-	jlong result = org_eclipse_update_configuration_LocalSystemInfo_SIZE_UNKNOWN;

-

-	// first, obtain the Path from the java.io.File parameter

-	cls = jnienv -> GetObjectClass(file);

-	id = jnienv -> GetMethodID(cls, "getAbsolutePath", "()Ljava/lang/String;");

-	obj = jnienv -> CallObjectMethod(file, id);

-	lpDirectoryName = jnienv -> GetStringUTFChars((jstring) obj, 0);

-

-	// cast one argument as jlong to have a jlong result

-	int err = statfs(lpDirectoryName,&buffer);

-	if (err==0){

-		long size = buffer.f_bsize;

-		jlong free = buffer.f_bfree;

-		result = size*free;

-	}

-

-	return result;

-}

-

-/*

- * Class:     org_eclipse_update_configuration_LocalSystemInfo

- * Method:    nativeGetLabel

- * Signature: (Ljava/io/File;)Ljava/lang/String;

- */

-JNIEXPORT jstring JNICALL Java_org_eclipse_update_configuration_LocalSystemInfo_nativeGetLabel(

-	JNIEnv * jnienv,

-	jclass javaClass,

-	jobject file) {

-

-	// to retrive the String

-	jclass cls;

-	jmethodID id;

-	jobject obj;

-

-	// java.io.File.getAbsolutePath()

-	const char * lpDirectoryName;

-

-	// obtain the String from the parameter

-	cls = jnienv -> GetObjectClass(file);

-	id = jnienv -> GetMethodID(cls, "getAbsolutePath", "()Ljava/lang/String;");

-	obj = jnienv -> CallObjectMethod(file, id);

-	lpDirectoryName = jnienv -> GetStringUTFChars((jstring) obj, 0);

-

-	jstring result = NULL;

-

-	// Linux implementation following

-

-	return result;

-}

-

-/*

- * Class:     org_eclipse_update_configuration_LocalSystemInfo

- * Method:    nativeGetType

- * Signature: (Ljava/io/File;)I

- */

-JNIEXPORT jint JNICALL Java_org_eclipse_update_configuration_LocalSystemInfo_nativeGetType(

-	JNIEnv * jnienv,

-	jclass javaClass,

-	jobject file) {

-

-	// to retrive the String

-	jclass cls;

-	jmethodID id;

-	jobject obj;

-

-	// java.io.File.getAbsolutePath()

-	const char * lpDirectoryName;

-

-	// obtain the String from the parameter

-	cls = jnienv -> GetObjectClass(file);

-	id = jnienv -> GetMethodID(cls, "getAbsolutePath", "()Ljava/lang/String;");

-	obj = jnienv -> CallObjectMethod(file, id);

-	lpDirectoryName = jnienv -> GetStringUTFChars((jstring) obj, 0);

-

-	int result;

-	

-	// Linux implemantation

-

-	result = org_eclipse_update_configuration_LocalSystemInfo_VOLUME_INVALID_PATH;

-	return result;

-}

-

-/*

- * Class:     org_eclipse_update_configuration_LocalSystemInfo

- * Method:    nativeListMountPoints

- * Signature: ()[Ljava/lang/String;

- */

-JNIEXPORT jobjectArray JNICALL Java_org_eclipse_update_configuration_LocalSystemInfo_nativeListMountPoints(

-	JNIEnv * jnienv,

-	jclass javaClass) {

-

-	//

-	int drive;

-	char driveName[100];

-	jobjectArray returnArray;

-	int nDrive = 0;

-

-	// 

-	jclass stringClass;

-	jobject empty;

-	int index = 0;

-	jobject str;

-

-	// Linux implementation

-	// find mount points

-

-	drive = 0;

-	stringClass = jnienv -> FindClass("java/lang/String");

-	empty = jnienv -> NewStringUTF("");

-	//returnArray = jnienv -> NewObjectArray(nDrive, stringClass, empty);

-	// for now return null as method is not implemented

-	returnArray = NULL;

-

-	for (int i = 0; i < drive; i++) {

-		// Linux implementation, create String for each mount point

-

-		str = jnienv -> NewStringUTF(driveName);

-		jnienv -> SetObjectArrayElement(returnArray, index, str);

-		index++;

-	}

-

-	return returnArray;

-}

diff --git a/update/org.eclipse.update.core.linux/src/update.h b/update/org.eclipse.update.core.linux/src/update.h
deleted file mode 100644
index fef0347..0000000
--- a/update/org.eclipse.update.core.linux/src/update.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */

-

-/*******************************************************************************

- * Copyright (c) 2000, 2002 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials 

- * are made available under the terms of the Common Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/cpl-v10.html

- * 

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

- 

-#include <jni.h>

-/* Header for class org_eclipse_update_configuration_LocalSystemInfo */

-

-#ifndef _Included_org_eclipse_update_configuration_LocalSystemInfo

-#define _Included_org_eclipse_update_configuration_LocalSystemInfo

-#ifdef __cplusplus

-extern "C" {

-#endif

-#undef org_eclipse_update_configuration_LocalSystemInfo_SIZE_UNKNOWN

-#define org_eclipse_update_configuration_LocalSystemInfo_SIZE_UNKNOWN -1L

-#undef org_eclipse_update_configuration_LocalSystemInfo_VOLUME_UNKNOWN

-#define org_eclipse_update_configuration_LocalSystemInfo_VOLUME_UNKNOWN -1L

-#undef org_eclipse_update_configuration_LocalSystemInfo_VOLUME_INVALID_PATH

-#define org_eclipse_update_configuration_LocalSystemInfo_VOLUME_INVALID_PATH -2L

-#undef org_eclipse_update_configuration_LocalSystemInfo_VOLUME_REMOVABLE

-#define org_eclipse_update_configuration_LocalSystemInfo_VOLUME_REMOVABLE 1L

-#undef org_eclipse_update_configuration_LocalSystemInfo_VOLUME_FIXED

-#define org_eclipse_update_configuration_LocalSystemInfo_VOLUME_FIXED 2L

-#undef org_eclipse_update_configuration_LocalSystemInfo_VOLUME_REMOTE

-#define org_eclipse_update_configuration_LocalSystemInfo_VOLUME_REMOTE 3L

-#undef org_eclipse_update_configuration_LocalSystemInfo_VOLUME_CDROM

-#define org_eclipse_update_configuration_LocalSystemInfo_VOLUME_CDROM 4L

-#undef org_eclipse_update_configuration_LocalSystemInfo_VOLUME_RAMDISK

-#define org_eclipse_update_configuration_LocalSystemInfo_VOLUME_RAMDISK 5L

-/* Inaccessible static: listeners */

-/* Inaccessible static: hasNatives */

-/*

- * Class:     org_eclipse_update_configuration_LocalSystemInfo

- * Method:    nativeGetFreeSpace

- * Signature: (Ljava/io/File;)J

- */

-JNIEXPORT jlong JNICALL Java_org_eclipse_update_configuration_LocalSystemInfo_nativeGetFreeSpace

-  (JNIEnv *, jclass, jobject);

-

-/*

- * Class:     org_eclipse_update_configuration_LocalSystemInfo

- * Method:    nativeGetLabel

- * Signature: (Ljava/io/File;)Ljava/lang/String;

- */

-JNIEXPORT jstring JNICALL Java_org_eclipse_update_configuration_LocalSystemInfo_nativeGetLabel

-  (JNIEnv *, jclass, jobject);

-

-/*

- * Class:     org_eclipse_update_configuration_LocalSystemInfo

- * Method:    nativeGetType

- * Signature: (Ljava/io/File;)I

- */

-JNIEXPORT jint JNICALL Java_org_eclipse_update_configuration_LocalSystemInfo_nativeGetType

-  (JNIEnv *, jclass, jobject);

-

-/*

- * Class:     org_eclipse_update_configuration_LocalSystemInfo

- * Method:    nativeListMountPoints

- * Signature: ()[Ljava/lang/String;

- */

-JNIEXPORT jobjectArray JNICALL Java_org_eclipse_update_configuration_LocalSystemInfo_nativeListMountPoints

-  (JNIEnv *, jclass);

-

-#ifdef __cplusplus

-}

-

-#endif

-#endif

diff --git a/update/org.eclipse.update.core.win32/.classpath b/update/org.eclipse.update.core.win32/.classpath
deleted file mode 100644
index 5921923..0000000
--- a/update/org.eclipse.update.core.win32/.classpath
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-    <classpathentry kind="src" path="src"/>
-    <classpathentry kind="src" path="/org.eclipse.update.core"/>
-    <classpathentry kind="src" path="/org.eclipse.core.runtime"/>
-    <classpathentry kind="src" path="/org.eclipse.help"/>
-    <classpathentry kind="src" path="/org.apache.xerces"/>
-    <classpathentry kind="src" path="/org.eclipse.core.boot"/>
-    <classpathentry kind="var" path="JRE_LIB" rootpath="JRE_SRCROOT" sourcepath="JRE_SRC"/>
-    <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/update/org.eclipse.update.core.win32/.cvsignore b/update/org.eclipse.update.core.win32/.cvsignore
deleted file mode 100644
index c5e82d7..0000000
--- a/update/org.eclipse.update.core.win32/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
\ No newline at end of file
diff --git a/update/org.eclipse.update.core.win32/.project b/update/org.eclipse.update.core.win32/.project
deleted file mode 100644
index bb440b5..0000000
--- a/update/org.eclipse.update.core.win32/.project
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.update.core.win32</name>

-	<comment></comment>

-	<projects>

-		<project>org.apache.xerces</project>

-		<project>org.eclipse.core.boot</project>

-		<project>org.eclipse.core.runtime</project>

-		<project>org.eclipse.help</project>

-		<project>org.eclipse.update.core</project>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-		<nature>org.eclipse.pde.PluginNature</nature>

-	</natures>

-</projectDescription>

diff --git a/update/org.eclipse.update.core.win32/about.html b/update/org.eclipse.update.core.win32/about.html
deleted file mode 100644
index 9db411a..0000000
--- a/update/org.eclipse.update.core.win32/about.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>20th June, 2002</p>	
-<h3>License</h3>
-<p>Eclipse.org makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Common Public License Version 1.0 (&quot;CPL&quot;).  A copy of the CPL is available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>.
-For purposes of the CPL, &quot;Program&quot; will mean the Content.</p>
-
-<h3>Contributions</h3>
-
-<p>If this Content is licensed to you under the terms and conditions of the CPL, any Contributions, as defined in the CPL, uploaded, submitted, or otherwise
-made available to Eclipse.org, members of Eclipse.org and/or the host of Eclipse.org web site, by you that relate to such
-Content are provided under the terms and conditions of the CPL and can be made available to others under the terms of the CPL.</p>
-
-<p>If this Content is licensed to you under license terms and conditions other than the CPL (&quot;Other License&quot;), any modifications, enhancements and/or
-other code and/or documentation (&quot;Modifications&quot;) uploaded, submitted, or otherwise made available to Eclipse.org, members of Eclipse.org and/or the
-host of Eclipse.org, by you that relate to such Content are provided under terms and conditions of the Other License and can be made available
-to others under the terms of the Other License.  In addition, with regard to Modifications for which you are the copyright holder, you are also
-providing the Modifications under the terms and conditions of the CPL and such Modifications can be made available to others under the terms of
-the CPL.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/update/org.eclipse.update.core.win32/build.properties b/update/org.eclipse.update.core.win32/build.properties
deleted file mode 100644
index 0f5d557..0000000
--- a/update/org.eclipse.update.core.win32/build.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2003 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Common Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/cpl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-source.updatecorewin32.zip = src/
-bin.includes = fragment.xml,\
-               os/,\
-               fragment.properties,\
-               about.html
diff --git a/update/org.eclipse.update.core.win32/fragment.xml b/update/org.eclipse.update.core.win32/fragment.xml
deleted file mode 100644
index 5df5874..0000000
--- a/update/org.eclipse.update.core.win32/fragment.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-   id="org.eclipse.update.core.win32"
-   name="%fragmentNameWin"
-   version="2.1.0"
-   provider-name="%providerName"
-   plugin-id="org.eclipse.update.core"
-   plugin-version="2.1.0"
-   match="compatible">
-
-   <runtime>
-   </runtime>
-
-
-</fragment>
diff --git a/update/org.eclipse.update.core.win32/os/win32/x86/update.dll b/update/org.eclipse.update.core.win32/os/win32/x86/update.dll
deleted file mode 100644
index 428e60e..0000000
--- a/update/org.eclipse.update.core.win32/os/win32/x86/update.dll
+++ /dev/null
Binary files differ
diff --git a/update/org.eclipse.update.core.win32/src/build.xml b/update/org.eclipse.update.core.win32/src/build.xml
deleted file mode 100644
index 694dc82..0000000
--- a/update/org.eclipse.update.core.win32/src/build.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0"?>
-<project name="buildlibrary" default="run" basedir="."> 
-  
-  <!-- The properties ${eclipse-home} ${jdk-path} should be passed into this script -->
-  <!-- The Path should point to the bin directory of BCC55 -->
-  <!-- http://www.borland.com/products/downloads/download_cbuilder.html -->
-  
-  <!-- Set a meaningful default value for when it is not. -->
-  <property name="eclipse-home" value="${basedir}/../.."/>
-  <property name="jdk-path" value="${java.home}"/>  
-  <property name="destination" value="${eclipse-home}/org.eclipse.update.core.win32/os/win32/x86/"/>
-  <property name="obj-path" value="${eclipse-home}/org.eclipse.update.core.win32/src"/>
-  <property name="src-path" value="${eclipse-home}/org.eclipse.update.core.win32/src/"/>  
-  
-  <!-- sets the properties -->
-  <property name="library-name" value="update"/>  
-  <property name="library-platform" value="dll"/>    
-  <property name="library-file" value="${library-name}.${library-platform}"/>
-  
-  <!-- This target holds all initialization code that needs to be done for -->
-  <!-- all tests that are to be run. Initialization for individual tests -->
-  <!-- should be done within the body of the suite target. -->
-  <target name="init">
-    <tstamp/>
-    <delete>
-      <fileset dir="${obj-path}" includes="${library-file}"/>
-      <fileset dir="${obj-path}" includes="${library-name}.obj"/>
-      <fileset dir="${obj-path}" includes="${library-name}.tds"/>            
-    </delete>
-  </target>
-  
-  <!-- This target holds code to cleanup the testing environment after -->
-  <!-- after all of the tests have been run. You can use this target to -->
-  <!-- delete temporary files that have been created. -->
-  <target name="cleanup">
-      <delete>
-      <fileset dir="${obj-path}" includes="${library-file}"/>
-      <fileset dir="${obj-path}" includes="${library-name}.obj"/>
-      <fileset dir="${obj-path}" includes="${library-name}.tds"/>            
-    </delete>
-  </target>
-  
-  
-  <!-- This target runs the test suite. Any actions that need to happen -->
-  <!-- after all the tests have been run should go here. -->
-  <target name="run" depends="init,build,cleanup">
-  </target>
-  
-  <!-- This target build the dll -->
-  <target name="build">
-    <echo message="Building ${library-file}"/>
-
-    <property name="header-path" value="${jdk-path}/include"/>
-    <property name="header-windows-path" value="${header-path}/win32" />
-
-	<echo message="bcc32 -I${src-path} -I${header-windows-path} -WD"/>
-
-    <apply executable="bcc32" dest="${eclipse-home}/" parallel="false">
-      <arg value="-I${src-path}"/>
-      <arg value="-I${header-path}"/>      
-      <arg value="-I${header-windows-path}"/> 
-      <!-- arg value="-DUNICODE" --> 
-	  <arg value="-w-8057"/>           
-      <arg value="-WD"/>
-	  <srcfile/>
-      <fileset dir="${src-path}" includes="*.cpp"/>
-      <mapper type="glob" from="*.cpp" to="*.obj"/>
-    </apply>
-    
-	<move file="${library-file}" todir="${destination}"/>
-  </target>
-  
-  
-</project>
\ No newline at end of file
diff --git a/update/org.eclipse.update.core.win32/src/update.cpp b/update/org.eclipse.update.core.win32/src/update.cpp
deleted file mode 100644
index cb27fd5..0000000
--- a/update/org.eclipse.update.core.win32/src/update.cpp
+++ /dev/null
@@ -1,487 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2000, 2002 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials 

- * are made available under the terms of the Common Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/cpl-v10.html

- * 

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-

-# include <update.h>

-# include <windows.h>

-# include <winioctl.h> // IOCTL codes: MediaType

-

-// Windows Version

-int WIN98 = 0;

-int WINNT = 1;

-int WINME = 2;

-int WIN2000 = 3;

-int WINXP = 4;

-

-// set to 1 for DEBUG

-int DEBUG = 0;

-

-// set to 0 to run on Windows 95 *Unsupported*

-int NOWIN95 = 1;

-

-

-// GLOBAL METHODS

-// ---------------

-

-/*

- *

- */

-jstring WindowsTojstring( JNIEnv* jnienv, char* buf )

-{

-  jstring rtn = 0;

-  wchar_t* buffer = 0;

-  int bufferLen = strlen(buf);  

-  if( bufferLen == 0 ){

-    rtn = jnienv ->NewStringUTF(buf);

-	if (DEBUG)

-		printf("WindowsToJString Buffer is empty\n");    

-  } else {

-    int length = MultiByteToWideChar( CP_ACP, 0, (LPCSTR)buf, bufferLen, NULL, 0 );

-    buffer = (wchar_t*)malloc( length*2 + 1 );

-    if(int err=MultiByteToWideChar( CP_ACP, 0, (LPCSTR)buf, bufferLen, (LPWSTR)buffer, length ) >0 ){

-      rtn = jnienv->NewString((jchar*)buffer, length );

-    } else {

-		if (DEBUG)

-			printf("MultiByteToWideChar %i\n",err);    

-    }

-  }

-  if( buffer )

-   free( buffer );

-  return rtn;

-}

-

-

-

-/*

- * calls GetVolumeInformation to retrive the label of the volume

- * Returns NULL if an error occurs

- * @param driveLetter path to the drive "c:\\"

- * @prama jnienv JNIEnvironment

- */

-jstring getLabel(TCHAR driveLetter[],JNIEnv * jnienv){

-

-	jstring result = NULL;

-	TCHAR buf[128];	

-	

-	// always return null as UNICODE is not implemented

-	// how can we get the label of a volume as UNICODE char ?

-	return result;

-	

-	int err = GetVolumeInformation(

-		driveLetter,

-		buf,

-		sizeof(buf) - 1,

-		NULL,

-		NULL,

-		NULL,

-		NULL,

-		0);

-	if (err){

-		result = WindowsTojstring(jnienv, buf);

-	} else {

-		if (DEBUG)

-			printf("Error GetVolumeInformation %i\n",err);				

- 	}

-	return result;

-}

-

-/*

- * returns the Version of Windows

- * int 0 WIN98;

- * int 1 WINNT;

- * int 2 WINME;

- * int 3 WIN2000;

- * int 4 WINXP;

- * returns -1 otherwise

- */

-int getWindowsVersion(){

-	OSVERSIONINFOEX osvi;

-	int UNKNOWN = -1;

-	

-	ZeroMemory(&osvi, sizeof(OSVERSIONINFOEX));

-	osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX);

-	

-	if(!(GetVersionEx((OSVERSIONINFO *)&osvi))){

-		if (DEBUG)

-			printf("UNKNOWN VERSION: Cannot execute GetVersionEx\n");

-		// if OSVERSIONEX doesn't work, try OSVERSIONINFO

-		osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);			 	

-		if(!(GetVersionEx((OSVERSIONINFO *)&osvi))){

-		if (DEBUG)

-			printf("UNKNOWN VERSION: Cannot execute GetVersionEx\n");

-			return UNKNOWN;

-		}

-	}

-	

-	switch(osvi.dwPlatformId){

-		case VER_PLATFORM_WIN32_NT:

-			if (DEBUG)

-				printf("VERSION NT: Maj %i Min %i\n",osvi.dwMajorVersion,osvi.dwMinorVersion);				 	

-			if(osvi.dwMajorVersion<=4)

-				return WINNT;

-			if(osvi.dwMajorVersion==5){

-				if (osvi.dwMinorVersion==0)

-					return WIN2000;

-				if (osvi.dwMinorVersion==1)

-					return WINXP;

-			} else {

-				return UNKNOWN;

-			};

-			break;

-		case VER_PLATFORM_WIN32_WINDOWS:

-			if (DEBUG)

-				printf("VERSION Non NT: Maj %i Min %i\n",osvi.dwMajorVersion,osvi.dwMinorVersion);				 	

-			if(osvi.dwMajorVersion==4){

-				if (osvi.dwMinorVersion==10)

-					return WIN98;

-				if (osvi.dwMinorVersion==90)

-					return WINME;

-			} else {

-				return UNKNOWN;

-			}

-			break;

-		default:

-			if (DEBUG)

-				printf("VERSION UNKNOWN: Maj %i Min %i\n",osvi.dwMajorVersion,osvi.dwMinorVersion);				 	

-			return UNKNOWN;

-	}

-	return UNKNOWN;

-} 

-

-/*

- * Returns the type of Removable Drive 

- * Returns 

- * org_eclipse_update_configuration_LocalSystemInfo_VOLUME_FLOPPY_3

- * org_eclipse_update_configuration_LocalSystemInfo_VOLUME_FLOPPY_5

- * org_eclipse_update_configuration_LocalSystemInfo_VOLUME_REMOVABLE

- */

-jlong getFloppy(TCHAR driveLetter[]){

-

-	TCHAR floppyPath[8];

-	HANDLE handle;

-	DISK_GEOMETRY geometry[20];

-	DWORD dw;

-	jlong UNKNOWN = org_eclipse_update_configuration_LocalSystemInfo_VOLUME_REMOVABLE;

-

-	sprintf(floppyPath, "\\\\.\\%c:", driveLetter[0]);

-	if (DEBUG)

-		printf("Path %s\n",floppyPath);

-	// BUG 25719

-    SetErrorMode( SEM_FAILCRITICALERRORS ); 		

-	handle=CreateFile(floppyPath,0,FILE_SHARE_READ,NULL,OPEN_ALWAYS,0,NULL);

-	if (handle==INVALID_HANDLE_VALUE){

-		if (DEBUG)

-			printf("Invalid Handle %s\n",floppyPath);

-		return UNKNOWN;

-	} else {

-		if(DeviceIoControl(handle,

-			IOCTL_DISK_GET_MEDIA_TYPES,0,0,

-			geometry,sizeof(geometry),&dw,0) 

-			&& dw>0) {

-			switch(geometry[0].MediaType){

-			 case F5_160_512:

-			 case F5_180_512:

-			 case F5_320_512:

-			 case F5_320_1024:

-			 case F5_360_512:

-			 case F5_1Pt2_512:

-				if (DEBUG)

-					printf("Found 5 1/4 Drive\n");				 	

-			 	return org_eclipse_update_configuration_LocalSystemInfo_VOLUME_FLOPPY_5;

-			 case F3_720_512:			 				 				 				 				 

-			 case F3_1Pt44_512:

-			 case F3_2Pt88_512:

-			 case F3_20Pt8_512:				 				 				 

-				if (DEBUG)

-					printf("Found 3 1/2 Drive\n");				 	

-			 	return org_eclipse_update_configuration_LocalSystemInfo_VOLUME_FLOPPY_3;

-			 default:

-			 	return UNKNOWN;

-			}

-		}

-	}

-	return UNKNOWN;	

-}

-

-/*

- * Returns the UNC name of a remote drive

- * (\\Machine\path\path1\path2$)

- * returns NULL if an error occurs

- */

- jstring getRemoteNetworkName(TCHAR driveLetter[],JNIEnv * jnienv){

- 	

- 	unsigned long size =256;

- 	TCHAR buf[256];	

- 	TCHAR drivePath[2];

- 	DWORD err;

- 	jstring result = NULL;

- 	

- 	// always return NULL as UNICODE not implemented

-	// how can we get the label of a remote network name as UNICODE char ? 	

- 	return result;

- 	

-	sprintf(drivePath, "%c:", driveLetter[0]); 	

- 	err = WNetGetConnection(drivePath,buf,&size);

- 	

- 	if (err==WN_SUCCESS){

-		result = WindowsTojstring(jnienv,buf);

-	} else {

-		if (DEBUG)

-			printf("Error WNEtGetConnection %i",err);				

- 	}

-	return result;

- }

-

-

-// JNI METHODS

-// ---------------

-

-/*

- * Class:     org_eclipse_update_configuration_LocalSystemInfo

- * Method:    nativeGetFreeSpace

- * Signature: (Ljava/io/File;)J

- */

-JNIEXPORT jlong JNICALL Java_org_eclipse_update_configuration_LocalSystemInfo_nativeGetFreeSpace(

-	JNIEnv * jnienv,

-	jclass javaClass,

-	jobject file) {

-

-	// to retrive the String

-	jclass cls;

-	jmethodID id;

-	jobject obj;

-

-	// java.io.File.getAbsolutePath()

-	const TCHAR * lpDirectoryName;

-

-	// Windows Parameters

-	__int64 i64FreeBytesAvailableToCaller;

-	__int64 i64TotalNumberOfBytes;

-	__int64 i64TotalNumberOfFreeBytes;

-

-	// the result

-	jlong result = org_eclipse_update_configuration_LocalSystemInfo_SIZE_UNKNOWN;

-

-	// first, obtain the Path from the java.io.File parameter

-	cls = jnienv -> GetObjectClass(file);

-	id = jnienv -> GetMethodID(cls, "getAbsolutePath", "()Ljava/lang/String;");

-	obj = jnienv -> CallObjectMethod(file, id);

-	lpDirectoryName = jnienv -> GetStringUTFChars((jstring) obj, 0);

-	if (DEBUG)

-		printf("Directory: [%s]\n",lpDirectoryName);

-

-	if (int win = (int)getWindowsVersion()<0 && NOWIN95){

-		// windows 95 or other

-		if (DEBUG)

-			printf("Unsupported Windows: %i\n",win);		

-		return result;

-	}

-

-	int err = GetDiskFreeSpaceEx(

-				lpDirectoryName,

-				(PULARGE_INTEGER) & i64FreeBytesAvailableToCaller,

-				(PULARGE_INTEGER) & i64TotalNumberOfBytes,

-				(PULARGE_INTEGER) & i64TotalNumberOfFreeBytes);

-			

-	if (err) {

-		result = (jlong) i64FreeBytesAvailableToCaller;

-	}

-

-	return result;

-}

-

-/*

- * Class:     org_eclipse_update_configuration_LocalSystemInfo

- * Method:    nativeGetLabel

- * Signature: (Ljava/io/File;)Ljava/lang/String;

- */

-JNIEXPORT jstring JNICALL Java_org_eclipse_update_configuration_LocalSystemInfo_nativeGetLabel(

-	JNIEnv * jnienv,

-	jclass javaClass,

-	jobject file) {

-

-	// to retrive the String

-	jclass cls;

-	jmethodID id;

-	jobject obj;

-

-	// java.io.File.getAbsolutePath()

-	const TCHAR * lpDirectoryName;

-

-	// obtain the String from the parameter

-	cls = jnienv -> GetObjectClass(file);

-	id = jnienv -> GetMethodID(cls, "getAbsolutePath", "()Ljava/lang/String;");

-	obj = jnienv -> CallObjectMethod(file, id);

-	lpDirectoryName = jnienv -> GetStringUTFChars((jstring) obj, 0);

-	if (DEBUG)

-		printf("Directory: [%s]\n",lpDirectoryName);

-

-	//

-	jstring result = NULL;

-	int floppy;

-	

-	if (int win = (int)getWindowsVersion()<0 && NOWIN95){

-		// windows 95 or other

-		if (DEBUG)

-			printf("Unsupported Windows: %i\n",win);		

-		return result;

-	}

-		

-	// Make sure we have a String of the Form: <letter>:

-	if (':' == lpDirectoryName[1]) {

-		TCHAR driveLetter[4]; // i.e. -> C:\\

-		memcpy(driveLetter, lpDirectoryName, 2);

-		strcpy(driveLetter + 2, "\\");

-		switch (GetDriveType(driveLetter)) {

-			case DRIVE_REMOTE :

-				// check name of machine and path of remote

-				if (DEBUG)

-					printf("Remote Drive");

-				result = getRemoteNetworkName(driveLetter,jnienv);				

-				break;

-			default :

-				if (DEBUG)

-					printf("Another Drive at %s", driveLetter);

-				result = getLabel(driveLetter,jnienv);

-				break;

-		} 

-	} 

-

-	return result;

-}

-

-/*

- * Class:     org_eclipse_update_configuration_LocalSystemInfo

- * Method:    nativeGetType

- * Signature: (Ljava/io/File;)I

- */

-JNIEXPORT jint JNICALL Java_org_eclipse_update_configuration_LocalSystemInfo_nativeGetType(

-	JNIEnv * jnienv,

-	jclass javaClass,

-	jobject file) {

-

-	// to retrive the String

-	jclass cls;

-	jmethodID id;

-	jobject obj;

-

-	// java.io.File.getAbsolutePath()

-	const TCHAR * lpDirectoryName;

-

-	// obtain the String from the parameter

-	cls = jnienv -> GetObjectClass(file);

-	id = jnienv -> GetMethodID(cls, "getAbsolutePath", "()Ljava/lang/String;");

-	obj = jnienv -> CallObjectMethod(file, id);

-	lpDirectoryName = jnienv -> GetStringUTFChars((jstring) obj, 0);

-	if (DEBUG)

-		printf("Directory: [%s]\n",lpDirectoryName);

-

-	int result = org_eclipse_update_configuration_LocalSystemInfo_VOLUME_UNKNOWN;

-	if (int win = (int)getWindowsVersion()<0 && NOWIN95){

-		// windows 95 or other

-		if (DEBUG)

-			printf("Unsupported Windows: %i\n",win);		

-		return result;

-	}

-	

-	// Make sure we have a String of the Form: <letter>:

-	if (':' == lpDirectoryName[1]) {

-		TCHAR driveLetter[4]; //C:\\

-		memcpy(driveLetter, lpDirectoryName, 2);

-		strcpy(driveLetter + 2, "\\");

-

-		switch (GetDriveType(driveLetter)) {

-			case DRIVE_REMOVABLE :

-				// check if floppy 3.5, floppy 5.25	

-				// or other removable device (USB,PCMCIA ...)

-				if (DEBUG)

-					printf("Removable Device");

-				result = getFloppy(driveLetter);					

-				break;

-			case DRIVE_CDROM :

-				result = org_eclipse_update_configuration_LocalSystemInfo_VOLUME_CDROM;

-				break;

-			case DRIVE_FIXED :

-				result = org_eclipse_update_configuration_LocalSystemInfo_VOLUME_FIXED;

-				break;

-			case DRIVE_REMOTE :

-				result = org_eclipse_update_configuration_LocalSystemInfo_VOLUME_REMOTE;

-				break;

-			case DRIVE_NO_ROOT_DIR :

-				result = org_eclipse_update_configuration_LocalSystemInfo_VOLUME_INVALID_PATH;

-				break;

-			case DRIVE_RAMDISK :

-				result = org_eclipse_update_configuration_LocalSystemInfo_VOLUME_RAMDISK;

-				break;			

-			case DRIVE_UNKNOWN :

-			default :

-				result = org_eclipse_update_configuration_LocalSystemInfo_VOLUME_UNKNOWN;

-				break;

-		}

-	} else {

-		result = org_eclipse_update_configuration_LocalSystemInfo_VOLUME_INVALID_PATH;

-	}

-

-	return result;

-}

-

-/*

- * Class:     org_eclipse_update_configuration_LocalSystemInfo

- * Method:    nativeListMountPoints

- * Signature: ()[Ljava/lang/String;

- */

-JNIEXPORT jobjectArray JNICALL Java_org_eclipse_update_configuration_LocalSystemInfo_nativeListMountPoints(

-	JNIEnv * jnienv,

-	jclass javaClass) {

-

-	//

-	DWORD logDrives;

-	UINT drive;

-	TCHAR driveName[100];

-	jobjectArray returnArray;

-	int nDrive = 0;

-

-	// 

-	jclass stringClass;

-	jobject empty;

-	int index = 0;

-	jobject str;

-

-

-	logDrives = GetLogicalDrives();

-	for (drive = 0; drive < 32; drive++) {

-		if (logDrives & (1 << drive)) {

-			nDrive++;

-		}

-	}

-

-	stringClass = jnienv -> FindClass("java/lang/String");

-	empty = jnienv -> NewStringUTF("");

-	returnArray = jnienv -> NewObjectArray(nDrive, stringClass, empty);

-

-	if (int win = (int)getWindowsVersion()<0 && NOWIN95){

-		// windows 95 or other

-		if (DEBUG)

-			printf("Unsupported Windows: %i\n",win);	

-		return NULL;

-	}

-

-	for (drive = 0; drive < 32; drive++) {

-		if (logDrives & (1 << drive)) {

-			sprintf(driveName, "%c:\\", drive + 'A');

-			str = jnienv -> NewStringUTF(driveName);

-			jnienv -> SetObjectArrayElement(returnArray, index, str);

-			index++;

-		}

-	}

-

-	return returnArray;

-}

-

diff --git a/update/org.eclipse.update.core.win32/src/update.h b/update/org.eclipse.update.core.win32/src/update.h
deleted file mode 100644
index 35673d1..0000000
--- a/update/org.eclipse.update.core.win32/src/update.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-
-/*******************************************************************************
- * Copyright (c) 2000, 2002 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-#include <jni.h>

-/* Header for class org_eclipse_update_configuration_LocalSystemInfo */
-
-#ifndef _Included_org_eclipse_update_configuration_LocalSystemInfo
-#define _Included_org_eclipse_update_configuration_LocalSystemInfo

-#ifdef __cplusplus
-extern "C" {
-#endif

-#undef org_eclipse_update_configuration_LocalSystemInfo_SIZE_UNKNOWN
-#define org_eclipse_update_configuration_LocalSystemInfo_SIZE_UNKNOWN -1L

-#undef org_eclipse_update_configuration_LocalSystemInfo_VOLUME_UNKNOWN
-#define org_eclipse_update_configuration_LocalSystemInfo_VOLUME_UNKNOWN -1L

-#undef org_eclipse_update_configuration_LocalSystemInfo_VOLUME_INVALID_PATH
-#define org_eclipse_update_configuration_LocalSystemInfo_VOLUME_INVALID_PATH -2L

-#undef org_eclipse_update_configuration_LocalSystemInfo_VOLUME_REMOVABLE
-#define org_eclipse_update_configuration_LocalSystemInfo_VOLUME_REMOVABLE 1L

-#undef org_eclipse_update_configuration_LocalSystemInfo_VOLUME_FIXED
-#define org_eclipse_update_configuration_LocalSystemInfo_VOLUME_FIXED 2L

-#undef org_eclipse_update_configuration_LocalSystemInfo_VOLUME_REMOTE
-#define org_eclipse_update_configuration_LocalSystemInfo_VOLUME_REMOTE 3L
-#undef org_eclipse_update_configuration_LocalSystemInfo_VOLUME_CDROM
-#define org_eclipse_update_configuration_LocalSystemInfo_VOLUME_CDROM 4L
-#undef org_eclipse_update_configuration_LocalSystemInfo_VOLUME_RAMDISK
-#define org_eclipse_update_configuration_LocalSystemInfo_VOLUME_RAMDISK 5L
-#undef org_eclipse_update_configuration_LocalSystemInfo_VOLUME_FLOPPY_5
-#define org_eclipse_update_configuration_LocalSystemInfo_VOLUME_FLOPPY_5 6L
-#undef org_eclipse_update_configuration_LocalSystemInfo_VOLUME_FLOPPY_3
-#define org_eclipse_update_configuration_LocalSystemInfo_VOLUME_FLOPPY_3 7L

-/* Inaccessible static: listeners */

-/* Inaccessible static: hasNatives */

-/*

- * Class:     org_eclipse_update_configuration_LocalSystemInfo

- * Method:    nativeGetFreeSpace

- * Signature: (Ljava/io/File;)J

- */

-JNIEXPORT jlong JNICALL Java_org_eclipse_update_configuration_LocalSystemInfo_nativeGetFreeSpace

-  (JNIEnv *, jclass, jobject);
-

-/*

- * Class:     org_eclipse_update_configuration_LocalSystemInfo

- * Method:    nativeGetLabel

- * Signature: (Ljava/io/File;)Ljava/lang/String;

- */

-JNIEXPORT jstring JNICALL Java_org_eclipse_update_configuration_LocalSystemInfo_nativeGetLabel

-  (JNIEnv *, jclass, jobject);
-

-/*

- * Class:     org_eclipse_update_configuration_LocalSystemInfo

- * Method:    nativeGetType

- * Signature: (Ljava/io/File;)I

- */

-JNIEXPORT jint JNICALL Java_org_eclipse_update_configuration_LocalSystemInfo_nativeGetType

-  (JNIEnv *, jclass, jobject);
-

-/*

- * Class:     org_eclipse_update_configuration_LocalSystemInfo

- * Method:    nativeListMountPoints

- * Signature: ()[Ljava/lang/String;

- */

-JNIEXPORT jobjectArray JNICALL Java_org_eclipse_update_configuration_LocalSystemInfo_nativeListMountPoints

-  (JNIEnv *, jclass);
-

-#ifdef __cplusplus
-}
-
-#endif

-#endif

diff --git a/update/org.eclipse.update.examples/.classpath b/update/org.eclipse.update.examples/.classpath
deleted file mode 100644
index b48fe2a..0000000
--- a/update/org.eclipse.update.examples/.classpath
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-    <classpathentry kind="src" path="src/"/>
-    <classpathentry kind="src" path="/org.eclipse.core.runtime"/>
-    <classpathentry kind="src" path="/org.apache.xerces"/>
-    <classpathentry kind="src" path="/org.eclipse.core.boot"/>
-    <classpathentry kind="src" path="/org.eclipse.update.core"/>
-    <classpathentry kind="var" path="JRE_LIB" rootpath="JRE_SRCROOT" sourcepath="JRE_SRC"/>
-    <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/update/org.eclipse.update.examples/.cvsignore b/update/org.eclipse.update.examples/.cvsignore
deleted file mode 100644
index c5e82d7..0000000
--- a/update/org.eclipse.update.examples/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
\ No newline at end of file
diff --git a/update/org.eclipse.update.examples/.project b/update/org.eclipse.update.examples/.project
deleted file mode 100644
index 39cb54a..0000000
--- a/update/org.eclipse.update.examples/.project
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.update.examples</name>

-	<comment></comment>

-	<projects>

-		<project>org.apache.xerces</project>

-		<project>org.eclipse.core.boot</project>

-		<project>org.eclipse.core.runtime</project>

-		<project>org.eclipse.update.core</project>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ui.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ui.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-		<nature>org.eclipse.pde.ui.PluginNature</nature>

-		<nature>org.eclipse.team.cvs.core.cvsnature</nature>

-	</natures>

-</projectDescription>

diff --git a/update/org.eclipse.update.examples/Scrapbook2.jpage b/update/org.eclipse.update.examples/Scrapbook2.jpage
deleted file mode 100644
index b5da99a..0000000
--- a/update/org.eclipse.update.examples/Scrapbook2.jpage
+++ /dev/null
@@ -1,111 +0,0 @@
-SiteManager.getSite(URL)throws CoreException

-  String type = getTypeForprotocol(URL.getprotocol);

-  try {

-    if (type != null){

-	attemptCreationSite(type,URL);

-    } else {

-	attemptCreationSite("http",URL);

-    }

-  } catch (CoreException e){

-    throw new CoreException("Cannot create site",e.getMessage());

-  }

-

-SiteManager.attemptCreationSite(type,URL)throws CoreException

-  try {

-    createSite(type,URL);

-  } catch (InvalidTypeException e){

-    try {

-      createSite(e.getRealType(),URL);

-    } catch (InvalidSiteExeption e){

-      throw new CoreException("Wrong site type");

-    }

-  }

-

-SiteManager.createSite(type,URL) throws CoreExeption, InvalidSiteTypeException

-

-

-try {

-			

-	factory.createSite(url, forceCreation);

-	

-} catch (IOException e) {

-	// if the URL is pointing to either a file 

-// or a directory, without reference			

-if (url.getRef() != null) {

-	// 4 nothing we can do

-	throw newCoreException("Error accessing url:"+url.toExternalForm()+"\r\n"+e.getMessage(),e);

-} else if (url.getFile().endsWith("/")) {

-	// 1 try to add site.xml

-	try {

-		url = new URL(url,Site.SITE_XML);

-	} catch (MalformedURLException e1){

-		throw newCoreException("Cannot create URL:"+url.toExternalForm()+"+"+Site.SITE_XML,e1);

-	}

-	try {

-		site = factory.createSite(url, forceCreation);

-	} catch (ParsingException e1){

-		throw newCoreException("Error parsing URL:"+url.toExternalForm()+"\r\n"+e1.getMessage(),e1);					

-	} catch (IOException e1){

-		throw newCoreException("Error accessing url:"+url.toExternalForm()+"\r\n"+e1.getMessage(),e1);					

-	}

-} else if (url.getFile().endsWith(Site.SITE_XML)) {

-	// 3 nothing we can do

-	throw newCoreException("Error accessing url:"+url.toExternalForm()+"\r\n"+e.getMessage(),e);

-} else {

-	// 2 try to add /site.xml

-	try {

-		url = new URL(url.getProtocol(),url.getHost(), url.getPort(), url.getFile()+"/"+Site.SITE_XML);

-	} catch (MalformedURLException e1){

-		throw newCoreException("Cannot create URL:"+url.toExternalForm()+"+"+Site.SITE_XML,e1);

-	}

-	

-	try {

-		site = factory.createSite(url, forceCreation);

-	} catch (ParsingException e1){

-		throw newCoreException("Error parsing URL:"+url.toExternalForm()+"\r\n"+e1.getMessage()+"\r\nPrevious Input/Output Error:"+e.getMessage(),e1);					

-	} catch (IOException e1){

-		throw newCoreException("Error accessing url:"+url.toExternalForm()+"\r\n"+e1.getMessage()+"\r\nPrevious Input/Output Error:"+e.getMessage(),e1);					

-				}				

-			}

-

-		} catch (ParsingException e) {

-			

-			// if the URL is pointing to either a file 

-// or a directory, without reference			

-if (url.getRef() != null) {

-	// 4 nothing we can do

-	throw newCoreException("Error parsing URL:"+url.toExternalForm()+"\r\n"+e.getMessage(),e);

-} else if (url.getFile().endsWith("/")) {

-	// 1 try to add site.xml

-	try {

-		url = new URL(url,Site.SITE_XML);

-	} catch (MalformedURLException e1){

-		throw newCoreException("Cannot create URL:"+url.toExternalForm()+"+"+Site.SITE_XML,e1);

-	}

-	try {

-		site = factory.createSite(url, forceCreation);

-	} catch (ParsingException e1){

-		throw newCoreException("Error parsing URL:"+url.toExternalForm()+"\r\n"+e1.getMessage(),e1);					

-	} catch (IOException e1){

-		throw newCoreException("Error accessing url:"+url.toExternalForm()+"\r\n"+e1.getMessage(),e1);

-				}				

-

-			} else if (url.getFile().endsWith(Site.SITE_XML)) {

-				// 3 nothing we can do

-	throw newCoreException("Error parsing URL:"+url.toExternalForm()+"\r\n"+e.getMessage(),e);					

-} else {

-	// 2 try to add /site.xml

-	

-	try {

-		url = new URL(url.getProtocol(),url.getHost(), url.getPort(), url.getFile()+"/"+Site.SITE_XML);

-	} catch (MalformedURLException e1){

-		throw newCoreException("Cannot create URL:"+url.toExternalForm()+"+"+Site.SITE_XML,e1);

-	}

-	try {

-		site = factory.createSite(url, forceCreation);

-	} catch (ParsingException e1){

-		throw newCoreException("Error parsing URL:"+url.toExternalForm()+"\r\n"+e1.getMessage()+"\r\nPrevious Parsing error:"+e.getMessage(),e1);					

-	} catch (IOException e1){

-		throw newCoreException("Error accessing url:"+url.toExternalForm()+"\r\n"+e1.getMessage()+"\r\nPrevious Parsing error:"+e.getMessage(),e1);

-	

-

diff --git a/update/org.eclipse.update.examples/about.html b/update/org.eclipse.update.examples/about.html
deleted file mode 100644
index 768324e..0000000
--- a/update/org.eclipse.update.examples/about.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<html>

-<head>

-<title>About</title>

-<style type="text/css">

-p, table, td, th { font-family: arial, helvetica, geneva; font-size: 10pt}

-pre { font-family: "Courier New", Courier, mono; font-size: 10pt}

-h2 { font-family: arial, helvetica, geneva; font-size: 18pt; font-weight: bold ; line-height: 14px}

-code { font-family: "Courier New", Courier, mono; font-size: 10pt}

-sup { font-family: arial,helvetica,geneva; font-size: 10px}

-h3 { font-family: arial, helvetica, geneva; font-size: 14pt; font-weight: bold}

-li { font-family: arial, helvetica, geneva; font-size: 10pt}

-h1 { font-family: arial, helvetica, geneva; font-size: 28px; font-weight: bold}

-body { font-family: arial, helvetica, geneva; font-size: 10pt; clip: rect(   ); margin-top: 5mm; margin-left: 3mm}

-</style>

-</head>

-<body lang="EN-US" link="blue" vlink="purple">

-<table border="0" cellspacing="5" cellpadding="2" width="100%" >

-  <tr> 

-    <td align="LEFT" valign="TOP" colspan="2" bgcolor="#0080C0"><b><font color="#FFFFFF">About This Content</font></b></td>

-  </tr>

-  <tr> 

-    <td> 

-<p>11th December, 2001</p>	

-<h3>License</h3>

-<p>Eclipse.org makes available all content in this plug-in &quot;Content&quot;.  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the

-<a href="http://www.eclipse.org/legal/cpl-v05.html">Common Public License Version 0.5</a> &quot;CPL&quot;.  For purposes of the CPL, &quot;Program&quot; will mean the Content.</p>

-

-<h3>Contributions</h3>

-

-<p>If this Content is licensed to you under the terms and conditions of the CPL, any Contributions, as defined in the CPL, uploaded, submitted, or otherwise

-made available to Eclipse.org, members of Eclipse.org and/or the host of Eclipse.org web site, by you that relate to such

-Content are provided under the terms and conditions of the CPL and can be made available to others under the terms of the CPL.</p>

-

-<p>If this Content is licensed to you under license terms and conditions other than the CPL &quot;Other License&quot;, any modifications, enhancements and/or

-other code and/or documentation &quot;Modifications&quot; uploaded, submitted, or otherwise made available to Eclipse.org, members of Eclipse.org and/or the

-host of Eclipse.org, by you that relate to such Content are provided under terms and conditions of the Other License and can be made available

-to others under the terms of the Other License.  In addition, with regard to Modifications for which you are the copyright holder, you are also

-providing the Modifications under the terms and conditions of the CPL and such Modifications can be made available to others under the terms of

-the CPL.</p>

-</td></tr></table>

-</body>

-</html>
\ No newline at end of file
diff --git a/update/org.eclipse.update.examples/build.properties b/update/org.eclipse.update.examples/build.properties
deleted file mode 100644
index fda21a6..0000000
--- a/update/org.eclipse.update.examples/build.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-source.updateexamplescore.jar = src/

-src.includes=about.html

-bin.includes=plugin.xml,plugin.properties,*.jar,about.html

diff --git a/update/org.eclipse.update.examples/plugin.properties b/update/org.eclipse.update.examples/plugin.properties
deleted file mode 100644
index 9a31f8c..0000000
--- a/update/org.eclipse.update.examples/plugin.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-

-name = Install/Update BuildZip Example

-provider-name = Eclipse.org
\ No newline at end of file
diff --git a/update/org.eclipse.update.examples/plugin.xml b/update/org.eclipse.update.examples/plugin.xml
deleted file mode 100644
index e8b4092..0000000
--- a/update/org.eclipse.update.examples/plugin.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<plugin

-   id="org.eclipse.update.examples"

-   name="%name"

-   version="2.0.0"

-   provider-name="%provider-name">

-

-   <runtime>

-      <library name="updateexamples.jar">

-         <export name="*"/>

-      </library>

-   </runtime>

-   <requires>

-      <import plugin="org.eclipse.core.runtime"/>

-      <import plugin="org.apache.xerces"/>

-      <import plugin="org.eclipse.core.boot"/>

-      <import plugin="org.eclipse.update.core"/>

-   </requires>

-

-

-   <extension

-         id="zip"

-         point="org.eclipse.update.core.featureTypes">

-      <feature-factory

-            class="org.eclipse.update.examples.buildzip.BuildZipFeatureFactory">

-      </feature-factory>

-   </extension>

-   <extension

-         id="site.zip"

-         point="org.eclipse.update.core.siteTypes">

-      <site-factory

-            class="org.eclipse.update.examples.buildzip.BuildZipSiteFactory">

-      </site-factory>

-   </extension>

-   <extension

-         id="site.freeform"

-         point="org.eclipse.update.core.siteTypes">

-      <site-factory

-            class="org.eclipse.update.examples.freeform.FreeFormSiteFactory">

-      </site-factory>

-   </extension>

-

-</plugin>

diff --git a/update/org.eclipse.update.examples/site/features/com.reddot.reddot_1.0.0.jar b/update/org.eclipse.update.examples/site/features/com.reddot.reddot_1.0.0.jar
deleted file mode 100644
index 06507a7..0000000
--- a/update/org.eclipse.update.examples/site/features/com.reddot.reddot_1.0.0.jar
+++ /dev/null
Binary files differ
diff --git a/update/org.eclipse.update.examples/site/features/com.reddot.reddot_2.0.0.jar b/update/org.eclipse.update.examples/site/features/com.reddot.reddot_2.0.0.jar
deleted file mode 100644
index 7236815..0000000
--- a/update/org.eclipse.update.examples/site/features/com.reddot.reddot_2.0.0.jar
+++ /dev/null
Binary files differ
diff --git a/update/org.eclipse.update.examples/site/info/images/redDot.jpg b/update/org.eclipse.update.examples/site/info/images/redDot.jpg
deleted file mode 100644
index f0fb5c3..0000000
--- a/update/org.eclipse.update.examples/site/info/images/redDot.jpg
+++ /dev/null
Binary files differ
diff --git a/update/org.eclipse.update.examples/site/info/siteInfo.html b/update/org.eclipse.update.examples/site/info/siteInfo.html
deleted file mode 100644
index ceca97d..0000000
--- a/update/org.eclipse.update.examples/site/info/siteInfo.html
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<!-- saved from url=(0040)http://dejan/testSite/info/siteInfo.html -->
-<HTML><HEAD>
-<META http-equiv=Content-Type content="text/html; charset=windows-1252">
-<META content="MSHTML 5.50.4807.2300" name=GENERATOR></HEAD>
-<BODY>
-<H1 align=left><IMG height=55 src="images/redDot.jpg" width=56 
-align=center border=0> <FONT color=#c0c0c0>Follow the Red Dot&nbsp;</FONT></H1>
-<P>Welcome to the <B><FONT color=#800000>Red Dot</FONT> </B>update site. Use 
-your Eclipse <B>Update Sites</B> view to locate the feature version you want to 
-install or update to.</P>
-<H2>About Red Dot Feature</H2>
-<P>Our revolutionary Red Dot Eclipse feature changed all preconceptions about 
-what Eclipse features can and cannot do. Using our strikingly simple concept of 
-adding buttons to the Eclipse tool bar, we allow you to open dialogs that show 
-you the version of the Red Dot feature. The beauty of the concept stems from its 
-simplicity, ease of use, high performance and small footprint. Never before was 
-it so easy to press a button on the tool bar to get some text shown in the 
-dialog.</P>
-<H2>News</H2>
-<UL>
-  <LI><B>November 2001</B> - version 2.0.0 of the Red Dot feature is available 
-  for download. This version brings improvements across the board, further 
-  strengthening an already established Eclipse feature classic. Improvements 
-  will be visible the moment you update your feature - our famous red dot tool 
-  bar button is now <B>25% more red</B>, making it even easier to spot among 
-  other buttons. 
-  <LI><B>October 2001</B> - version 1.0.0 of the Red Dot feature is available 
-  for download. Select it in the 'Sites' view of the Update Manager and press 
-  'Install' button. </LI></UL>
-<HR>
-<I>Copyright 2001 Red Dot Corporation Ltd. All rights reserved.</I> 
-</BODY></HTML>
diff --git a/update/org.eclipse.update.examples/site/plugins/com.reddot.reddot_1.0.0.jar b/update/org.eclipse.update.examples/site/plugins/com.reddot.reddot_1.0.0.jar
deleted file mode 100644
index c88b793..0000000
--- a/update/org.eclipse.update.examples/site/plugins/com.reddot.reddot_1.0.0.jar
+++ /dev/null
Binary files differ
diff --git a/update/org.eclipse.update.examples/site/plugins/com.reddot.reddot_2.0.0.jar b/update/org.eclipse.update.examples/site/plugins/com.reddot.reddot_2.0.0.jar
deleted file mode 100644
index da31ad3..0000000
--- a/update/org.eclipse.update.examples/site/plugins/com.reddot.reddot_2.0.0.jar
+++ /dev/null
Binary files differ
diff --git a/update/org.eclipse.update.examples/site/site.xml b/update/org.eclipse.update.examples/site/site.xml
deleted file mode 100644
index b091324..0000000
--- a/update/org.eclipse.update.examples/site/site.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<site>
-   <description url="info/siteInfo.html"/>
-
-   <feature url="features/com.reddot.reddot_1.0.0.jar">
-      <category name="reddot"/>
-   </feature>
-
-   <feature url="features/com.reddot.reddot_2.0.0.jar">
-      <category name="reddot"/>
-   </feature>
-
-   <category-def label="Red Dot Versions" name="reddot">
-      <description url="info/RedDotVersions.html">
-         This category contains all of the currently available versions of Red Dot feature.
-      </description>
-   </category-def>
-
-</site>   
\ No newline at end of file
diff --git a/update/org.eclipse.update.examples/src/org/eclipse/update/examples/buildzip/BuildZipConverter.java b/update/org.eclipse.update.examples/src/org/eclipse/update/examples/buildzip/BuildZipConverter.java
deleted file mode 100644
index c104c18..0000000
--- a/update/org.eclipse.update.examples/src/org/eclipse/update/examples/buildzip/BuildZipConverter.java
+++ /dev/null
@@ -1,157 +0,0 @@
-package org.eclipse.update.examples.buildzip;
-
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */ 
- 
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.StringBufferInputStream;
-import java.net.URL;
-import java.util.Properties;
-import java.util.jar.JarEntry;
-import java.util.jar.JarOutputStream;
-
-import org.eclipse.update.core.*;
-import org.eclipse.update.core.ContentReference;
-import org.eclipse.update.core.IFeature;
-import org.eclipse.update.core.IFeatureContentProvider;
-import org.eclipse.update.core.IPluginEntry;
-import org.eclipse.update.core.JarContentReference;
-import org.eclipse.update.core.model.InstallAbortedException;
-

-/**

- * Converts eclipse build .zip files into packaged feature

- */

-public class BuildZipConverter {

-

-	public static void main(String[] args) {
-		if (args.length <=0) {
-			System.out.println("Usage:     BuildZipConverter <path to the zip file>.\r\nExample: BuildZipConverter d:/download/integration-eclipse-SDK-20020109-win32.zip");
-			return;
-		}
-		try {
-			URL buildzip = new URL(("file:"+args[0]).replace(File.separatorChar, '/'));
-			BuildZipFeatureFactory factory = new BuildZipFeatureFactory();
-			IFeature feature = factory.createFeature(buildzip, null);
-			IFeatureContentProvider provider = feature.getFeatureContentProvider();
-			
-			ContentReference[] refs = provider.getFeatureEntryContentReferences(null);
-			
-			File site = new File((args[0]+".packaged/").replace('/',File.separatorChar));
-			site.mkdirs();
-			File featuresDir = new File(site,"features");
-			featuresDir.mkdirs();
-			File pluginsDir = new File(site, "plugins");
-			pluginsDir.mkdirs();
-			
-			File jarFile = new File(featuresDir,feature.getVersionedIdentifier()+".jar");
-			System.out.println("writing feature archive: "+feature.getVersionedIdentifier()+".jar");
-			writeJar(jarFile, refs, feature, null, null);
-			JarContentReference jar = new JarContentReference("build.zip",buildzip);
-			Properties manifest = getBuildManifest(jar);
-			
-			IPluginEntry[] plugins = feature.getPluginEntries();
-			for (int i=0; i<plugins.length; i++) {
-				refs = provider.getPluginEntryContentReferences(plugins[i], null);
-				jarFile = new File(pluginsDir,plugins[i].getVersionedIdentifier()+".jar");
-				System.out.println("writing plugin archive: "+plugins[i].getVersionedIdentifier()+".jar");
-				writeJar(jarFile, refs, feature, plugins[i].getVersionedIdentifier().getIdentifier(), manifest);
-			}
-			
-			writeSiteManifest(site, feature);
-		} catch(Exception e) {
-			e.printStackTrace();
-		}

-	}
-	
-	public static void writeJar(File jarFile,ContentReference[] refs, IFeature feature, String pluginId, Properties manifest) {
-			
-		JarOutputStream jos = null;
-		FileOutputStream os = null;
-		InputStream is = null;
-		
-		try {
-			os = new FileOutputStream(jarFile);
-			jos = new JarOutputStream(os);
-			JarEntry entry = null;
-			String buf = null;
-			StringBufferInputStream sbis = null;
-			
-			// write jar manifest (first entry in output stream)
-			buf = "Manifest-Version: 1.0\nCreated-By: 2.0.0 (www.eclipse.org Feature Packager)\n";
-			sbis = new StringBufferInputStream(buf);
-			entry = new JarEntry("META-INF/MANIFEST.MF");
-			jos.putNextEntry(entry);
-			Utilities.copy(sbis,jos,null);
-			sbis.close();
-			
-			// jar up the references
-			for (int i=0; i<refs.length; i++) {
-				String id = refs[i].getIdentifier();
-				entry = new JarEntry(id);
-				jos.putNextEntry(entry);
-				is = refs[i].getInputStream();
-				Utilities.copy(is,jos,null);
-				is.close(); is = null;
-			}
-			
-			// for plugin jars, write build manifest
-			if (pluginId != null && manifest != null) {
-				String key = "plugin@"+pluginId;
-				String value = manifest.getProperty(key);
-				if (value != null) {
-					if (value.equals("HEAD")) {
-						value += "-" + feature.getVersionedIdentifier().getVersion().getMajorComponent();
-					}
-					buf = key + "=" + value;
-					sbis = new StringBufferInputStream(buf);
-					entry = new JarEntry("buildmanifest.properties");
-					jos.putNextEntry(entry);
-					Utilities.copy(sbis,jos,null);
-					sbis.close();
-				}
-			}
-			
-			// close jar
-			jos.close(); jos = null; os = null;
-		} catch(Exception e) {
-			e.printStackTrace();
-		} finally {
-			if (is != null) 
-				try {is.close();} catch(IOException e) {}
-				
-			if (jos != null) 
-				try {jos.close();} catch(IOException e) {}
-			else if (os != null)
-				try {os.close();} catch(IOException e) {}
-		}		
-	}
-	
-	public static void writeSiteManifest(File site, IFeature feature) throws IOException, InstallAbortedException {
-		File manifest = new File(site, "site.xml");
-		FileOutputStream os = new FileOutputStream(manifest);
-		String siteXML = "<site>\n   <feature url=\"features/"+feature.getVersionedIdentifier().toString()+".jar\"/>\n</site>";
-		StringBufferInputStream sbis = new StringBufferInputStream(siteXML);
-		Utilities.copy(sbis,os,null);
-		os.close();
-		sbis.close();
-	}
-	
-	public static Properties getBuildManifest(JarContentReference jar) throws IOException {
-		ContentReference manifestEntry = jar.peek("eclipse/buildmanifest.properties",null/*ContentSelector*/, null/*ProgressMonitor*/);
-		InputStream is = null;
-		Properties props = null;
-		try {
-			props = new Properties();
-			is = manifestEntry.getInputStream();
-			props.load(is);
-		} finally {
-			if (is != null) try{ is.close(); } catch(IOException e) {}
-		}
-		return props;
-	}

-}

diff --git a/update/org.eclipse.update.examples/src/org/eclipse/update/examples/buildzip/BuildZipFeatureContentProvider.java b/update/org.eclipse.update.examples/src/org/eclipse/update/examples/buildzip/BuildZipFeatureContentProvider.java
deleted file mode 100644
index a0f1c0e..0000000
--- a/update/org.eclipse.update.examples/src/org/eclipse/update/examples/buildzip/BuildZipFeatureContentProvider.java
+++ /dev/null
@@ -1,256 +0,0 @@
-package org.eclipse.update.examples.buildzip;

-

-/*

- * (c) Copyright IBM Corp. 2000, 2002.

- * All Rights Reserved.

- */ 

-

-import java.io.File;

-import java.io.FileOutputStream;

-import java.io.IOException;

-import java.net.URL;

-import java.util.jar.JarEntry;

-

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.core.runtime.IStatus;

-import org.eclipse.core.runtime.Status;

-import org.eclipse.update.core.*;

-import org.eclipse.update.core.ContentReference;

-import org.eclipse.update.core.FeatureContentProvider;

-import org.eclipse.update.core.IFeatureContentProvider;

-import org.eclipse.update.core.INonPluginEntry;

-import org.eclipse.update.core.IPluginEntry;

-import org.eclipse.update.core.IVerifier;

-import org.eclipse.update.core.InstallMonitor;

-import org.eclipse.update.core.JarContentReference;

-import org.eclipse.update.core.JarContentReference.ContentSelector;

-import org.eclipse.update.core.model.FeatureModel;

-import org.eclipse.update.core.model.InstallAbortedException;

-

-/**

- * An example feature content provider. It handles features packaged as

- * build zip's using the format used for integration and stable builds

- * posted on the downloads pages at www.eclipse.org

- * </p>

- * @since 2.0

- */

-

-public class BuildZipFeatureContentProvider extends FeatureContentProvider implements IFeatureContentProvider {

-

-	private JarContentReference baseReference;

-	private ContentReference generatedFeatureManifest;	

-	private ContentReference[] featureEntryContentReferences;

-	private IPluginEntry currentPluginEntry;

-	private INonPluginEntry currentNonPluginEntry;

-	

-	public BuildZipFeatureContentProvider(URL base) {

-		super(base);

-		this.baseReference = new JarContentReference("build.zip",base);

-	}

-	

-	/*

-	 * @see IFeatureContentProvider#getFeatureManifest()

-	 */

-	public ContentReference getFeatureManifestReference(InstallMonitor monitor) throws CoreException {

-		if (generatedFeatureManifest == null) {

-			throw newCoreException("Feature manifest is not available",null);

-		}

-		else

-			return generatedFeatureManifest;

-	}

-

-	/*

-	 * @see IFeatureContentProvider#getArchiveReferences()

-	 */

-	public ContentReference[] getArchiveReferences(InstallMonitor monitor) {

-		// the feature and all its plugins files are packaged in a single archive

-		return new ContentReference[] { baseReference };

-	}

-

-	/*

-	 * @see IFeatureContentProvider#getFeatureEntryArchiveReferences()

-	 */

-	public ContentReference[] getFeatureEntryArchiveReferences(InstallMonitor monitor) {

-		// the feature and all its plugins files are packaged in a single archive

-		return new ContentReference[] { baseReference };

-	}

-

-	/*

-	 * @see IFeatureContentProvider#getPluginEntryArchiveReferences(IPluginEntry)

-	 */

-	public ContentReference[] getPluginEntryArchiveReferences(IPluginEntry pluginEntry, InstallMonitor monitor) {

-		// the feature and all its plugins files are packaged in a single archive

-		return new ContentReference[] { baseReference };

-	}

-

-	/*

-	 * @see IFeatureContentProvider#getNonPluginEntryArchiveReferences(INonPluginEntry)

-	 */

-	public ContentReference[] getNonPluginEntryArchiveReferences(INonPluginEntry nonPluginEntry, InstallMonitor monitor) 

-		throws CoreException {

-		try {

-			return peekNonPluginEntryContent(nonPluginEntry,monitor);

-		} catch(IOException e) {

-			throw newCoreException("Unable to return content for non plugin entry "+nonPluginEntry.getIdentifier(),e);

-		}

-	}

-

-	/*

-	 * @see IFeatureContentProvider#getFeatureEntryContentReferences()

-	 */

-	public ContentReference[] getFeatureEntryContentReferences(InstallMonitor monitor) {

-		if (featureEntryContentReferences == null)

-			return new ContentReference[0];

-		else

-			return  featureEntryContentReferences;

-	}

-

-	/*

-	 * @see IFeatureContentProvider#getPluginEntryContentReferences(IPluginEntry)

-	 */

-	public ContentReference[] getPluginEntryContentReferences(IPluginEntry pluginEntry, InstallMonitor monitor)

-		throws CoreException {

-		try {

-			return peekPluginEntryContent(pluginEntry, monitor);

-		} catch(IOException e) {

-			throw newCoreException("Unable to return content for plugin entry "+pluginEntry.getVersionedIdentifier(),e);

-		}

-	}

-	

-	public URL getFeatureBaseURL() throws IOException {

-		return getWorkingDirectory().toURL();

-			

-	}

-

-	ContentReference getFeatureBuildManifest() throws Exception {

-		return baseReference.peek("eclipse/buildmanifest.properties",null/*ContentSelector*/, null/*ProgressMonitor*/);

-	}

-

-	ContentReference getPluginManifest(String pluginId, boolean isFragment) throws Exception {			

-		String manifestName = "eclipse/plugins/" + pluginId + "/" + (isFragment ? "fragment.xml" : "plugin.xml");

-		return baseReference.peek(manifestName, null/*ContentSelector*/, null/*ProgressMonitor*/);

-	}

-	

-	void unpackFeatureEntryContent(FeatureModel feature, InstallMonitor monitor) throws IOException, InstallAbortedException {

-			

-		// define selector for feature entry files

-		ContentSelector selector = new ContentSelector() {

-			public boolean include(JarEntry jarEntry) {

-				if (jarEntry.isDirectory())

-					return false;					

-				String entry = jarEntry.getName();

-				if (entry.startsWith("eclipse/readme/"))

-					return true;

-				else if (entry.startsWith("eclipse/splash/"))

-					return true;

-				else if (entry.startsWith("eclipse/") && entry.indexOf("/",8)==-1 && entry.endsWith(".html"))

-					return true;

-				else

-					return false;	

-			}

-			public String defineIdentifier(JarEntry jarEntry) {

-				String entry = jarEntry.getName();

-				if (entry.startsWith("eclipse/"))

-					return entry.substring(8);

-				else

-					return entry;

-			}

-		};

-		

-		// unpack feature entry files

-		File tmpDir = getWorkingDirectory();

-		ContentReference[] refs = baseReference.unpack(tmpDir, selector, monitor);

-		

-		// write out feature manifest (feature.xml);

-		File manifest = Utilities.createLocalFile(tmpDir,"feature.xml");

-		ContentReference manifestReference = new ContentReference("feature.xml", manifest);

-		DefaultModelWriter w = new DefaultModelWriter(feature);

-		FileOutputStream os = null;

-		try {

-			os = new FileOutputStream(manifest);

-			w.writeFeatureManifest(os);

-		} finally {

-			if (os != null) try { os.close(); } catch(IOException e) {}

-		}

-		this.generatedFeatureManifest = manifestReference;

-		

-		// save references (newly-written feature.xml plus rest of selected feature files)

-		ContentReference[] allRefs = new ContentReference[refs.length+1];

-		allRefs[0] = manifestReference;

-		System.arraycopy(refs,0,allRefs,1,refs.length);

-		featureEntryContentReferences = allRefs;

-	}

-		

-	ContentReference[] peekPluginEntryContent(IPluginEntry plugin, InstallMonitor monitor) throws IOException {

-		

-		// define selector for plugin entry files

-		ContentSelector selector = new ContentSelector() {

-			public boolean include(JarEntry jarEntry) {

-				if (jarEntry.isDirectory())

-					return false;

-				String entry = jarEntry.getName();

-				String id = currentPluginEntry.getVersionedIdentifier().getIdentifier();

-				if (id==null)

-					return false;

-				else if (entry.startsWith("eclipse/plugins/"+id+"/"))

-					return true;

-				else

-					return false;	

-			}

-			public String defineIdentifier(JarEntry jarEntry) {

-				String entry = jarEntry.getName();

-				int ix = entry.indexOf("/",16);

-				if (ix != -1) {

-					return entry.substring(ix+1);

-				} else {

-					return entry;

-				}

-			}

-		};

-		

-		// unpack plugin entry files

-		currentPluginEntry = plugin;

-		return baseReference.peek(selector, monitor);

-	}

-		

-	ContentReference[] peekNonPluginEntryContent(INonPluginEntry data, InstallMonitor monitor) throws IOException {

-		

-		// define selector for non plugin entry files

-		ContentSelector selector = new ContentSelector() {

-			public boolean include(JarEntry jarEntry) {

-				if (jarEntry.isDirectory())

-					return false;

-				String entry = jarEntry.getName();

-				String id = currentNonPluginEntry.getIdentifier();

-				if (!id.equals("root"))

-					return false;

-				else if (!entry.startsWith("eclipse/plugins/"))

-					return true;

-				else

-					return false;	

-			}

-			public String defineIdentifier(JarEntry jarEntry) {

-				String entry = jarEntry.getName();

-				if (entry.startsWith("eclipse/"))

-					return entry.substring(8);

-				else

-					return entry;

-			}

-		};

-		

-		// unpack non plugin entry files

-		currentNonPluginEntry = data;

-		return baseReference.peek(selector, monitor);

-	}

-	

-	private CoreException newCoreException(String s, Throwable e) throws CoreException {

-		return new CoreException(new Status(IStatus.ERROR,"org.eclipse.update.examples",0,s,e));

-	}

-	/*

-	 * @see IFeatureContentProvider#getVerifier()

-	 */

-	public IVerifier getVerifier() throws CoreException {

-		return null;

-	}

-

-}

diff --git a/update/org.eclipse.update.examples/src/org/eclipse/update/examples/buildzip/BuildZipFeatureFactory.java b/update/org.eclipse.update.examples/src/org/eclipse/update/examples/buildzip/BuildZipFeatureFactory.java
deleted file mode 100644
index d6150b7..0000000
--- a/update/org.eclipse.update.examples/src/org/eclipse/update/examples/buildzip/BuildZipFeatureFactory.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package org.eclipse.update.examples.buildzip;

-

-/*

- * (c) Copyright IBM Corp. 2000, 2002.

- * All Rights Reserved.

- */ 

-

-import java.net.URL;

-

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.core.runtime.IStatus;

-import org.eclipse.core.runtime.Status;

-import org.eclipse.update.core.BaseFeatureFactory;

-import org.eclipse.update.core.Feature;

-import org.eclipse.update.core.IFeature;

-import org.eclipse.update.core.IFeatureFactory;

-import org.eclipse.update.core.ISite;

-import org.eclipse.update.core.model.FeatureModel;

-

-/**

- * An example feature factory based on the packaging 

- * format used for integration and stable builds

- * posted on the downloads pages at www.eclipse.org

- * </p>

- * @since 2.0

- */

-

-public class BuildZipFeatureFactory

-	extends BaseFeatureFactory

-	implements IFeatureFactory {

-

-	/*

-	 * @see IFeatureFactory#createFeature(URL, ISite, IProgressMonitor)

-	 */

-	public IFeature createFeature(URL url, ISite site, IProgressMonitor monitor) throws CoreException {

-		try {

-			// create content provider for feature

-			BuildZipFeatureContentProvider cp = new BuildZipFeatureContentProvider(url);

-			Feature feature = null;

-			

-			// parse the feature

-			feature = (Feature) parseFeature(cp);

-			

-			// initialize feature

-			feature.setFeatureContentProvider(cp);

-			feature.setSite(site);

-			feature.resolve(cp.getFeatureBaseURL(), null); 

-			feature.markReadOnly();

-			return feature;

-		} catch (Exception e) {

-			throw new CoreException(new Status(IStatus.ERROR,"org.eclipse.update.examples.buildzip",0,"Unable to create feature",e));

-		}

-	}

-

-	/*

-	 * parse the build zip to reconstruct a feature model

-	 */

-	public FeatureModel parseFeature(BuildZipFeatureContentProvider cp) throws Exception {

-		return (new BuildZipFeatureParser(this)).parse(cp);

-	}

-

-}

diff --git a/update/org.eclipse.update.examples/src/org/eclipse/update/examples/buildzip/BuildZipFeatureParser.java b/update/org.eclipse.update.examples/src/org/eclipse/update/examples/buildzip/BuildZipFeatureParser.java
deleted file mode 100644
index 6748ded..0000000
--- a/update/org.eclipse.update.examples/src/org/eclipse/update/examples/buildzip/BuildZipFeatureParser.java
+++ /dev/null
@@ -1,203 +0,0 @@
-package org.eclipse.update.examples.buildzip;

-

-/*

- * (c) Copyright IBM Corp. 2000, 2002.

- * All Rights Reserved.

- */ 

- 

-import java.io.IOException;

-import java.io.InputStream;

-import java.net.URLDecoder;

-import java.util.Enumeration;

-import java.util.Properties;

-import java.util.StringTokenizer;

-

-import org.eclipse.core.runtime.PluginVersionIdentifier;

-import org.eclipse.update.core.ContentReference;

-import org.eclipse.update.core.model.FeatureModel;

-import org.eclipse.update.core.model.PluginEntryModel;

-import org.eclipse.update.core.model.URLEntryModel;

-

-/**

- * An example feature parser. It handles features packaged as

- * build zip's using the format used for integration and stable builds

- * posted on the downloads pages at www.eclipse.org

- * </p>

- * @since 2.0

- */

-

-public class BuildZipFeatureParser {	

-	

-	private BuildZipFeatureFactory factory;

-	private BuildZipPluginParser pluginParser;

-	

-	public BuildZipFeatureParser(BuildZipFeatureFactory factory) {

-		this.factory = factory;

-	}

-	

-	public FeatureModel parse(BuildZipFeatureContentProvider cp) throws Exception {				

-		return parseFeature(cp);

-	}

-	

-	private FeatureModel parseFeature(BuildZipFeatureContentProvider cp) throws Exception {		

-		

-		// get reference to the build manifest

-		ContentReference manifestRef = cp.getFeatureBuildManifest();

-		InputStream is = manifestRef.getInputStream();		

-		

-		// load buildmanifest.properties

-		Properties manifest = new Properties();

-		try {

-			manifest.load(is);

-		} finally {

-			if (is!=null) try { is.close(); } catch(IOException e) {}

-		}

-		

-		// populate feature model

-		FeatureModel feature = factory.createFeatureModel();

-		parseFeatureEntry(cp, feature, manifest);

-		

-		// parse plugin entries

-		parsePluginEntries(cp, feature, manifest); 

-		

-		// parse non-plugin entries

-		parseNonPluginEntries(cp, feature, manifest);

-		

-		// unpack feature entry content

-		cp.unpackFeatureEntryContent(feature, null/*IProgressMonitor*/);

-		

-		return feature;

-	}

-	

-	private void parseFeatureEntry(BuildZipFeatureContentProvider cp, FeatureModel feature, Properties manifest) throws Exception {

-		

-		// parse out build zip file name. It is assumed to be in the

-		// form <package identifier>-<build date>-<target platform>.zip,

-		// where

-		//		<package identifier> is hyphen (-) separaterd token list

-		//		<build date> is single all-numeric token

-		//		<target platform> is hyphen (-) separaterd token list

-		

-		String pkgId = "";

-		String target = "";

-		String build = "";

-		String state = "ID";

-		boolean firstToken = true;

-		String zipName = URLDecoder.decode(cp.getURL().getFile());

-		int ix = zipName.lastIndexOf("/");

-		if (ix != -1)

-			zipName = zipName.substring(ix+1);

-		if (zipName.endsWith(".zip")) {

-			zipName = zipName.substring(0,zipName.length()-4);

-		}

-		StringTokenizer tokenizer = new StringTokenizer(zipName,"-",false);

-		String token;

-		while(tokenizer.hasMoreTokens()) {

-			token = tokenizer.nextToken();

-			try {

-				Long.parseLong(token);

-				state = "TARGET";

-				target = "";

-				firstToken = true;

-				build = token+".0.0";

-			} catch (NumberFormatException e) {

-				if (state.equals("ID")) {

-					pkgId += (firstToken ? "" : " ") + token;

-				} else {

-					target += (firstToken ? "" : " ") + token;

-				}

-				firstToken = false;

-			}

-		}

-		

-		// generate base feature attributes

-		feature.setFeatureIdentifier(pkgId.replace(' ','.'));

-		feature.setFeatureVersion(build);

-		feature.setLabel(pkgId.substring(0,1).toUpperCase() + pkgId.substring(1) + " for " + target);

-		feature.setProvider("www.eclipse.org");

-		feature.setImageURLString("splash/splash_full.bmp");

-		feature.setOS(target.replace(' ','-'));	

-		

-		// add description

-		URLEntryModel description = factory.createURLEntryModel();

-		description.setURLString("readme/readme.html");

-		description.setAnnotation("x");

-		feature.setDescriptionModel(description);

-		

-		// add license

-		URLEntryModel license = factory.createURLEntryModel();

-		license.setURLString("about.html");

-		license.setAnnotation("You must view the full license by following the \"License\" link in the feature preview.\nSelecting \"Accept\" indicates that you have viewed and accepted the feature license.");

-		feature.setLicenseModel(license);

-		

-		// add copyright

-		URLEntryModel copyright = factory.createURLEntryModel();

-		copyright.setURLString("notice.html");

-		copyright.setAnnotation("x");

-		feature.setCopyrightModel(copyright);

-	}	

-	

-	private void parsePluginEntries(BuildZipFeatureContentProvider cp, FeatureModel feature, Properties manifest) throws Exception {

-		

-		Enumeration entries = manifest.keys();

-		String plugin;

-		String pluginId;

-		String pluginVersion;

-		String pluginBuildVersion;

-		PluginEntryModel pluginEntry;

-		while(entries.hasMoreElements()) {

-			plugin = (String) entries.nextElement();

-			if (plugin.startsWith("plugin@")) {

-				pluginId = plugin.substring(7);

-				pluginBuildVersion = manifest.getProperty(plugin);

-				if (pluginBuildVersion.equals("HEAD")) {

-					String featureVersion = feature.getFeatureVersion();

-					int ix = featureVersion.indexOf(".");

-					String featureMajor = ix==-1 ? featureVersion : featureVersion.substring(0,ix);

-					pluginBuildVersion += "-" + featureMajor;

-				}

-				pluginEntry = factory.createPluginEntryModel();

-				pluginVersion = parsePluginVersionInManifest(cp, pluginId, pluginEntry);

-				if (pluginVersion != null) {

-					pluginEntry.setPluginIdentifier(pluginId);

-					pluginEntry.setPluginVersion((new PluginVersionIdentifier(pluginVersion)).toString()+"."+pluginBuildVersion);

-					feature.addPluginEntryModel(pluginEntry);

-				}

-			}

-		}		

-	}

-	

-	private void parseNonPluginEntries(BuildZipFeatureContentProvider cp, FeatureModel feature, Properties manifest) throws Exception {

-	//	NonPluginEntryModel nonPluginEntry = factory.createNonPluginEntryModel();

-	//	nonPluginEntry.setIdentifier("root");

-	//	feature.addNonPluginEntryModel(nonPluginEntry);

-	}

-	

-	private String parsePluginVersionInManifest(BuildZipFeatureContentProvider cp, String pluginId, PluginEntryModel pluginEntry) {

-

-		if (pluginParser == null)

-			pluginParser = new BuildZipPluginParser();

-				

-		InputStream is = null;				

-		ContentReference pluginManifest;

-		try {

-			// try plugin.xml

-			pluginManifest  = cp.getPluginManifest(pluginId, false);

-			is = pluginManifest.getInputStream();

-			return pluginParser.parse(is);

-		} catch (Exception e) {

-			try {

-				// retry with feature.xml

-				pluginManifest  = cp.getPluginManifest(pluginId, true);

-				is = pluginManifest.getInputStream();

-				String result = pluginParser.parse(is);

-				pluginEntry.isFragment(true);

-				return result;

-			} catch (Exception e2) {

-				return null;

-			}

-		} finally {

-			if (is != null) try { is.close(); } catch (IOException e) {}

-		}

-	}

-}

diff --git a/update/org.eclipse.update.examples/src/org/eclipse/update/examples/buildzip/BuildZipPluginParser.java b/update/org.eclipse.update.examples/src/org/eclipse/update/examples/buildzip/BuildZipPluginParser.java
deleted file mode 100644
index 90e1d1f..0000000
--- a/update/org.eclipse.update.examples/src/org/eclipse/update/examples/buildzip/BuildZipPluginParser.java
+++ /dev/null
@@ -1,85 +0,0 @@
-package org.eclipse.update.examples.buildzip;

-

-/*

- * (c) Copyright IBM Corp. 2000, 2002.

- * All Rights Reserved.

- */

-

-import java.io.IOException;

-import java.io.InputStream;

-

-import org.apache.xerces.parsers.SAXParser;

-import org.xml.sax.Attributes;

-import org.xml.sax.InputSource;

-import org.xml.sax.SAXException;

-import org.xml.sax.helpers.DefaultHandler;

-

-/**

- * Parse default feature.xml

- */

-

-public class BuildZipPluginParser extends DefaultHandler {

-

-	private SAXParser parser;

-	private String version;

-	

-	private static final String PLUGIN = "plugin";

-	private static final String FRAGMENT = "fragment";

-	private static final String ID = "id";

-	private static final String VERSION = "version";	

-	

-	private class ParseCompleteException extends SAXException {

-		public ParseCompleteException(String arg0) {

-			super(arg0);

-		}

-	}

-

-	/**

-	 * Constructor for DefaultFeatureParser

-	 */

-	public BuildZipPluginParser() {

-		super();

-		this.parser = new SAXParser();

-		this.parser.setContentHandler(this);

-	}

-	

-	/**

-	 * @since 2.0

-	 */

-	public synchronized String parse(InputStream in) throws SAXException, IOException {

-		try {

-			version = null;

-			parser.parse(new InputSource(in));

-		} catch(ParseCompleteException e) {

-		}

-		return version;

-	}

-	

-	/**

-	 * @see DefaultHandler#startElement(String, String, String, Attributes)

-	 */

-	public void startElement(String uri, String localName,String qName, Attributes attributes) throws SAXException {

-		

-		String tag = localName.trim();

-	

-		if (tag.equalsIgnoreCase(PLUGIN)) {

-			processPlugin(attributes);

-			return;

-		}

-	

-		if (tag.equalsIgnoreCase(FRAGMENT)) {

-			processPlugin(attributes);

-			return;

-		}

-	}

-	

-	/** 

-	 * process plugin entry info

-	 */

-	private void processPlugin(Attributes attributes) throws ParseCompleteException {

-		version = attributes.getValue("version");

-		throw new ParseCompleteException("");

-	}

-}

-

-

diff --git a/update/org.eclipse.update.examples/src/org/eclipse/update/examples/buildzip/BuildZipSiteContentProvider.java b/update/org.eclipse.update.examples/src/org/eclipse/update/examples/buildzip/BuildZipSiteContentProvider.java
deleted file mode 100644
index 05ec032..0000000
--- a/update/org.eclipse.update.examples/src/org/eclipse/update/examples/buildzip/BuildZipSiteContentProvider.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package org.eclipse.update.examples.buildzip;

-

-/*

- * (c) Copyright IBM Corp. 2000, 2002.

- * All Rights Reserved.

- */

-

-import java.net.URL;

-

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.update.core.SiteContentProvider;

-

-public class BuildZipSiteContentProvider extends SiteContentProvider {

-

-	/**

-	 * Constructor for SiteContentProvider.

-	 */

-	public BuildZipSiteContentProvider(URL url) {

-		super(url);

-	}

-	

-	/*

-	 * @see ISiteContentProvider#getArchiveReference(String)

-	 */

-	public URL getArchiveReference(String id) throws CoreException {

-		// build zip features do not have associated archives

-		// the zip file also contains the archives files

-		return null;

-	}

-

-}

diff --git a/update/org.eclipse.update.examples/src/org/eclipse/update/examples/buildzip/BuildZipSiteFactory.java b/update/org.eclipse.update.examples/src/org/eclipse/update/examples/buildzip/BuildZipSiteFactory.java
deleted file mode 100644
index df9196b..0000000
--- a/update/org.eclipse.update.examples/src/org/eclipse/update/examples/buildzip/BuildZipSiteFactory.java
+++ /dev/null
@@ -1,85 +0,0 @@
-package org.eclipse.update.examples.buildzip;

-

-/*

- * (c) Copyright IBM Corp. 2000, 2002.

- * All Rights Reserved.

- */

-

-import java.io.File;

-import java.io.FileFilter;

-import java.io.IOException;

-import java.net.MalformedURLException;

-import java.net.URL;

-import java.net.URLDecoder;

-import java.util.zip.ZipEntry;

-import java.util.zip.ZipFile;

-

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.update.core.*;

-import org.eclipse.update.core.BaseSiteFactory;

-import org.eclipse.update.core.ISite;

-import org.eclipse.update.core.Site;

-import org.eclipse.update.core.model.InvalidSiteTypeException;

-import org.eclipse.update.core.model.CategoryModel;

-

-public class BuildZipSiteFactory extends BaseSiteFactory {

-

-	/*

-	 * @see ISiteFactory#createSite(URL)

-	 */

-	public ISite createSite(URL url) throws CoreException,InvalidSiteTypeException {

-

-		Site site = null;

-

-		// create site and add category

-		site = (Site) createSiteMapModel();

-		CategoryModel category = createSiteCategoryModel();

-		category.setName("eclipse-builds");

-		category.setLabel("Eclipse Builds");

-		site.addCategoryModel(category);

-

-		// set content provider

-		BuildZipSiteContentProvider contentProvider = new BuildZipSiteContentProvider(url);

-		site.setSiteContentProvider(contentProvider);

-

-		// get all matching zip files on the site

-		FileFilter filter = new FileFilter() {

-			public boolean accept(File file) {

-				if (file.getName().endsWith(".zip")) {

-					try {

-						ZipFile zip = new ZipFile(file);

-						ZipEntry entry = zip.getEntry("eclipse/buildmanifest.properties");

-						if (entry == null)

-							return false;

-						else

-							return true;

-					} catch (IOException e) {

-						return false;

-					}

-				} else

-					return false;

-			}

-		};

-		File file = new File(URLDecoder.decode(url.getFile()));

-		File[] zips = file.listFiles(filter);

-

-		// create a reference for each matching zip

-		SiteFeatureReferenceModel ref = null;

-		for (int i = 0; zips != null && i < zips.length; i++) {

-			ref = createFeatureReferenceModel();

-			ref.setType("org.eclipse.update.examples.zip");

-			ref.setSiteModel(site);

-			ref.setURLString("file:" + zips[i].getAbsolutePath());

-			ref.setCategoryNames(new String[] { "eclipse-builds" });

-			site.addFeatureReferenceModel(ref);

-		}

-		try {

-			site.resolve(url, null); // resolve any URLs relative to the site

-		} catch (MalformedURLException e){

-			throw Utilities.newCoreException("",e);

-		}

-

-		return site;

-	}

-

-}
\ No newline at end of file
diff --git a/update/org.eclipse.update.examples/src/org/eclipse/update/examples/buildzip/DefaultModelWriter.java b/update/org.eclipse.update.examples/src/org/eclipse/update/examples/buildzip/DefaultModelWriter.java
deleted file mode 100644
index 9ca8bc4..0000000
--- a/update/org.eclipse.update.examples/src/org/eclipse/update/examples/buildzip/DefaultModelWriter.java
+++ /dev/null
@@ -1,228 +0,0 @@
-package org.eclipse.update.examples.buildzip;
-
-/*
- * (c) Copyright IBM Corp. 2000, 2002.
- * All Rights Reserved.
- */ 
- 
-import java.io.OutputStream;
-import java.io.PrintWriter;
-
-import org.eclipse.update.core.model.*;
-
-/**
- * Write standard feature manifest (feature.xml) from model.
- * </p>
- * @since 2.0
- */
-
-public class DefaultModelWriter {
-	
-	private FeatureModel feature;
-	
-	/**
-	 * @since 2.0
-	 */
-	public DefaultModelWriter(FeatureModel feature) {
-		this.feature = feature;
-	}
-	
-	/**
-	 * @since 2.0
-	 */
-	public void writeFeatureManifest(OutputStream os) {
-		PrintWriter w = new PrintWriter(os);
-		writeFeature(w,0,feature);
-		w.flush();
-	}
-	
-	private void writeFeature(PrintWriter w, int level, FeatureModel feature) {
-		if (feature == null) return;
-		
-		String in = getIndent(level);
-		w.println(in+"<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
-		
-		w.println(in+"<feature");
-		if (feature.getFeatureIdentifier()!=null)
-			w.println(in+"   "+"id=\""+feature.getFeatureIdentifier()+"\"");
-		if (feature.getFeatureVersion()!=null)
-			w.println(in+"   "+"version=\""+feature.getFeatureVersion()+"\"");
-		if (feature.getLabelNonLocalized()!=null)
-			w.println(in+"   "+"label=\""+feature.getLabelNonLocalized()+"\"");
-		if (feature.getProviderNonLocalized()!=null)
-			w.println(in+"   "+"provider-name=\""+feature.getProviderNonLocalized()+"\"");
-		if (feature.getImageURLString()!=null)
-			w.println(in+"   "+"image=\""+feature.getImageURLString()+"\"");
-		if (feature.getOS()!=null)
-			w.println(in+"   "+"os=\""+feature.getOS()+"\"");
-		if (feature.getWS()!=null)
-			w.println(in+"   "+"ws=\""+feature.getWS()+"\"");
-		if (feature.getNL()!=null)
-			w.println(in+"   "+"nl=\""+feature.getNL()+"\"");
-		if (feature.getApplication()!=null)
-			w.println(in+"   "+"application=\""+feature.getApplication()+"\"");
-		w.println(in+"   "+">");
-		
-		writeDescription(w, level+1, feature.getDescriptionModel());
-		writeCopyright(w, level+1, feature.getCopyrightModel());
-		writeLicense(w, level+1, feature.getLicenseModel());
-		writeURLs(w, level+1, feature);
-		writePrereqs(w, level+1, feature);
-		writePluginEntries(w, level+1, feature);
-		writeNonPluginEntries(w, level+1, feature);
-         
-        w.println("");
-        w.println(in+"</feature>");
-	}
-	
-	private void writeDescription(PrintWriter w, int level, URLEntryModel ue) {
-		writeDescriptionEntry(w,level, ue, "description");
-	}
-	
-	private void writeCopyright(PrintWriter w, int level, URLEntryModel ue) {
-		writeDescriptionEntry(w,level, ue, "copyright");
-	}
-	
-	private void writeLicense(PrintWriter w, int level, URLEntryModel ue) {
-		writeDescriptionEntry(w,level, ue, "license");
-	}
-	
-	private void writeDescriptionEntry(PrintWriter w, int level, URLEntryModel ue, String tag) {
-		if (ue == null) return;
-		String url = ue.getURLString();
-		String txt = ue.getAnnotationNonLocalized();
-		if (url==null && txt==null) return;
-		
-		String in = getIndent(level);
-		w.println("");
-		if (url==null)
-			w.println(in+"<"+tag+">");
-		else {
-			w.print(in+"<"+tag+" url=\""+ue.getURLString()+"\"");
-			if (txt==null)
-				w.println("/>");
-			else
-				w.println(">");
-		}
-		if (txt!=null) {
-			w.println(in + txt);
-			w.println(in+"</"+tag+">");
-		}
-	}
-	
-	private void writeURLs(PrintWriter w, int level, FeatureModel feature) {	
-		URLEntryModel update = feature.getUpdateSiteEntryModel();
-		URLEntryModel[] discovery = feature.getDiscoverySiteEntryModels();		
-		if (update == null && (discovery == null || discovery.length==0)) return;
-		
-		String in = getIndent(level);
-		String in2 = getIndent(level+1);		
-		w.println("");
-		w.println(in+"<url>");
-		
-		if (update != null) {
-			w.println(in2+"<update");
-			if (update.getURLString()!=null)
-				w.println(in2+"   "+"url=\""+update.getURLString()+"\"");
-			if (update.getAnnotationNonLocalized()!=null)
-				w.println(in2+"   "+"label=\""+update.getAnnotationNonLocalized()+"\"");
-			w.println(in2+"   "+"/>");
-		}
-		
-		for (int i=0; discovery!=null && i<discovery.length; i++) {
-			w.println(in2+"<discovery");
-			if (discovery[i].getURLString()!=null)	
-				w.println(in2+"   "+"url=\""+discovery[i].getURLString()+"\"");
-			if (discovery[i].getAnnotationNonLocalized()!=null)
-				w.println(in2+"   "+"label=\""+discovery[i].getAnnotationNonLocalized()+"\"");
-			w.println(in2+"   "+"/>");
-		}
-		
-		w.println(in+"</url>");
-	}
-	
-	private void writePrereqs(PrintWriter w, int level, FeatureModel feature) {	
-		ImportModel[] imp = feature.getImportModels();	
-		if (imp == null || imp.length == 0) return;
-		
-		String in = getIndent(level);
-		String in2 = getIndent(level+1);
-		w.println("");
-		w.println(in+"<requires>");
-		
-		for (int i=0; imp!=null && i<imp.length; i++) {
-			w.println(in2+"<import");
-			if (imp[i].getIdentifier()!=null)
-				w.println(in2+"   "+"plugin=\""+imp[i].getIdentifier()+"\"");
-			if (imp[i].getVersion()!=null)
-				w.println(in2+"   "+"version=\""+imp[i].getVersion()+"\"");
-			if (imp[i].getMatchingRuleName()!=null)
-				w.println(in2+"   "+"match=\""+imp[i].getMatchingRuleName()+"\"");
-			w.println(in2+"   "+"/>");
-		}
-		
-		w.println(in+"</requires>");
-	}
-	
-	private void writePluginEntries(PrintWriter w, int level, FeatureModel feature) {
-		PluginEntryModel[] plugin = feature.getPluginEntryModels();
-		if (plugin == null || plugin.length == 0) return;
-		
-		String in = getIndent(level);
-		w.println("");
-		
-		for (int i=0; i<plugin.length; i++) {
-			w.println(in+"<plugin");
-			if (plugin[i].getPluginIdentifier()!=null)
-				w.println(in+"   "+"id=\""+plugin[i].getPluginIdentifier()+"\"");
-			if (plugin[i].getPluginVersion()!=null)
-				w.println(in+"   "+"version=\""+plugin[i].getPluginVersion()+"\"");
-			if (plugin[i].isFragment())
-				w.println(in+"   "+"fragment=\""+plugin[i].isFragment()+"\"");
-			if (plugin[i].getOS()!=null)
-				w.println(in+"   "+"os=\""+plugin[i].getOS()+"\"");
-			if (plugin[i].getWS()!=null)
-				w.println(in+"   "+"ws=\""+plugin[i].getWS()+"\"");
-			if (plugin[i].getNL()!=null)
-				w.println(in+"   "+"nl=\""+plugin[i].getNL()+"\"");
-			if (plugin[i].getDownloadSize()!=ContentEntryModel.UNKNOWN_SIZE)
-				w.println(in+"   "+"download-size=\""+plugin[i].getDownloadSize()+"\"");
-			if (plugin[i].getInstallSize()!=ContentEntryModel.UNKNOWN_SIZE)
-				w.println(in+"   "+"install-size=\""+plugin[i].getInstallSize()+"\"");
-			w.println(in+"   "+"/>");
-		}
-	}
-	
-	private void writeNonPluginEntries(PrintWriter w, int level, FeatureModel feature) {
-		NonPluginEntryModel[] data = feature.getNonPluginEntryModels();
-		if (data == null || data.length == 0) return;
-		
-		String in = getIndent(level);
-		w.println("");
-		
-		for (int i=0; i<data.length; i++) {
-			w.println(in+"<data");
-			if (data[i].getIdentifier()!=null)
-				w.println(in+"   "+"id=\""+data[i].getIdentifier()+"\"");
-			if (data[i].getOS()!=null)
-				w.println(in+"   "+"os=\""+data[i].getOS()+"\"");
-			if (data[i].getWS()!=null)
-				w.println(in+"   "+"ws=\""+data[i].getWS()+"\"");
-			if (data[i].getNL()!=null)
-				w.println(in+"   "+"nl=\""+data[i].getNL()+"\"");
-			if (data[i].getDownloadSize()!=ContentEntryModel.UNKNOWN_SIZE)
-				w.println(in+"   "+"download-size=\""+data[i].getDownloadSize()+"\"");
-			if (data[i].getInstallSize()!=ContentEntryModel.UNKNOWN_SIZE)
-				w.println(in+"   "+"install-size=\""+data[i].getInstallSize()+"\"");
-			w.println(in+"   "+"/>");
-		}
-	}
-	
-	
-	private String getIndent(int level) {
-		String indent = "";
-		for (int i=0; i<level; i++) 
-			indent += "   ";
-		return indent;
-	}
-}
diff --git a/update/org.eclipse.update.examples/src/org/eclipse/update/examples/buildzip/Test.java b/update/org.eclipse.update.examples/src/org/eclipse/update/examples/buildzip/Test.java
deleted file mode 100644
index 1e189df..0000000
--- a/update/org.eclipse.update.examples/src/org/eclipse/update/examples/buildzip/Test.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package org.eclipse.update.examples.buildzip;

-

-/*

- * (c) Copyright IBM Corp. 2000, 2002.

- * All Rights Reserved.

- */ 

-

-import java.net.URL;

-

-import org.eclipse.update.core.*;

- 

-/**

- * unit test harness

- */

-

-public class Test {

-

-	public static void main(String[] args) {

-		

-		try {

-			URL url = new URL("file:d:/downloads/eclipse 2.0/integration-eclipse-SDK-20020109-win32.zip");

-			BuildZipFeatureFactory factory = new BuildZipFeatureFactory();

-			Feature feature = (Feature) factory.createFeature(url,null/*ISite*/);

-			DefaultModelWriter w = new DefaultModelWriter(feature);

-			w.writeFeatureManifest(System.out);

-			

-			System.out.println("");

-			System.out.println("Feature entry references");

-			ContentReference[] refs = feature.getFeatureContentProvider().getFeatureEntryContentReferences(null);

-			for (int i=0; i< refs.length; i++) {

-				System.out.println("   "+refs[i].getIdentifier());

-			}

-			

-			System.out.println("");

-			System.out.println("Plug-in entry references");

-			IPluginEntry[] entry = feature.getPluginEntries();

-			refs = feature.getFeatureContentProvider().getPluginEntryContentReferences(entry[0], null);

-			for (int i=0; i< refs.length; i++) {

-				System.out.println("   "+refs[i].getIdentifier());

-			}			

-			

-			System.out.println("");

-			System.out.println("Non-plug-in entry references");

-			INonPluginEntry[] data = feature.getNonPluginEntries();

-			refs = feature.getFeatureContentProvider().getNonPluginEntryArchiveReferences(data[0], null);

-			for (int i=0; i< refs.length; i++) {

-				System.out.println("   "+refs[i].getIdentifier());

-			}			

-			

-			System.out.println("Done ...");

-		} catch (Exception e) {

-			e.printStackTrace();

-		}		

-	}

-}

diff --git a/update/org.eclipse.update.examples/src/org/eclipse/update/examples/buildzip/java.page.jpage b/update/org.eclipse.update.examples/src/org/eclipse/update/examples/buildzip/java.page.jpage
deleted file mode 100644
index 8b3ca30..0000000
--- a/update/org.eclipse.update.examples/src/org/eclipse/update/examples/buildzip/java.page.jpage
+++ /dev/null
Binary files differ
diff --git a/update/org.eclipse.update.examples/src/org/eclipse/update/examples/freeform/FreeFormSiteContentProvider.java b/update/org.eclipse.update.examples/src/org/eclipse/update/examples/freeform/FreeFormSiteContentProvider.java
deleted file mode 100644
index 2cbeab4..0000000
--- a/update/org.eclipse.update.examples/src/org/eclipse/update/examples/freeform/FreeFormSiteContentProvider.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package org.eclipse.update.examples.freeform;

-import java.net.MalformedURLException;

-import java.net.URL;

-

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.core.runtime.IStatus;

-import org.eclipse.core.runtime.Status;

-import org.eclipse.update.core.SiteContentProvider;

-

-public class FreeFormSiteContentProvider extends SiteContentProvider {

-

-	/**

-	 * Constructor for SiteContentProvider.

-	 */

-	public FreeFormSiteContentProvider(URL url) {

-		super(url);

-	}

-	

-	/*

-	 * @see ISiteContentProvider#getArchiveReference(String)

-	 */

-	public URL getArchiveReference(String id) throws CoreException {

-		try {

-			return new URL(getURL(),id);

-		} catch(MalformedURLException e) {

-			throw newCoreException("Unable to return archive URL",e);

-		}

-	}

-	

-	private CoreException newCoreException(String s, Throwable e) throws CoreException {

-		return new CoreException(new Status(IStatus.ERROR,"org.eclipse.update.examples",0,s,e));

-	}

-

-}

diff --git a/update/org.eclipse.update.examples/src/org/eclipse/update/examples/freeform/FreeFormSiteFactory.java b/update/org.eclipse.update.examples/src/org/eclipse/update/examples/freeform/FreeFormSiteFactory.java
deleted file mode 100644
index cb3c7fc..0000000
--- a/update/org.eclipse.update.examples/src/org/eclipse/update/examples/freeform/FreeFormSiteFactory.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package org.eclipse.update.examples.freeform;

-import java.io.IOException;

-import java.io.InputStream;

-import java.net.MalformedURLException;

-import java.net.URL;

-

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.update.core.*;

-import org.eclipse.update.core.BaseSiteFactory;

-import org.eclipse.update.core.ISite;

-import org.eclipse.update.core.Site;

-import org.eclipse.update.core.model.InvalidSiteTypeException;

-import org.eclipse.update.core.model.URLEntryModel;

-

-public class FreeFormSiteFactory extends BaseSiteFactory {

-

-	/*

-	 * @see ISiteFactory#createSite(URL)

-	 */

-	public ISite createSite(URL url)

-		throws CoreException, InvalidSiteTypeException {

-

-		// Create site

-		Site site = null;

-		InputStream is = null;

-		try {

-			is = url.openStream();

-			site = (Site) parseSite(is);

-

-			URLEntryModel realSiteRef = site.getDescriptionModel();

-			if (realSiteRef == null)

-				throw Utilities.newCoreException(

-					"Unable to obtain update site reference",

-					null);

-			String siteURLString = realSiteRef.getURLString();

-			if (siteURLString == null)

-				throw Utilities.newCoreException(

-					"Unable to obtain update site reference",

-					null);

-			URL siteURL = new URL(siteURLString);

-			FreeFormSiteContentProvider contentProvider =

-				new FreeFormSiteContentProvider(siteURL);

-			site.setSiteContentProvider(contentProvider);

-			site.resolve(siteURL, null); // resolve any URLs relative to the site

-

-		} catch (MalformedURLException e){

-			throw Utilities.newCoreException("Unable to create URL",e);

-		} catch (IOException e){

-			throw Utilities.newCoreException("Unable to access URL",e);

-		} finally {

-			if (is != null)

-				try {

-					is.close();

-				} catch (IOException e) {

-				}

-		}

-

-		return site;

-	}

-

-	/*

-	 * @see SiteModelFactory#canParseSiteType(String)

-	 */

-	public boolean canParseSiteType(String type) {

-		return type != null

-			&& type.equals("org.eclipse.update.examples.site.freeform");

-	}

-

-}
\ No newline at end of file
diff --git a/update/org.eclipse.update.tests.core/.classpath b/update/org.eclipse.update.tests.core/.classpath
deleted file mode 100644
index 399777c..0000000
--- a/update/org.eclipse.update.tests.core/.classpath
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<classpath>

-    <classpathentry kind="src" path="src/"/>

-    <classpathentry kind="src" path="/org.eclipse.core.runtime"/>

-    <classpathentry kind="src" path="/org.junit"/>

-    <classpathentry kind="src" path="/org.apache.xerces"/>

-    <classpathentry kind="src" path="/org.eclipse.core.resources"/>

-    <classpathentry kind="src" path="/org.eclipse.update.core"/>

-    <classpathentry exported="true" kind="src" path="/org.eclipse.update.core.linux"/>

-    <classpathentry exported="true" kind="src" path="/org.eclipse.update.core.win32"/>

-    <classpathentry kind="src" path="/org.eclipse.tomcat"/>

-    <classpathentry kind="src" path="/org.eclipse.help.appserver"/>

-    <classpathentry kind="src" path="/org.eclipse.core.boot"/>

-    <classpathentry kind="var" path="JRE_LIB" rootpath="JRE_SRCROOT" sourcepath="JRE_SRC"/>

-    <classpathentry kind="output" path="bin"/>

-</classpath>

diff --git a/update/org.eclipse.update.tests.core/.cvsignore b/update/org.eclipse.update.tests.core/.cvsignore
deleted file mode 100644
index c5e82d7..0000000
--- a/update/org.eclipse.update.tests.core/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
\ No newline at end of file
diff --git a/update/org.eclipse.update.tests.core/.project b/update/org.eclipse.update.tests.core/.project
deleted file mode 100644
index 2d3215f..0000000
--- a/update/org.eclipse.update.tests.core/.project
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.update.tests.core</name>

-	<comment></comment>

-	<projects>

-		<project>org.apache.xerces</project>

-		<project>org.eclipse.core.boot</project>

-		<project>org.eclipse.core.resources</project>

-		<project>org.eclipse.core.runtime</project>

-		<project>org.eclipse.help.appserver</project>

-		<project>org.eclipse.tomcat</project>

-		<project>org.eclipse.update.core</project>

-		<project>org.eclipse.update.core.linux</project>

-		<project>org.eclipse.update.core.win32</project>

-		<project>org.junit</project>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ui.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ui.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-		<nature>org.eclipse.pde.ui.PluginNature</nature>

-	</natures>

-</projectDescription>

diff --git a/update/org.eclipse.update.tests.core/about.html b/update/org.eclipse.update.tests.core/about.html
deleted file mode 100644
index 9db411a..0000000
--- a/update/org.eclipse.update.tests.core/about.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>20th June, 2002</p>	
-<h3>License</h3>
-<p>Eclipse.org makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Common Public License Version 1.0 (&quot;CPL&quot;).  A copy of the CPL is available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>.
-For purposes of the CPL, &quot;Program&quot; will mean the Content.</p>
-
-<h3>Contributions</h3>
-
-<p>If this Content is licensed to you under the terms and conditions of the CPL, any Contributions, as defined in the CPL, uploaded, submitted, or otherwise
-made available to Eclipse.org, members of Eclipse.org and/or the host of Eclipse.org web site, by you that relate to such
-Content are provided under the terms and conditions of the CPL and can be made available to others under the terms of the CPL.</p>
-
-<p>If this Content is licensed to you under license terms and conditions other than the CPL (&quot;Other License&quot;), any modifications, enhancements and/or
-other code and/or documentation (&quot;Modifications&quot;) uploaded, submitted, or otherwise made available to Eclipse.org, members of Eclipse.org and/or the
-host of Eclipse.org, by you that relate to such Content are provided under terms and conditions of the Other License and can be made available
-to others under the terms of the Other License.  In addition, with regard to Modifications for which you are the copyright holder, you are also
-providing the Modifications under the terms and conditions of the CPL and such Modifications can be made available to others under the terms of
-the CPL.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/update/org.eclipse.update.tests.core/build.properties b/update/org.eclipse.update.tests.core/build.properties
deleted file mode 100644
index 2861d65..0000000
--- a/update/org.eclipse.update.tests.core/build.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-###############################################################################

-# Copyright (c) 2000, 2003 IBM Corporation and others.

-# All rights reserved. This program and the accompanying materials 

-# are made available under the terms of the Common Public License v1.0

-# which accompanies this distribution, and is available at

-# http://www.eclipse.org/legal/cpl-v10.html

-# 

-# Contributors:

-#     IBM Corporation - initial API and implementation

-###############################################################################

-source.updatetests.jar=src/

-bin.includes=*.jar,about.html,test.xml,plugin.xml,data/,webserver/
\ No newline at end of file
diff --git a/update/org.eclipse.update.tests.core/data/ExecutableFeaturePackagedSite/data/features/feature3/feature.xml b/update/org.eclipse.update.tests.core/data/ExecutableFeaturePackagedSite/data/features/feature3/feature.xml
deleted file mode 100644
index 2c80deb..0000000
--- a/update/org.eclipse.update.tests.core/data/ExecutableFeaturePackagedSite/data/features/feature3/feature.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature id="org.eclipse.update.core.tests.feature3" image="feature1.gif" label="Third Feature" provider-name="Smart Company" version="1.0.0" >
-  <description>Description</description>
-  <copyright>copyright</copyright>
-  <license>license</license>
-  <url>
-    <update label="URL to update the feature" url="http://www.eclipse.org/path/feature1/"/>
-    <discovery label="Discovery 1" url="http://www.eclipse.org"/>
-    <discovery label="Discovery 2" url="http://www.eclipse.org"/>
-  </url>
-  <plugin download-size="1500" id="org.eclipse.update.core.tests.feature1.plugin1" install-size="1000" fragment="false" nl="en" os="WIN32,LINUX" version="3.5.6" ws="WIN32,MOTIF,GTK"/>
-</feature>
\ No newline at end of file
diff --git a/update/org.eclipse.update.tests.core/data/ExecutableFeaturePackagedSite/data/plugins/Pde_core.jar b/update/org.eclipse.update.tests.core/data/ExecutableFeaturePackagedSite/data/plugins/Pde_core.jar
deleted file mode 100644
index f107217..0000000
--- a/update/org.eclipse.update.tests.core/data/ExecutableFeaturePackagedSite/data/plugins/Pde_core.jar
+++ /dev/null
Binary files differ
diff --git a/update/org.eclipse.update.tests.core/data/ExecutableFeaturePackagedSite/data/plugins/help.jar b/update/org.eclipse.update.tests.core/data/ExecutableFeaturePackagedSite/data/plugins/help.jar
deleted file mode 100644
index 7584f66..0000000
--- a/update/org.eclipse.update.tests.core/data/ExecutableFeaturePackagedSite/data/plugins/help.jar
+++ /dev/null
Binary files differ
diff --git a/update/org.eclipse.update.tests.core/data/ExecutableFeaturePackagedSite/data/plugins/junit_3.7.jar b/update/org.eclipse.update.tests.core/data/ExecutableFeaturePackagedSite/data/plugins/junit_3.7.jar
deleted file mode 100644
index 67587b2..0000000
--- a/update/org.eclipse.update.tests.core/data/ExecutableFeaturePackagedSite/data/plugins/junit_3.7.jar
+++ /dev/null
Binary files differ
diff --git a/update/org.eclipse.update.tests.core/data/ExecutableFeaturePackagedSite/data/plugins/org.eclipse.update.plugin1_1.1.1/plugin.xml b/update/org.eclipse.update.tests.core/data/ExecutableFeaturePackagedSite/data/plugins/org.eclipse.update.plugin1_1.1.1/plugin.xml
deleted file mode 100644
index 7f05d82..0000000
--- a/update/org.eclipse.update.tests.core/data/ExecutableFeaturePackagedSite/data/plugins/org.eclipse.update.plugin1_1.1.1/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<plugin name="JUnit Test Framework" id="org.eclipse.update.core.tests.feature1.plugin1" version="3.5.6" vendor-name="junit.org">

-  <runtime>

-    <library name="junit.jar">

-      <export name="*"/>

-    </library>

-  </runtime>

-</plugin>
\ No newline at end of file
diff --git a/update/org.eclipse.update.tests.core/data/ExecutableFeaturePackagedSite/data/plugins/org.eclipse.update.plugin1_1.1.1/src.jar b/update/org.eclipse.update.tests.core/data/ExecutableFeaturePackagedSite/data/plugins/org.eclipse.update.plugin1_1.1.1/src.jar
deleted file mode 100644
index 2d4d609..0000000
--- a/update/org.eclipse.update.tests.core/data/ExecutableFeaturePackagedSite/data/plugins/org.eclipse.update.plugin1_1.1.1/src.jar
+++ /dev/null
Binary files differ
diff --git a/update/org.eclipse.update.tests.core/data/ExecutableFeaturePackagedSite/data2/features/feature3/feature.xml b/update/org.eclipse.update.tests.core/data/ExecutableFeaturePackagedSite/data2/features/feature3/feature.xml
deleted file mode 100644
index b406d65..0000000
--- a/update/org.eclipse.update.tests.core/data/ExecutableFeaturePackagedSite/data2/features/feature3/feature.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature id="org.eclipse.update.core.tests.feature3" image="feature1.gif" label="Third Feature" provider-name="Smart Company" version="1.0.0" >
-  <description>Description</description>
-  <copyright>copyright</copyright>
-  <license>license</license>
-  <url>
-    <update label="URL to update the feature" url="http://www.eclipse.org/path/feature1/"/>
-    <discovery label="Discovery 1" url="http://www.eclipse.org"/>
-    <discovery label="Discovery 2" url="http://www.eclipse.org"/>
-  </url>
-  <plugin download-size="1500" id="org.eclipse.update.plugin1" install-size="1000" fragment="false" nl="en,fr" os="WIN32,LINUX" version="1.1.1" ws="WIN32,GTK,MOTIF"/>
-</feature>
\ No newline at end of file
diff --git a/update/org.eclipse.update.tests.core/data/ExecutableFeaturePackagedSite/data2/features/helpFeature.jar b/update/org.eclipse.update.tests.core/data/ExecutableFeaturePackagedSite/data2/features/helpFeature.jar
deleted file mode 100644
index 2d1ed77..0000000
--- a/update/org.eclipse.update.tests.core/data/ExecutableFeaturePackagedSite/data2/features/helpFeature.jar
+++ /dev/null
Binary files differ
diff --git a/update/org.eclipse.update.tests.core/data/ExecutableFeaturePackagedSite/data2/features/org.eclipse.pde.feature_1.0.0.jar b/update/org.eclipse.update.tests.core/data/ExecutableFeaturePackagedSite/data2/features/org.eclipse.pde.feature_1.0.0.jar
deleted file mode 100644
index 7e23cab..0000000
--- a/update/org.eclipse.update.tests.core/data/ExecutableFeaturePackagedSite/data2/features/org.eclipse.pde.feature_1.0.0.jar
+++ /dev/null
Binary files differ
diff --git a/update/org.eclipse.update.tests.core/data/ExecutableFeaturePackagedSite/data2/info/img/top_titlsm.gif b/update/org.eclipse.update.tests.core/data/ExecutableFeaturePackagedSite/data2/info/img/top_titlsm.gif
deleted file mode 100644
index 3917bb6..0000000
--- a/update/org.eclipse.update.tests.core/data/ExecutableFeaturePackagedSite/data2/info/img/top_titlsm.gif
+++ /dev/null
Binary files differ
diff --git a/update/org.eclipse.update.tests.core/data/ExecutableFeaturePackagedSite/data2/info/img/wel_ml.jpg b/update/org.eclipse.update.tests.core/data/ExecutableFeaturePackagedSite/data2/info/img/wel_ml.jpg
deleted file mode 100644
index 01e33df..0000000
--- a/update/org.eclipse.update.tests.core/data/ExecutableFeaturePackagedSite/data2/info/img/wel_ml.jpg
+++ /dev/null
Binary files differ
diff --git a/update/org.eclipse.update.tests.core/data/ExecutableFeaturePackagedSite/data2/info/siteInfo.html b/update/org.eclipse.update.tests.core/data/ExecutableFeaturePackagedSite/data2/info/siteInfo.html
deleted file mode 100644
index b065aa3..0000000
--- a/update/org.eclipse.update.tests.core/data/ExecutableFeaturePackagedSite/data2/info/siteInfo.html
+++ /dev/null
@@ -1,63 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">

-<html>

-<head>

-</head>

-  <body>

-<img src="img/top_titlsm.gif" alt="" width="460" height="50">

-<br>

-<br>

-     It started with Smalltalk<br>

-    OTI has been building tools for platform-independent OO development since

-  1988. Our ENVY&reg; technology first brought collaborative software development,

-  version management and shared repositories to Smalltalk. IBM is one of

-many   companies to license ENVY, which continues to be the foundation of

-VisualAge&reg;   Smalltalk.<br>

-<br>

-<br>

-<br>

-      Next came Java&#8482;<br>

-    Because of our expertise in OO technology, IBM turned to OTI for a next-generation

-  development environment for Java. The result is VisualAge for Java, which

-  continues to win awards for its innovative IDE and team support. InfoWorld

-  has chosen VisualAge for Java as development tool of the year - year after

-  year after year!<br>

-<br>

-<br>

-<br>

-      Then pervasive computing<br>

-    OTI continues its development of IBM's VisualAge Micro Edition, a state-of-the-art

-  platform for collaborative development of embedded applications and systems

-  that are very lean. As the steady stream of press releases attests, VisualAge

-  Micro Edition is already licensed to the leading microchip manufacturers,

-  microkernel developers, and producers of handheld and consumer devices.<br>

-<br>

-<br>

-<br>

-      Now it's Eclipse<br>

-    OTI has built the next generation IBM application development tools platform.

-  Eclipse is a kind of universal tool platform - an open extensible IDE for

-  anything and nothing in particular. The real value comes from tool plug-ins

-  that "teach" Eclipse how to work with things - java files, web content,

-graphics,  video - almost anything you can imagine. Eclipse allows you to

-independently  develop tools that integrate with other people's tools so

-seamlessly you won't know where one tool ends and another starts. The IBM

-supported version of this technology, WebSphere Studio Workbench, will be

-the core of the next  generation of IBM and IBM Business Partner e-business

-tools optimized for  the WebSphere software platform.<br>

-<br>

-<br>

-<br>

-      So what's next?<br>

-    OTI continues to deliver object-oriented technology that scales across

- platforms,  across teams and across project size. From a mainframe to a

-watch  - we're  closing in on that vision.<br>

-<br>

-<img src="img/wel_ml.jpg" width="460" height="460" alt="">

-<br>

-<br>

-<br>

-<br>

-<br>

-<br>

-</body>

-</html>

diff --git a/update/org.eclipse.update.tests.core/data/ExecutableFeaturePackagedSite/data2/plugins/Pde_core.jar b/update/org.eclipse.update.tests.core/data/ExecutableFeaturePackagedSite/data2/plugins/Pde_core.jar
deleted file mode 100644
index f107217..0000000
--- a/update/org.eclipse.update.tests.core/data/ExecutableFeaturePackagedSite/data2/plugins/Pde_core.jar
+++ /dev/null
Binary files differ
diff --git a/update/org.eclipse.update.tests.core/data/ExecutableFeaturePackagedSite/data2/plugins/help.jar b/update/org.eclipse.update.tests.core/data/ExecutableFeaturePackagedSite/data2/plugins/help.jar
deleted file mode 100644
index 7584f66..0000000
--- a/update/org.eclipse.update.tests.core/data/ExecutableFeaturePackagedSite/data2/plugins/help.jar
+++ /dev/null
Binary files differ
diff --git a/update/org.eclipse.update.tests.core/data/ExecutableFeaturePackagedSite/data2/plugins/junit_3.7.jar b/update/org.eclipse.update.tests.core/data/ExecutableFeaturePackagedSite/data2/plugins/junit_3.7.jar
deleted file mode 100644
index 67587b2..0000000
--- a/update/org.eclipse.update.tests.core/data/ExecutableFeaturePackagedSite/data2/plugins/junit_3.7.jar
+++ /dev/null
Binary files differ
diff --git a/update/org.eclipse.update.tests.core/data/ExecutableFeaturePackagedSite/data2/plugins/org.eclipse.update.plugin1_1.1.1/plugin.xml b/update/org.eclipse.update.tests.core/data/ExecutableFeaturePackagedSite/data2/plugins/org.eclipse.update.plugin1_1.1.1/plugin.xml
deleted file mode 100644
index 7f05d82..0000000
--- a/update/org.eclipse.update.tests.core/data/ExecutableFeaturePackagedSite/data2/plugins/org.eclipse.update.plugin1_1.1.1/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<plugin name="JUnit Test Framework" id="org.eclipse.update.core.tests.feature1.plugin1" version="3.5.6" vendor-name="junit.org">

-  <runtime>

-    <library name="junit.jar">

-      <export name="*"/>

-    </library>

-  </runtime>

-</plugin>
\ No newline at end of file
diff --git a/update/org.eclipse.update.tests.core/data/ExecutableFeaturePackagedSite/data2/plugins/org.eclipse.update.plugin1_1.1.1/src.jar b/update/org.eclipse.update.tests.core/data/ExecutableFeaturePackagedSite/data2/plugins/org.eclipse.update.plugin1_1.1.1/src.jar
deleted file mode 100644
index 2d4d609..0000000
--- a/update/org.eclipse.update.tests.core/data/ExecutableFeaturePackagedSite/data2/plugins/org.eclipse.update.plugin1_1.1.1/src.jar
+++ /dev/null
Binary files differ
diff --git a/update/org.eclipse.update.tests.core/data/ExecutableFeaturePackagedSite/data2/site.xml b/update/org.eclipse.update.tests.core/data/ExecutableFeaturePackagedSite/data2/site.xml
deleted file mode 100644
index b6211a8..0000000
--- a/update/org.eclipse.update.tests.core/data/ExecutableFeaturePackagedSite/data2/site.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<site type="org.eclipse.update.core.file">

-<description url="info/siteInfo.html"/>

-  <feature url="features/helpFeature.jar" type="org.eclipse.update.core.packaged">

-    <category name="eclipse/UML"/>

-  </feature>

-  <feature url="features/org.eclipse.pde.feature_1.0.0.jar" type="org.eclipse.update.core.packaged">

-    <category name="eclipse/J2EE"/>

-  </feature>

-  <feature url="features/feature3/" os="LINUX">

-    <category name="eclipse"/>

-  </feature>

-  <archive path="plugins/org.eclipse.help_1.0.0.jar" url="plugins/help.jar"/>

-  <archive path="plugins/org.eclipse.pde.core_1.0.0.jar" url="plugins/Pde_core.jar"/>

-  <archive path="plugins/org.junit_3.5.0.jar" url="plugins/junit_3.7.jar"/>

-  <archive path="plugins/org.eclipse.update.plugin1_1.1.1.jar" url="plugins/org.eclipse.update.plugin1_1.1.1"/>  

-  <category-def label="IBM WSAD Tools" name="eclipse"/>

-  <category-def label="J2EE tools" name="eclipse/J2EE"/>

-  <category-def label="EJB Tools" name="eclipse/J2EE/EJB"/>

-  <category-def label="UML tools" name="eclipse/UML"/>

-  <category-def label="Messaging Tools" name="B2B"/>  

-</site>
\ No newline at end of file
diff --git a/update/org.eclipse.update.tests.core/data/FTPLikeSite/site.xml b/update/org.eclipse.update.tests.core/data/FTPLikeSite/site.xml
deleted file mode 100644
index da62e2e..0000000
--- a/update/org.eclipse.update.tests.core/data/FTPLikeSite/site.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<site type="org.eclipse.update.tests.core.ftp">

-  <feature url="features/feature3/features2.jarfile"/>

-</site>
\ No newline at end of file
diff --git a/update/org.eclipse.update.tests.core/data/FeatureTypeExamples/site1/features/feature3/feature.xml b/update/org.eclipse.update.tests.core/data/FeatureTypeExamples/site1/features/feature3/feature.xml
deleted file mode 100644
index 2c98f42..0000000
--- a/update/org.eclipse.update.tests.core/data/FeatureTypeExamples/site1/features/feature3/feature.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<feature id="org.eclipse.update.core.tests.feature3" image="feature1.gif" label="Third Feature" provider-name="Smart Company" version="1.0.0">

-  <description>Description</description>

-  <copyright>copyright</copyright>

-  <license>license</license>

-  <url>

-    <update label="URL to update the feature" url="http://www.eclipse.org/path/feature1/"/>

-    <discovery label="Discovery 1" url="http://www.eclipse.org"/>

-    <discovery label="Discovery 2" url="http://www.eclipse.org"/>

-  </url>

-  <plugin download-size="1500" id="org.eclipse.update.plugin1" install-size="1000" fragment="false" os="WIN32,LINUX" version="1.1.1" ws="WIN32,MOTIF,GTK"/>

-</feature>
\ No newline at end of file
diff --git a/update/org.eclipse.update.tests.core/data/FeatureTypeExamples/site1/site.xml b/update/org.eclipse.update.tests.core/data/FeatureTypeExamples/site1/site.xml
deleted file mode 100644
index 486d119..0000000
--- a/update/org.eclipse.update.tests.core/data/FeatureTypeExamples/site1/site.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<site type="org.eclipse.update.core.file">

-  <feature url="features/feature3" type="org.eclipse.update.tests.core.feature1"/>

-</site>
\ No newline at end of file
diff --git a/update/org.eclipse.update.tests.core/data/FeatureTypeExamples/site2/features/feature3/features2.jarfile b/update/org.eclipse.update.tests.core/data/FeatureTypeExamples/site2/features/feature3/features2.jarfile
deleted file mode 100644
index 240ab4f..0000000
--- a/update/org.eclipse.update.tests.core/data/FeatureTypeExamples/site2/features/feature3/features2.jarfile
+++ /dev/null
Binary files differ
diff --git a/update/org.eclipse.update.tests.core/data/FeatureTypeExamples/site2/site.xml b/update/org.eclipse.update.tests.core/data/FeatureTypeExamples/site2/site.xml
deleted file mode 100644
index fb5fe0e..0000000
--- a/update/org.eclipse.update.tests.core/data/FeatureTypeExamples/site2/site.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<site type="org.eclipse.update.core.file">

-  <feature url="features/feature3/features2.jarfile" type="org.eclipse.update.core.packaged"/>

-</site>
\ No newline at end of file
diff --git a/update/org.eclipse.update.tests.core/data/FeatureTypeExamples/site3/features/feature3/features2.jarfile b/update/org.eclipse.update.tests.core/data/FeatureTypeExamples/site3/features/feature3/features2.jarfile
deleted file mode 100644
index 240ab4f..0000000
--- a/update/org.eclipse.update.tests.core/data/FeatureTypeExamples/site3/features/feature3/features2.jarfile
+++ /dev/null
Binary files differ
diff --git a/update/org.eclipse.update.tests.core/data/FeatureTypeExamples/site3/site.xml b/update/org.eclipse.update.tests.core/data/FeatureTypeExamples/site3/site.xml
deleted file mode 100644
index daf372d..0000000
--- a/update/org.eclipse.update.tests.core/data/FeatureTypeExamples/site3/site.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<site type="org.eclipse.update.core.file">

-  <feature url="features/feature3/features2.jarfile" type="org.eclipse.update.core.unknowntype.jar"/>

-</site>
\ No newline at end of file
diff --git a/update/org.eclipse.update.tests.core/data/Site with space/features space/helpFeature.jar b/update/org.eclipse.update.tests.core/data/Site with space/features space/helpFeature.jar
deleted file mode 100644
index 161abde..0000000
--- a/update/org.eclipse.update.tests.core/data/Site with space/features space/helpFeature.jar
+++ /dev/null
Binary files differ
diff --git a/update/org.eclipse.update.tests.core/data/Site with space/features space/space feature.jar b/update/org.eclipse.update.tests.core/data/Site with space/features space/space feature.jar
deleted file mode 100644
index 173fbf7..0000000
--- a/update/org.eclipse.update.tests.core/data/Site with space/features space/space feature.jar
+++ /dev/null
Binary files differ
diff --git a/update/org.eclipse.update.tests.core/data/Site with space/info/img/top_titlsm.gif b/update/org.eclipse.update.tests.core/data/Site with space/info/img/top_titlsm.gif
deleted file mode 100644
index 3917bb6..0000000
--- a/update/org.eclipse.update.tests.core/data/Site with space/info/img/top_titlsm.gif
+++ /dev/null
Binary files differ
diff --git a/update/org.eclipse.update.tests.core/data/Site with space/info/img/wel_ml.jpg b/update/org.eclipse.update.tests.core/data/Site with space/info/img/wel_ml.jpg
deleted file mode 100644
index 01e33df..0000000
--- a/update/org.eclipse.update.tests.core/data/Site with space/info/img/wel_ml.jpg
+++ /dev/null
Binary files differ
diff --git a/update/org.eclipse.update.tests.core/data/Site with space/info/siteInfo.html b/update/org.eclipse.update.tests.core/data/Site with space/info/siteInfo.html
deleted file mode 100644
index b065aa3..0000000
--- a/update/org.eclipse.update.tests.core/data/Site with space/info/siteInfo.html
+++ /dev/null
@@ -1,63 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">

-<html>

-<head>

-</head>

-  <body>

-<img src="img/top_titlsm.gif" alt="" width="460" height="50">

-<br>

-<br>

-     It started with Smalltalk<br>

-    OTI has been building tools for platform-independent OO development since

-  1988. Our ENVY&reg; technology first brought collaborative software development,

-  version management and shared repositories to Smalltalk. IBM is one of

-many   companies to license ENVY, which continues to be the foundation of

-VisualAge&reg;   Smalltalk.<br>

-<br>

-<br>

-<br>

-      Next came Java&#8482;<br>

-    Because of our expertise in OO technology, IBM turned to OTI for a next-generation

-  development environment for Java. The result is VisualAge for Java, which

-  continues to win awards for its innovative IDE and team support. InfoWorld

-  has chosen VisualAge for Java as development tool of the year - year after

-  year after year!<br>

-<br>

-<br>

-<br>

-      Then pervasive computing<br>

-    OTI continues its development of IBM's VisualAge Micro Edition, a state-of-the-art

-  platform for collaborative development of embedded applications and systems

-  that are very lean. As the steady stream of press releases attests, VisualAge

-  Micro Edition is already licensed to the leading microchip manufacturers,

-  microkernel developers, and producers of handheld and consumer devices.<br>

-<br>

-<br>

-<br>

-      Now it's Eclipse<br>

-    OTI has built the next generation IBM application development tools platform.

-  Eclipse is a kind of universal tool platform - an open extensible IDE for

-  anything and nothing in particular. The real value comes from tool plug-ins

-  that "teach" Eclipse how to work with things - java files, web content,

-graphics,  video - almost anything you can imagine. Eclipse allows you to

-independently  develop tools that integrate with other people's tools so

-seamlessly you won't know where one tool ends and another starts. The IBM

-supported version of this technology, WebSphere Studio Workbench, will be

-the core of the next  generation of IBM and IBM Business Partner e-business

-tools optimized for  the WebSphere software platform.<br>

-<br>

-<br>

-<br>

-      So what's next?<br>

-    OTI continues to deliver object-oriented technology that scales across

- platforms,  across teams and across project size. From a mainframe to a

-watch  - we're  closing in on that vision.<br>

-<br>

-<img src="img/wel_ml.jpg" width="460" height="460" alt="">

-<br>

-<br>

-<br>

-<br>

-<br>

-<br>

-</body>

-</html>

diff --git a/update/org.eclipse.update.tests.core/data/Site with space/install/features space/feature3/feature.xml b/update/org.eclipse.update.tests.core/data/Site with space/install/features space/feature3/feature.xml
deleted file mode 100644
index e82ec30..0000000
--- a/update/org.eclipse.update.tests.core/data/Site with space/install/features space/feature3/feature.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature id="org.eclipse.update.core.tests.feature3" image="feature1.gif" label="Third Feature" provider-name="Smart Company" version="1.0.0" >
-  <description>Description</description>
-  <copyright>copyright</copyright>
-  <license>license</license>
-  <url>
-    <update label="URL to update the feature" url="http://www.eclipse.org/path/feature1/"/>
-    <discovery label="Discovery 1" url="http://www.eclipse.org"/>
-    <discovery label="Discovery 2" url="http://www.eclipse.org"/>
-  </url>
-  <plugin download-size="1500" id="org.eclipse.update.plugin1" install-size="1000" fragment="false" nl="en,fr" os="WIN32,LINUX" version="1.1.1" ws="WIN32,MOTIF,GTK"/>
-</feature>
\ No newline at end of file
diff --git a/update/org.eclipse.update.tests.core/data/Site with space/plugins space/Pde_core.jar b/update/org.eclipse.update.tests.core/data/Site with space/plugins space/Pde_core.jar
deleted file mode 100644
index f107217..0000000
--- a/update/org.eclipse.update.tests.core/data/Site with space/plugins space/Pde_core.jar
+++ /dev/null
Binary files differ
diff --git a/update/org.eclipse.update.tests.core/data/Site with space/plugins space/help.jar b/update/org.eclipse.update.tests.core/data/Site with space/plugins space/help.jar
deleted file mode 100644
index 7584f66..0000000
--- a/update/org.eclipse.update.tests.core/data/Site with space/plugins space/help.jar
+++ /dev/null
Binary files differ
diff --git a/update/org.eclipse.update.tests.core/data/Site with space/plugins space/junit_3.7.jar b/update/org.eclipse.update.tests.core/data/Site with space/plugins space/junit_3.7.jar
deleted file mode 100644
index 67587b2..0000000
--- a/update/org.eclipse.update.tests.core/data/Site with space/plugins space/junit_3.7.jar
+++ /dev/null
Binary files differ
diff --git a/update/org.eclipse.update.tests.core/data/Site with space/plugins space/org.eclipse.update.plugin1_1.1.1/plugin.xml b/update/org.eclipse.update.tests.core/data/Site with space/plugins space/org.eclipse.update.plugin1_1.1.1/plugin.xml
deleted file mode 100644
index e01846c..0000000
--- a/update/org.eclipse.update.tests.core/data/Site with space/plugins space/org.eclipse.update.plugin1_1.1.1/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin name="JUnit Test Framework" id="org.eclipse.update.core.tests.feature1.plugin1" version="3.5.6" vendor-name="junit.org">
-  <runtime>
-    <library name="junit.jar">
-      <export name="*"/>
-    </library>
-  </runtime>
-</plugin>
\ No newline at end of file
diff --git a/update/org.eclipse.update.tests.core/data/Site with space/plugins space/org.eclipse.update.plugin1_1.1.1/src.jar b/update/org.eclipse.update.tests.core/data/Site with space/plugins space/org.eclipse.update.plugin1_1.1.1/src.jar
deleted file mode 100644
index 2d4d609..0000000
--- a/update/org.eclipse.update.tests.core/data/Site with space/plugins space/org.eclipse.update.plugin1_1.1.1/src.jar
+++ /dev/null
Binary files differ
diff --git a/update/org.eclipse.update.tests.core/data/Site with space/site.xml b/update/org.eclipse.update.tests.core/data/Site with space/site.xml
deleted file mode 100644
index 54928fb..0000000
--- a/update/org.eclipse.update.tests.core/data/Site with space/site.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<site type="org.eclipse.update.core.file">

-<description url="info/siteInfo.html"/>

-  <feature url="features space/helpFeature.jar" type="org.eclipse.update.core.packaged">

-    <category name="eclipse/UML"/>

-  </feature>

-  <feature url="features space/space feature.jar" type="org.eclipse.update.core.packaged">

-    <category name="eclipse/J2EE"/>

-  </feature>

-  <feature url="install/features space/feature3/">

-    <category name="eclipse"/>

-  </feature>

-  <archive path="plugins/org.eclipse.help_1.0.0.jar" url="plugins space/help.jar"/>

-  <archive path="plugins/org.eclipse.pde.core_1.0.0.jar" url="plugins space/Pde_core.jar"/>

-  <archive path="plugins/org.junit_3.5.0.jar" url="plugins space/junit_3.7.jar"/>

-  <archive path="plugins/org.eclipse.update.plugin1_1.1.1.jar" url="plugins space/org.eclipse.update.plugin1_1.1.1"/>  

-  <category-def label="IBM WSAD Tools" name="eclipse"/>

-  <category-def label="J2EE tools" name="eclipse/J2EE"/>

-  <category-def label="EJB Tools" name="eclipse/J2EE/EJB"/>

-  <category-def label="UML tools" name="eclipse/UML"/>

-  <category-def label="Messaging Tools" name="B2B"/>  

-</site>
\ No newline at end of file
diff --git a/update/org.eclipse.update.tests.core/data/SiteTypeExamples/site1/features/feature3/features2.jarfile b/update/org.eclipse.update.tests.core/data/SiteTypeExamples/site1/features/feature3/features2.jarfile
deleted file mode 100644
index 240ab4f..0000000
--- a/update/org.eclipse.update.tests.core/data/SiteTypeExamples/site1/features/feature3/features2.jarfile
+++ /dev/null
Binary files differ
diff --git a/update/org.eclipse.update.tests.core/data/SiteTypeExamples/site1/site.xml b/update/org.eclipse.update.tests.core/data/SiteTypeExamples/site1/site.xml
deleted file mode 100644
index 6f7165a..0000000
--- a/update/org.eclipse.update.tests.core/data/SiteTypeExamples/site1/site.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<site type="org.eclipse.update.core.http">

-  <feature url="features/feature3/features2.jarfile"/>

-</site>
\ No newline at end of file
diff --git a/update/org.eclipse.update.tests.core/data/SiteURLTest/data/artifacts/features/helpFeature.jar b/update/org.eclipse.update.tests.core/data/SiteURLTest/data/artifacts/features/helpFeature.jar
deleted file mode 100644
index 9809713..0000000
--- a/update/org.eclipse.update.tests.core/data/SiteURLTest/data/artifacts/features/helpFeature.jar
+++ /dev/null
Binary files differ
diff --git a/update/org.eclipse.update.tests.core/data/SiteURLTest/data/artifacts/features/org.eclipse.pde.feature_1.0.0.jar b/update/org.eclipse.update.tests.core/data/SiteURLTest/data/artifacts/features/org.eclipse.pde.feature_1.0.0.jar
deleted file mode 100644
index f592c1d..0000000
--- a/update/org.eclipse.update.tests.core/data/SiteURLTest/data/artifacts/features/org.eclipse.pde.feature_1.0.0.jar
+++ /dev/null
Binary files differ
diff --git a/update/org.eclipse.update.tests.core/data/SiteURLTest/data/artifacts/plugins/Pde_core.jar b/update/org.eclipse.update.tests.core/data/SiteURLTest/data/artifacts/plugins/Pde_core.jar
deleted file mode 100644
index f107217..0000000
--- a/update/org.eclipse.update.tests.core/data/SiteURLTest/data/artifacts/plugins/Pde_core.jar
+++ /dev/null
Binary files differ
diff --git a/update/org.eclipse.update.tests.core/data/SiteURLTest/data/artifacts/plugins/help.jar b/update/org.eclipse.update.tests.core/data/SiteURLTest/data/artifacts/plugins/help.jar
deleted file mode 100644
index 7584f66..0000000
--- a/update/org.eclipse.update.tests.core/data/SiteURLTest/data/artifacts/plugins/help.jar
+++ /dev/null
Binary files differ
diff --git a/update/org.eclipse.update.tests.core/data/SiteURLTest/data/artifacts/plugins/junit_3.7.jar b/update/org.eclipse.update.tests.core/data/SiteURLTest/data/artifacts/plugins/junit_3.7.jar
deleted file mode 100644
index 67587b2..0000000
--- a/update/org.eclipse.update.tests.core/data/SiteURLTest/data/artifacts/plugins/junit_3.7.jar
+++ /dev/null
Binary files differ
diff --git a/update/org.eclipse.update.tests.core/data/SiteURLTest/data/info/img/top_titlsm.gif b/update/org.eclipse.update.tests.core/data/SiteURLTest/data/info/img/top_titlsm.gif
deleted file mode 100644
index 3917bb6..0000000
--- a/update/org.eclipse.update.tests.core/data/SiteURLTest/data/info/img/top_titlsm.gif
+++ /dev/null
Binary files differ
diff --git a/update/org.eclipse.update.tests.core/data/SiteURLTest/data/info/img/wel_ml.jpg b/update/org.eclipse.update.tests.core/data/SiteURLTest/data/info/img/wel_ml.jpg
deleted file mode 100644
index 01e33df..0000000
--- a/update/org.eclipse.update.tests.core/data/SiteURLTest/data/info/img/wel_ml.jpg
+++ /dev/null
Binary files differ
diff --git a/update/org.eclipse.update.tests.core/data/SiteURLTest/data/info/siteInfo.html b/update/org.eclipse.update.tests.core/data/SiteURLTest/data/info/siteInfo.html
deleted file mode 100644
index b065aa3..0000000
--- a/update/org.eclipse.update.tests.core/data/SiteURLTest/data/info/siteInfo.html
+++ /dev/null
@@ -1,63 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">

-<html>

-<head>

-</head>

-  <body>

-<img src="img/top_titlsm.gif" alt="" width="460" height="50">

-<br>

-<br>

-     It started with Smalltalk<br>

-    OTI has been building tools for platform-independent OO development since

-  1988. Our ENVY&reg; technology first brought collaborative software development,

-  version management and shared repositories to Smalltalk. IBM is one of

-many   companies to license ENVY, which continues to be the foundation of

-VisualAge&reg;   Smalltalk.<br>

-<br>

-<br>

-<br>

-      Next came Java&#8482;<br>

-    Because of our expertise in OO technology, IBM turned to OTI for a next-generation

-  development environment for Java. The result is VisualAge for Java, which

-  continues to win awards for its innovative IDE and team support. InfoWorld

-  has chosen VisualAge for Java as development tool of the year - year after

-  year after year!<br>

-<br>

-<br>

-<br>

-      Then pervasive computing<br>

-    OTI continues its development of IBM's VisualAge Micro Edition, a state-of-the-art

-  platform for collaborative development of embedded applications and systems

-  that are very lean. As the steady stream of press releases attests, VisualAge

-  Micro Edition is already licensed to the leading microchip manufacturers,

-  microkernel developers, and producers of handheld and consumer devices.<br>

-<br>

-<br>

-<br>

-      Now it's Eclipse<br>

-    OTI has built the next generation IBM application development tools platform.

-  Eclipse is a kind of universal tool platform - an open extensible IDE for

-  anything and nothing in particular. The real value comes from tool plug-ins

-  that "teach" Eclipse how to work with things - java files, web content,

-graphics,  video - almost anything you can imagine. Eclipse allows you to

-independently  develop tools that integrate with other people's tools so

-seamlessly you won't know where one tool ends and another starts. The IBM

-supported version of this technology, WebSphere Studio Workbench, will be

-the core of the next  generation of IBM and IBM Business Partner e-business

-tools optimized for  the WebSphere software platform.<br>

-<br>

-<br>

-<br>

-      So what's next?<br>

-    OTI continues to deliver object-oriented technology that scales across

- platforms,  across teams and across project size. From a mainframe to a

-watch  - we're  closing in on that vision.<br>

-<br>

-<img src="img/wel_ml.jpg" width="460" height="460" alt="">

-<br>

-<br>

-<br>

-<br>

-<br>

-<br>

-</body>

-</html>

diff --git a/update/org.eclipse.update.tests.core/data/SiteURLTest/data/site.xml b/update/org.eclipse.update.tests.core/data/SiteURLTest/data/site.xml
deleted file mode 100644
index e3ea684..0000000
--- a/update/org.eclipse.update.tests.core/data/SiteURLTest/data/site.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<site url = "artifacts/">
-<description url="info/siteInfo.html"/>
-  <feature url="features/helpFeature.jar" type="org.eclipse.update.core.packaged">
-    <category name="eclipse/UML"/>
-  </feature>
-  <feature url="features/org.eclipse.pde.feature_1.0.0.jar" type="org.eclipse.update.core.packaged">
-    <category name="eclipse/J2EE"/>
-  </feature>
-  <archive path="plugins/org.eclipse.help_1.0.0.jar" url="plugins/help.jar"/>
-  <archive path="plugins/org.eclipse.pde.core_1.0.0.jar" url="plugins/Pde_core.jar"/>
-  <archive path="plugins/org.junit_3.5.0.jar" url="plugins/junit_3.7.jar"/>
-  <category-def label="IBM WSAD Tools" name="eclipse"/>
-  <category-def label="J2EE tools" name="eclipse/J2EE"/>
-  <category-def label="EJB Tools" name="eclipse/J2EE/EJB"/>
-  <category-def label="UML tools" name="eclipse/UML"/>
-  <category-def label="Messaging Tools" name="B2B"/>  
-</site>
\ No newline at end of file
diff --git a/update/org.eclipse.update.tests.core/data/dataEntrySiteTest/site1/file1.zip b/update/org.eclipse.update.tests.core/data/dataEntrySiteTest/site1/file1.zip
deleted file mode 100644
index 1a70b7e..0000000
--- a/update/org.eclipse.update.tests.core/data/dataEntrySiteTest/site1/file1.zip
+++ /dev/null
Binary files differ
diff --git a/update/org.eclipse.update.tests.core/data/dataEntrySiteTest/site1/install/features/feature3/feature.xml b/update/org.eclipse.update.tests.core/data/dataEntrySiteTest/site1/install/features/feature3/feature.xml
deleted file mode 100644
index 6b454ec..0000000
--- a/update/org.eclipse.update.tests.core/data/dataEntrySiteTest/site1/install/features/feature3/feature.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<feature id="org.eclipse.update.core.tests.feature3" image="feature1.gif" label="Third Feature" provider-name="Smart Company" version="1.0.0">

-	<install-handler handler="org.eclipse.update.core.DefaultInstallHandler"/>

-  	<data download-size="1500" id="file.zip" install-size="1000"/>

-</feature>
\ No newline at end of file
diff --git a/update/org.eclipse.update.tests.core/data/dataEntrySiteTest/site1/site.xml b/update/org.eclipse.update.tests.core/data/dataEntrySiteTest/site1/site.xml
deleted file mode 100644
index c41f21d..0000000
--- a/update/org.eclipse.update.tests.core/data/dataEntrySiteTest/site1/site.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<site type="org.eclipse.update.core.file">

-<description url="info/siteInfo.html"/>

-  <feature url="install/features/feature3">

-  </feature>

-  <archive path="features/org.eclipse.update.core.tests.feature3_1.0.0/file.zip" url="file1.zip"/>

-</site>
\ No newline at end of file
diff --git a/update/org.eclipse.update.tests.core/data/dataEntrySiteTest/site2/features/features3.jar b/update/org.eclipse.update.tests.core/data/dataEntrySiteTest/site2/features/features3.jar
deleted file mode 100644
index 74c6eca..0000000
--- a/update/org.eclipse.update.tests.core/data/dataEntrySiteTest/site2/features/features3.jar
+++ /dev/null
Binary files differ
diff --git a/update/org.eclipse.update.tests.core/data/dataEntrySiteTest/site2/non data/another file.zip b/update/org.eclipse.update.tests.core/data/dataEntrySiteTest/site2/non data/another file.zip
deleted file mode 100644
index 1a70b7e..0000000
--- a/update/org.eclipse.update.tests.core/data/dataEntrySiteTest/site2/non data/another file.zip
+++ /dev/null
Binary files differ
diff --git a/update/org.eclipse.update.tests.core/data/dataEntrySiteTest/site2/site.xml b/update/org.eclipse.update.tests.core/data/dataEntrySiteTest/site2/site.xml
deleted file mode 100644
index 040943c..0000000
--- a/update/org.eclipse.update.tests.core/data/dataEntrySiteTest/site2/site.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<site type="org.eclipse.update.core.file">

-<description url="info/siteInfo.html"/>

-  <feature url="features/features3.jar" type="org.eclipse.update.core.packaged">

-  </feature>

-  <archive path="features/org.eclipse.update.core.tests.feature3_1.0.0/file.zip" url="non data/another file.zip"/>

-</site>
\ No newline at end of file
diff --git a/update/org.eclipse.update.tests.core/data/features/features2.jar b/update/org.eclipse.update.tests.core/data/features/features2.jar
deleted file mode 100644
index e8d004d..0000000
--- a/update/org.eclipse.update.tests.core/data/features/features2.jar
+++ /dev/null
Binary files differ
diff --git a/update/org.eclipse.update.tests.core/data/features/org.eclipse.test.feature_1.0.0.jar b/update/org.eclipse.update.tests.core/data/features/org.eclipse.test.feature_1.0.0.jar
deleted file mode 100644
index 870a70d..0000000
--- a/update/org.eclipse.update.tests.core/data/features/org.eclipse.test.feature_1.0.0.jar
+++ /dev/null
Binary files differ
diff --git a/update/org.eclipse.update.tests.core/data/features/org.eclipse.update.core.tests.feature1_1.0.4.jar b/update/org.eclipse.update.tests.core/data/features/org.eclipse.update.core.tests.feature1_1.0.4.jar
deleted file mode 100644
index 9dc9463..0000000
--- a/update/org.eclipse.update.tests.core/data/features/org.eclipse.update.core.tests.feature1_1.0.4.jar
+++ /dev/null
Binary files differ
diff --git a/update/org.eclipse.update.tests.core/data/features/org.eclipse_test_feature.jar b/update/org.eclipse.update.tests.core/data/features/org.eclipse_test_feature.jar
deleted file mode 100644
index 938ddc4..0000000
--- a/update/org.eclipse.update.tests.core/data/features/org.eclipse_test_feature.jar
+++ /dev/null
Binary files differ
diff --git a/update/org.eclipse.update.tests.core/data/nestedFeatureSiteTest/features/org.eclipse.update.core.tests.childrenfeature_2.0.0.jar b/update/org.eclipse.update.tests.core/data/nestedFeatureSiteTest/features/org.eclipse.update.core.tests.childrenfeature_2.0.0.jar
deleted file mode 100644
index 6658034..0000000
--- a/update/org.eclipse.update.tests.core/data/nestedFeatureSiteTest/features/org.eclipse.update.core.tests.childrenfeature_2.0.0.jar
+++ /dev/null
Binary files differ
diff --git a/update/org.eclipse.update.tests.core/data/nestedFeatureSiteTest/features/rootfeature.jar b/update/org.eclipse.update.tests.core/data/nestedFeatureSiteTest/features/rootfeature.jar
deleted file mode 100644
index b011050..0000000
--- a/update/org.eclipse.update.tests.core/data/nestedFeatureSiteTest/features/rootfeature.jar
+++ /dev/null
Binary files differ
diff --git a/update/org.eclipse.update.tests.core/data/nestedFeatureSiteTest/plugins/org.eclipse.update.core.tests.feature1.plugin1_3.5.6.jar b/update/org.eclipse.update.tests.core/data/nestedFeatureSiteTest/plugins/org.eclipse.update.core.tests.feature1.plugin1_3.5.6.jar
deleted file mode 100644
index 5d9f5bc..0000000
--- a/update/org.eclipse.update.tests.core/data/nestedFeatureSiteTest/plugins/org.eclipse.update.core.tests.feature1.plugin1_3.5.6.jar
+++ /dev/null
Binary files differ
diff --git a/update/org.eclipse.update.tests.core/data/nestedFeatureSiteTest/plugins/org.eclipse.update.core.tests.feature1.plugin2_5.0.0.jar b/update/org.eclipse.update.tests.core/data/nestedFeatureSiteTest/plugins/org.eclipse.update.core.tests.feature1.plugin2_5.0.0.jar
deleted file mode 100644
index 8b4b04a..0000000
--- a/update/org.eclipse.update.tests.core/data/nestedFeatureSiteTest/plugins/org.eclipse.update.core.tests.feature1.plugin2_5.0.0.jar
+++ /dev/null
Binary files differ
diff --git a/update/org.eclipse.update.tests.core/data/nestedFeatureSiteTest/plugins/org.eclipse.update.core.tests.feature1.plugin2_5.0.1.jar b/update/org.eclipse.update.tests.core/data/nestedFeatureSiteTest/plugins/org.eclipse.update.core.tests.feature1.plugin2_5.0.1.jar
deleted file mode 100644
index 52208fe..0000000
--- a/update/org.eclipse.update.tests.core/data/nestedFeatureSiteTest/plugins/org.eclipse.update.core.tests.feature1.plugin2_5.0.1.jar
+++ /dev/null
Binary files differ
diff --git a/update/org.eclipse.update.tests.core/data/nestedFeatureSiteTest/site.xml b/update/org.eclipse.update.tests.core/data/nestedFeatureSiteTest/site.xml
deleted file mode 100644
index 623cb1a..0000000
--- a/update/org.eclipse.update.tests.core/data/nestedFeatureSiteTest/site.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<site>
-  <feature url="features/rootfeature.jar"/>
-</site>
\ No newline at end of file
diff --git a/update/org.eclipse.update.tests.core/data/nestedFeatureSiteTest2/features/childrenfeature.jar b/update/org.eclipse.update.tests.core/data/nestedFeatureSiteTest2/features/childrenfeature.jar
deleted file mode 100644
index 7e057e6..0000000
--- a/update/org.eclipse.update.tests.core/data/nestedFeatureSiteTest2/features/childrenfeature.jar
+++ /dev/null
Binary files differ
diff --git a/update/org.eclipse.update.tests.core/data/nestedFeatureSiteTest2/features/rootfeature.jar b/update/org.eclipse.update.tests.core/data/nestedFeatureSiteTest2/features/rootfeature.jar
deleted file mode 100644
index 38a0a3c..0000000
--- a/update/org.eclipse.update.tests.core/data/nestedFeatureSiteTest2/features/rootfeature.jar
+++ /dev/null
Binary files differ
diff --git a/update/org.eclipse.update.tests.core/data/nestedFeatureSiteTest2/plugins/org.eclipse.update.core.tests.feature1.plugin1_3.5.6.jar b/update/org.eclipse.update.tests.core/data/nestedFeatureSiteTest2/plugins/org.eclipse.update.core.tests.feature1.plugin1_3.5.6.jar
deleted file mode 100644
index 5d9f5bc..0000000
--- a/update/org.eclipse.update.tests.core/data/nestedFeatureSiteTest2/plugins/org.eclipse.update.core.tests.feature1.plugin1_3.5.6.jar
+++ /dev/null
Binary files differ
diff --git a/update/org.eclipse.update.tests.core/data/nestedFeatureSiteTest2/plugins/org.eclipse.update.core.tests.feature1.plugin2_5.0.0.jar b/update/org.eclipse.update.tests.core/data/nestedFeatureSiteTest2/plugins/org.eclipse.update.core.tests.feature1.plugin2_5.0.0.jar
deleted file mode 100644
index 8b4b04a..0000000
--- a/update/org.eclipse.update.tests.core/data/nestedFeatureSiteTest2/plugins/org.eclipse.update.core.tests.feature1.plugin2_5.0.0.jar
+++ /dev/null
Binary files differ
diff --git a/update/org.eclipse.update.tests.core/data/nestedFeatureSiteTest2/plugins/org.eclipse.update.core.tests.feature1.plugin2_5.0.1.jar b/update/org.eclipse.update.tests.core/data/nestedFeatureSiteTest2/plugins/org.eclipse.update.core.tests.feature1.plugin2_5.0.1.jar
deleted file mode 100644
index 52208fe..0000000
--- a/update/org.eclipse.update.tests.core/data/nestedFeatureSiteTest2/plugins/org.eclipse.update.core.tests.feature1.plugin2_5.0.1.jar
+++ /dev/null
Binary files differ
diff --git a/update/org.eclipse.update.tests.core/data/nestedFeatureSiteTest2/site.xml b/update/org.eclipse.update.tests.core/data/nestedFeatureSiteTest2/site.xml
deleted file mode 100644
index 1752da2..0000000
--- a/update/org.eclipse.update.tests.core/data/nestedFeatureSiteTest2/site.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<site>
-  <feature url="features/rootfeature.jar"/>
-  <feature url="features/childrenfeature.jar"/>  
-  
-  <archive path="features/org.eclipse.update.core.tests.childrenfeature_2.1.0.jar" url="features/childrenfeature.jar"/>  
-</site>
\ No newline at end of file
diff --git a/update/org.eclipse.update.tests.core/data/nestedFeatureSiteTest3/features/childrenfeature.jar b/update/org.eclipse.update.tests.core/data/nestedFeatureSiteTest3/features/childrenfeature.jar
deleted file mode 100644
index 12ee4ba..0000000
--- a/update/org.eclipse.update.tests.core/data/nestedFeatureSiteTest3/features/childrenfeature.jar
+++ /dev/null
Binary files differ
diff --git a/update/org.eclipse.update.tests.core/data/nestedFeatureSiteTest3/features/rootfeature.jar b/update/org.eclipse.update.tests.core/data/nestedFeatureSiteTest3/features/rootfeature.jar
deleted file mode 100644
index 899bdda..0000000
--- a/update/org.eclipse.update.tests.core/data/nestedFeatureSiteTest3/features/rootfeature.jar
+++ /dev/null
Binary files differ
diff --git a/update/org.eclipse.update.tests.core/data/nestedFeatureSiteTest3/plugins/org.eclipse.update.core.tests.feature1.plugin1_3.5.6.jar b/update/org.eclipse.update.tests.core/data/nestedFeatureSiteTest3/plugins/org.eclipse.update.core.tests.feature1.plugin1_3.5.6.jar
deleted file mode 100644
index 5d9f5bc..0000000
--- a/update/org.eclipse.update.tests.core/data/nestedFeatureSiteTest3/plugins/org.eclipse.update.core.tests.feature1.plugin1_3.5.6.jar
+++ /dev/null
Binary files differ
diff --git a/update/org.eclipse.update.tests.core/data/nestedFeatureSiteTest3/plugins/org.eclipse.update.core.tests.feature1.plugin2_5.0.0.jar b/update/org.eclipse.update.tests.core/data/nestedFeatureSiteTest3/plugins/org.eclipse.update.core.tests.feature1.plugin2_5.0.0.jar
deleted file mode 100644
index 8b4b04a..0000000
--- a/update/org.eclipse.update.tests.core/data/nestedFeatureSiteTest3/plugins/org.eclipse.update.core.tests.feature1.plugin2_5.0.0.jar
+++ /dev/null
Binary files differ
diff --git a/update/org.eclipse.update.tests.core/data/nestedFeatureSiteTest3/plugins/org.eclipse.update.core.tests.feature1.plugin2_5.0.1.jar b/update/org.eclipse.update.tests.core/data/nestedFeatureSiteTest3/plugins/org.eclipse.update.core.tests.feature1.plugin2_5.0.1.jar
deleted file mode 100644
index 52208fe..0000000
--- a/update/org.eclipse.update.tests.core/data/nestedFeatureSiteTest3/plugins/org.eclipse.update.core.tests.feature1.plugin2_5.0.1.jar
+++ /dev/null
Binary files differ
diff --git a/update/org.eclipse.update.tests.core/data/nestedFeatureSiteTest3/site.xml b/update/org.eclipse.update.tests.core/data/nestedFeatureSiteTest3/site.xml
deleted file mode 100644
index 4f696ba..0000000
--- a/update/org.eclipse.update.tests.core/data/nestedFeatureSiteTest3/site.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<site>
-  <feature url="features/rootfeature.jar"/>
-  
-  <archive path="features/org.eclipse.update.core.tests.childrenfeature_2.1.0.jar" url="features/childrenfeature.jar"/>  
-</site>
\ No newline at end of file
diff --git a/update/org.eclipse.update.tests.core/data/parsertests/feature1.xml b/update/org.eclipse.update.tests.core/data/parsertests/feature1.xml
deleted file mode 100644
index 93d7080..0000000
--- a/update/org.eclipse.update.tests.core/data/parsertests/feature1.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-   id="org.eclipse.platform"
-   version="2.1.0"
-   label="Eclipse Platform"
-   provider-name="www.eclipse.org"
-   image="splash/splash_full.bmp"
-   >
-
-	<license>
-    	 license
-	</license>
-
-   <copyright url="notice.html"/>
-   x
-	
-   <license url="about.html">
-   x
-   </license>
-
-   <url>
-      <update url="file:/D:/" label="Eclipse Update Site"/>
-   </url>
-
-</feature>
\ No newline at end of file
diff --git a/update/org.eclipse.update.tests.core/data/parsertests/feature1bis.xml b/update/org.eclipse.update.tests.core/data/parsertests/feature1bis.xml
deleted file mode 100644
index e855f97..0000000
--- a/update/org.eclipse.update.tests.core/data/parsertests/feature1bis.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-   id="org.eclipse.platform"
-   version="2.1.0"
-   label="Eclipse Platform"
-   provider-name="www.eclipse.org"
-   image="splash/splash_full.bmp"
-   >
-
-   <description>
-   Eclipse platform feature.
-   </description>
-
-   <copyright url="notice.html"/>
-   <blah />
-	
-   <license url="about.html">
-
-   </license>
-
-   <url>
-      <update url="file:/D:/" label="Eclipse Update Site"/>
-   </url>
-
-</feature>
\ No newline at end of file
diff --git a/update/org.eclipse.update.tests.core/data/parsertests/feature2.xml b/update/org.eclipse.update.tests.core/data/parsertests/feature2.xml
deleted file mode 100644
index 9c2df9b..0000000
--- a/update/org.eclipse.update.tests.core/data/parsertests/feature2.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-   id="org.eclipse.platform"
-   version="2.1.0"
-   label="Eclipse Platform"
-   provider-name="www.eclipse.org"
-   image="splash/splash_full.bmp"
-   blah="blah"
-   >
-
-   <description blah="blah">
-   Eclipse platform feature.
-   </description>
-
-   <copyright url="notice.html" blah="blah"/>
-	
-   <license url="about.html" blah="blah">
-   </license>
-
-   <url blah="blah">
-      <update url="file:/D:/" label="Eclipse Update Site" blah="blah"/>
-   </url>
-
-</feature>
\ No newline at end of file
diff --git a/update/org.eclipse.update.tests.core/data/parsertests/feature3.xml b/update/org.eclipse.update.tests.core/data/parsertests/feature3.xml
deleted file mode 100644
index ca660be..0000000
--- a/update/org.eclipse.update.tests.core/data/parsertests/feature3.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-   id="org.eclipse.platform"
-   version="2.1.0"
-   label="Eclipse Platform"
-   provider-name="www.eclipse.org"
-   image="splash/splash_full.bmp"
-   >
-
-   <description>
-   Eclipse platform feature.
-   </description>
-
-   <copyright url="$os$/$ws$/notice.html"/>
-   x
-	
-   <license url="about.html">
-   x
-   </license>
-
-   <url>
-      <update url="file:/D:/" label="Eclipse Update Site"/>
-   </url>
-
-</feature>
\ No newline at end of file
diff --git a/update/org.eclipse.update.tests.core/data/parsertests/feature4.xml b/update/org.eclipse.update.tests.core/data/parsertests/feature4.xml
deleted file mode 100644
index 17187c9..0000000
--- a/update/org.eclipse.update.tests.core/data/parsertests/feature4.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-   id="org.eclipse.platform"
-   version="2.1.0"
-   label="Eclipse Platform"
-   provider-name="www.eclipse.org"
-   image="splash/splash_full.bmp"
-   >
-
-   <description>
-   Eclipse platform feature.
-   </description>
-
-   <copyright url="$os$/$ws$/notice.html"/>
-   x
-	
-   <license url="about.html">
-   x
-   </license>
-
-   <url>
-      <update url="file:/D:/" label="Eclipse Update Site"/>
-      <discovery url="file:/c:/" label = "Discovery" type="web"/>
-   </url>
-
-</feature>
\ No newline at end of file
diff --git a/update/org.eclipse.update.tests.core/data/parsertests/reddot.xml b/update/org.eclipse.update.tests.core/data/parsertests/reddot.xml
deleted file mode 100644
index f3f1701..0000000
--- a/update/org.eclipse.update.tests.core/data/parsertests/reddot.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>

-<site url="info/siteInfo.html">

-<feature url="features/reddot_1.0.0.jar"> 

-<category name="reddot"/>

-</feature>

-<feature url="features/reddot_2.1.0.jar">

-<category name="reddot"/>

-</feature>

-<archive path="com.reddot.redot_1.0.0" url="plugins/com.reddot.reddot_1.0.0.jar"/>

-<archive path="com.reddot.redot_2.1.0" url="plugins/com.reddot.reddot_2.1.0.jar"/>

-<category-def label="Red Dot Versions" name="reddot">

-<description url="RedDotVersions.html">

-This category contains all of the &lt;currently&gt; available versions of Red Dot feature.

-<![CDATA[<greeting>Hello, world!</greeting>]]>

-</description>

-</category-def>

-</site>

-

-

diff --git a/update/org.eclipse.update.tests.core/data/parsertests/reddot1.xml b/update/org.eclipse.update.tests.core/data/parsertests/reddot1.xml
deleted file mode 100644
index 074490e..0000000
--- a/update/org.eclipse.update.tests.core/data/parsertests/reddot1.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>

-<site url="info/siteInfo.html">

-<feature url="features/reddot_1.0.0.jar"> 

-<category name="reddot"/>

-</feature>

-<feature url="features/reddot_2.1.0.jar">

-<category name="reddot"/>

-</feature>

-<archive path="com.reddot.redot_1.0.0" url="plugins/com.reddot.reddot_1.0.0.jar"/>

-<archive path="com.reddot.redot_2.1.0" url="plugins/com.reddot.reddot_2.1.0.jar"/>

-<category-def label="Red Dot Versions" name="reddot">

-<description url="RedDotVersions.html">

-This category contains all of the &lt;currently&gt; available versions of Red Dot feature.

-</description>

-</category-def>

-</site>

-

-

diff --git a/update/org.eclipse.update.tests.core/data/parsertests/site.properties b/update/org.eclipse.update.tests.core/data/parsertests/site.properties
deleted file mode 100644
index 8e1ced4..0000000
--- a/update/org.eclipse.update.tests.core/data/parsertests/site.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-###############################################################################

-# Copyright (c) 2000, 2003 IBM Corporation and others.

-# All rights reserved. This program and the accompanying materials 

-# are made available under the terms of the Common Public License v1.0

-# which accompanies this distribution, and is available at

-# http://www.eclipse.org/legal/cpl-v10.html

-# 

-# Contributors:

-#     IBM Corporation - initial API and implementation

-###############################################################################

-drivers=Required Drivers

-security=Security Fixes
\ No newline at end of file
diff --git a/update/org.eclipse.update.tests.core/data/parsertests/site.xml b/update/org.eclipse.update.tests.core/data/parsertests/site.xml
deleted file mode 100644
index b40d831..0000000
--- a/update/org.eclipse.update.tests.core/data/parsertests/site.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<site id="org.eclipse.update.core.tests" name="Tests" version="0.0.1" type="org.eclipse.update.core.file">

-  <handler>

-  	<boo class ="unknown"/>

-  </handler>

-  

-  <feature url="features/org.eclipse.test.feature_1.0.0.jar">

-    <category name="category1"/>

-  </feature>

-  

-  <feature url="features/features2.jar">

-    <category name="category1/subcat1"/>

-    <category name="category2"/>

-  </feature>

-  

-  <feature url="features/org.eclipse.update.core.tests.feature1_1.0.4.jar">

-    <category name="category1"/>

-    <category name="category2"/>

-    <blah/>

-  </feature>

-  

-  <feature url="features/org.eclipse_test_feature.jar"/>

-  

-  <feature url="org.eclipse.update.core.feature2_1.0.0/org.eclipse.update.core.feature2_2.2.2.jar">

-    <category name="category1"/>

-  </feature>

-  

-  <feature url="org.eclipse.update.core.feature2_1.0.0/org.eclipse.update.core.feature2_2.2.2.jar">

-  </feature>

-  

-  <archive path="plugins/hello" >

-  	<default/>

-  </archive>

-

-  <category-def name="category2" label="%security"/>

-  <category-def name="category1/subcat1" label="Special Fix"/>

-  <category-def name="category1" label="%drivers"/>  

-

-

-</site>
\ No newline at end of file
diff --git a/update/org.eclipse.update.tests.core/data/parsertests/site10.xml b/update/org.eclipse.update.tests.core/data/parsertests/site10.xml
deleted file mode 100644
index e42680d..0000000
--- a/update/org.eclipse.update.tests.core/data/parsertests/site10.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<site id="org.eclipse.update.core.tests" name="Tests" version="0.0.1" type="org.eclipse.update.core.file" blah="blah">
-  
-  <feature url="features/org.eclipse.test.feature_1.0.0.jar" blah="blah" id="org.eclipse.test.feature" version="1.0.0"/>
-  
-  <feature url="features/features2.jar" id="unknwon.id" version="bad version"/>
-  
-  <feature url="features/org.eclipse.update.core.tests.feature1_1.0.4.jar" id="only.id"/>
-    
-  <feature url="features/org.eclipse_test_feature.jar" version="1.0.0"/>
-  
-</site>
\ No newline at end of file
diff --git a/update/org.eclipse.update.tests.core/data/parsertests/site2.xml b/update/org.eclipse.update.tests.core/data/parsertests/site2.xml
deleted file mode 100644
index 007550e..0000000
--- a/update/org.eclipse.update.tests.core/data/parsertests/site2.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<site>
-  <feature id="com.ibm.jdt" url="http://www.not-eclipse.org/feature3" version="1.0.0"/>
-</site>
\ No newline at end of file
diff --git a/update/org.eclipse.update.tests.core/data/parsertests/site3.xml b/update/org.eclipse.update.tests.core/data/parsertests/site3.xml
deleted file mode 100644
index dbbb682..0000000
--- a/update/org.eclipse.update.tests.core/data/parsertests/site3.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<site>
-  <feature id="com.ibm.jdt" url="feature3/feature.jar" version="1.0.0">
-        <category name="unknown"/>
-  </feature>
-</site>
\ No newline at end of file
diff --git a/update/org.eclipse.update.tests.core/data/parsertests/site4.xml b/update/org.eclipse.update.tests.core/data/parsertests/site4.xml
deleted file mode 100644
index 41b7d16..0000000
--- a/update/org.eclipse.update.tests.core/data/parsertests/site4.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<site>
-   <description url="info/siteInfo.html"/>
-
-  <category-def label="Red Dot Versions" name="reddot">
-      <description url="RedDotVersions.html">
-         This category contains all of the currently available versions of Red Dot feature.
-      </description>
-   </category-def>
-   
-   <feature url="features/com.reddot.reddot_1.0.0.jar">
-      <category name="reddot"/>
-   </feature>
-
-   <feature url="features/com.reddot.reddot_2.1.0.jar">
-      <category name="reddot"/>
-   </feature>
-
- 
-</site>   
\ No newline at end of file
diff --git a/update/org.eclipse.update.tests.core/data/parsertests/site7.xml b/update/org.eclipse.update.tests.core/data/parsertests/site7.xml
deleted file mode 100644
index 2190d70..0000000
--- a/update/org.eclipse.update.tests.core/data/parsertests/site7.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<site id="org.eclipse.update.core.tests" name="Tests" version="0.0.1" type="org.eclipse.update.core.file">
-  <handler>
-  	<boo class ="unknown"/>
-  </handler>
-  
-  <feature url="features/org.eclipse.test.feature_1.0.0.jar">
-    <category name="category1"/>
-  </feature>
-  
-  <feature url="features/features2.jar">
-    <category name="category1/subcat1"/>
-    <category name="category2"/>
-  </feature>
-  
-  <blah/>
-  
-  <feature url="features/org.eclipse.update.core.tests.feature1_1.0.4.jar">
-    <category name="category1"/>
-    <category name="category2"/>
-    <blah/>
-  </feature>
-  
-  <feature url="features/org.eclipse_test_feature.jar"/>
-  
-  <feature url="org.eclipse.update.core.feature2_1.0.0/org.eclipse.update.core.feature2_2.2.2.jar">
-    <category name="category1"/>
-  </feature>
-  
-  <feature url="org.eclipse.update.core.feature2_1.0.0/org.eclipse.update.core.feature2_2.2.2.jar">
-  </feature>
-  
-  <archive path="plugins/hello" >
-  	<default/>
-  </archive>
-
-  <category-def name="category2" label="%security"/>
-  <category-def name="category1/subcat1" label="Special Fix"/>
-  <category-def name="category1" label="%drivers"/>  
-
-
-</site>
\ No newline at end of file
diff --git a/update/org.eclipse.update.tests.core/data/parsertests/site8.xml b/update/org.eclipse.update.tests.core/data/parsertests/site8.xml
deleted file mode 100644
index afcbaa1..0000000
--- a/update/org.eclipse.update.tests.core/data/parsertests/site8.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<site id="org.eclipse.update.core.tests" name="Tests" version="0.0.1" type="org.eclipse.update.core.file">
-  <handler>
-  	<boo class ="unknown"/>
-  </handler>
-  
-  <feature url="features/org.eclipse.test.feature_1.0.0.jar">
-    <category name="category1"/>
-  </feature>
-  
-  <feature url="features/features2.jar">
-    <category name="category1/subcat1"/>
-    <category name="category2"/>
-  </feature>
-  xcxgfsdfgsdsd
-  
-  <feature url="features/org.eclipse.update.core.tests.feature1_1.0.4.jar">
-    <category name="category1"/>
-    <category name="category2"/>
-    <blah/>
-  </feature>
-  
-  <feature url="features/org.eclipse_test_feature.jar"/>
-  
-  <feature url="org.eclipse.update.core.feature2_1.0.0/org.eclipse.update.core.feature2_2.2.2.jar">
-    <category name="category1"/>
-  </feature>
-  
-  <feature url="org.eclipse.update.core.feature2_1.0.0/org.eclipse.update.core.feature2_2.2.2.jar">
-  </feature>
-  
-  <archive path="plugins/hello" >
-  	<default/>
-  </archive>
-
-  <category-def name="category2" label="%security"/>
-  <category-def name="category1/subcat1" label="Special Fix"/>
-  <category-def name="category1" label="%drivers"/>  
-
-
-</site>
\ No newline at end of file
diff --git a/update/org.eclipse.update.tests.core/data/parsertests/site9.xml b/update/org.eclipse.update.tests.core/data/parsertests/site9.xml
deleted file mode 100644
index f38c5a4..0000000
--- a/update/org.eclipse.update.tests.core/data/parsertests/site9.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<site id="org.eclipse.update.core.tests" name="Tests" version="0.0.1" type="org.eclipse.update.core.file" blah="blah">
-  <handler blah="blah">
-  	<boo class ="unknown" blah="blah"/>
-  </handler>
-  
-  <feature url="features/org.eclipse.test.feature_1.0.0.jar" blah="blah">
-    <category name="category1" blah="blah" />
-  </feature>
-  
-  <feature url="features/features2.jar">
-    <category name="category1/subcat1"/>
-    <category name="category2"/>
-  </feature>
-  
-  <feature url="features/org.eclipse.update.core.tests.feature1_1.0.4.jar">
-    <category name="category1"/>
-    <category name="category2"/>
-    <blah/>
-  </feature>
-  
-  <feature url="features/org.eclipse_test_feature.jar"/>
-  
-  <feature url="org.eclipse.update.core.feature2_1.0.0/org.eclipse.update.core.feature2_2.2.2.jar">
-    <category name="category1"/>
-  </feature>
-  
-  <feature url="org.eclipse.update.core.feature2_1.0.0/org.eclipse.update.core.feature2_2.2.2.jar">
-  </feature>
-  
-  <archive path="plugins/hello" blah="blah">
-  	<default blah="blah"/>
-  </archive>
-
-  <category-def name="category2" label="%security" blah="blah"/>
-  <category-def name="category1/subcat1" label="Special Fix" blah="blah"/>
-  <category-def name="category1" label="%drivers"/>  
-
-
-</site>
\ No newline at end of file
diff --git a/update/org.eclipse.update.tests.core/data/parsertests/siteftp.xml b/update/org.eclipse.update.tests.core/data/parsertests/siteftp.xml
deleted file mode 100644
index f883ec0..0000000
--- a/update/org.eclipse.update.tests.core/data/parsertests/siteftp.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<site type="org.eclipse.update.tests.core.ftp">
-  <feature url="features/feature3/features2.jarfile"/>
-</site>
\ No newline at end of file
diff --git a/update/org.eclipse.update.tests.core/data/plugins/org.eclipse.update.core.feature1.plugin1_1.1.1.jar b/update/org.eclipse.update.tests.core/data/plugins/org.eclipse.update.core.feature1.plugin1_1.1.1.jar
deleted file mode 100644
index 0c995d5..0000000
--- a/update/org.eclipse.update.tests.core/data/plugins/org.eclipse.update.core.feature1.plugin1_1.1.1.jar
+++ /dev/null
Binary files differ
diff --git a/update/org.eclipse.update.tests.core/data/plugins/org.eclipse.update.core.feature2.plugin2_2.2.2.jar b/update/org.eclipse.update.tests.core/data/plugins/org.eclipse.update.core.feature2.plugin2_2.2.2.jar
deleted file mode 100644
index 0c995d5..0000000
--- a/update/org.eclipse.update.tests.core/data/plugins/org.eclipse.update.core.feature2.plugin2_2.2.2.jar
+++ /dev/null
Binary files differ
diff --git a/update/org.eclipse.update.tests.core/data/plugins/org.eclipse.update.core.tests.dummy_7.9.8.jar b/update/org.eclipse.update.tests.core/data/plugins/org.eclipse.update.core.tests.dummy_7.9.8.jar
deleted file mode 100644
index 78f193d..0000000
--- a/update/org.eclipse.update.tests.core/data/plugins/org.eclipse.update.core.tests.dummy_7.9.8.jar
+++ /dev/null
Binary files differ
diff --git a/update/org.eclipse.update.tests.core/data/plugins/org.eclipse.update.core.tests.feature1.plugin1_3.5.6.jar b/update/org.eclipse.update.tests.core/data/plugins/org.eclipse.update.core.tests.feature1.plugin1_3.5.6.jar
deleted file mode 100644
index 2275ade..0000000
--- a/update/org.eclipse.update.tests.core/data/plugins/org.eclipse.update.core.tests.feature1.plugin1_3.5.6.jar
+++ /dev/null
Binary files differ
diff --git a/update/org.eclipse.update.tests.core/data/plugins/org.eclipse.update.core.tests.feature1.plugin2_5.0.0.jar b/update/org.eclipse.update.tests.core/data/plugins/org.eclipse.update.core.tests.feature1.plugin2_5.0.0.jar
deleted file mode 100644
index ea958c7..0000000
--- a/update/org.eclipse.update.tests.core/data/plugins/org.eclipse.update.core.tests.feature1.plugin2_5.0.0.jar
+++ /dev/null
Binary files differ
diff --git a/update/org.eclipse.update.tests.core/data/plugins/org.eclipse.update.plugin1_1.1.1/plugin.xml b/update/org.eclipse.update.tests.core/data/plugins/org.eclipse.update.plugin1_1.1.1/plugin.xml
deleted file mode 100644
index 7f05d82..0000000
--- a/update/org.eclipse.update.tests.core/data/plugins/org.eclipse.update.plugin1_1.1.1/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<plugin name="JUnit Test Framework" id="org.eclipse.update.core.tests.feature1.plugin1" version="3.5.6" vendor-name="junit.org">

-  <runtime>

-    <library name="junit.jar">

-      <export name="*"/>

-    </library>

-  </runtime>

-</plugin>
\ No newline at end of file
diff --git a/update/org.eclipse.update.tests.core/data/plugins/org.eclipse.update.plugin1_1.1.1/src.jar b/update/org.eclipse.update.tests.core/data/plugins/org.eclipse.update.plugin1_1.1.1/src.jar
deleted file mode 100644
index 2d4d609..0000000
--- a/update/org.eclipse.update.tests.core/data/plugins/org.eclipse.update.plugin1_1.1.1/src.jar
+++ /dev/null
Binary files differ
diff --git a/update/org.eclipse.update.tests.core/data/reconciliationSites/site1/install/features/feature3/feature.xml b/update/org.eclipse.update.tests.core/data/reconciliationSites/site1/install/features/feature3/feature.xml
deleted file mode 100644
index 3141af8..0000000
--- a/update/org.eclipse.update.tests.core/data/reconciliationSites/site1/install/features/feature3/feature.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature id="org.eclipse.update.core.tests.feature3" image="feature1.gif" label="Third Feature" provider-name="Smart Company" version="1.0.0" >
-  <description>Description</description>
-  <copyright>copyright</copyright>
-  <license>license</license>
-  <url>
-    <update label="URL to update the feature" url="http://www.eclipse.org/"/>
-    <discovery label="Discovery 1" url="http://www.eclipse.org"/>
-    <discovery label="Discovery 2" url="http://www.eclipse.org"/>
-  </url>
-  <plugin download-size="1500" id="org.eclipse.update.plugin1" install-size="1000" fragment="false" nl="us" os="OS_WIN32" version="1.1.1" ws="WS_WIN32"/>
-</feature>
\ No newline at end of file
diff --git a/update/org.eclipse.update.tests.core/data/reconciliationSites/site1/plugins/org.eclipse.update.plugin1_1.1.1/plugin.xml b/update/org.eclipse.update.tests.core/data/reconciliationSites/site1/plugins/org.eclipse.update.plugin1_1.1.1/plugin.xml
deleted file mode 100644
index e01846c..0000000
--- a/update/org.eclipse.update.tests.core/data/reconciliationSites/site1/plugins/org.eclipse.update.plugin1_1.1.1/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin name="JUnit Test Framework" id="org.eclipse.update.core.tests.feature1.plugin1" version="3.5.6" vendor-name="junit.org">
-  <runtime>
-    <library name="junit.jar">
-      <export name="*"/>
-    </library>
-  </runtime>
-</plugin>
\ No newline at end of file
diff --git a/update/org.eclipse.update.tests.core/data/reconciliationSites/site1/plugins/org.eclipse.update.plugin1_1.1.1/src.jar b/update/org.eclipse.update.tests.core/data/reconciliationSites/site1/plugins/org.eclipse.update.plugin1_1.1.1/src.jar
deleted file mode 100644
index 2d4d609..0000000
--- a/update/org.eclipse.update.tests.core/data/reconciliationSites/site1/plugins/org.eclipse.update.plugin1_1.1.1/src.jar
+++ /dev/null
Binary files differ
diff --git a/update/org.eclipse.update.tests.core/data/reconciliationSites/site2/install/features/feature3/feature.xml b/update/org.eclipse.update.tests.core/data/reconciliationSites/site2/install/features/feature3/feature.xml
deleted file mode 100644
index 68a7de8..0000000
--- a/update/org.eclipse.update.tests.core/data/reconciliationSites/site2/install/features/feature3/feature.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature id="org.eclipse.update.core.tests.feature3" image="feature1.gif" label="Third Feature" provider-name="Smart Company" version="1.0.0" >
-  <description>Description</description>
-  <copyright>copyright</copyright>
-  <license>license</license>
-  <url>
-    <update label="URL to update the feature" url="http://www.eclipse.org/"/>
-    <discovery label="Discovery 1" url="http://www.eclipse.org"/>
-    <discovery label="Discovery 2" url="http://www.eclipse.org"/>
-  </url>
-  <plugin download-size="1500" id="org.eclipse.update.core" install-size="1000" fragment="false" nl="us" os="OS_WIN32" version="2.1.0" ws="WS_WIN32"/>
-</feature>
\ No newline at end of file
diff --git a/update/org.eclipse.update.tests.core/data/reconciliationSites/site2/plugins/org.eclipse.update.core_2.0.0/plugin.xml b/update/org.eclipse.update.tests.core/data/reconciliationSites/site2/plugins/org.eclipse.update.core_2.0.0/plugin.xml
deleted file mode 100644
index e01846c..0000000
--- a/update/org.eclipse.update.tests.core/data/reconciliationSites/site2/plugins/org.eclipse.update.core_2.0.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin name="JUnit Test Framework" id="org.eclipse.update.core.tests.feature1.plugin1" version="3.5.6" vendor-name="junit.org">
-  <runtime>
-    <library name="junit.jar">
-      <export name="*"/>
-    </library>
-  </runtime>
-</plugin>
\ No newline at end of file
diff --git a/update/org.eclipse.update.tests.core/data/reconciliationSites/site2/plugins/org.eclipse.update.core_2.0.0/src.jar b/update/org.eclipse.update.tests.core/data/reconciliationSites/site2/plugins/org.eclipse.update.core_2.0.0/src.jar
deleted file mode 100644
index 2d4d609..0000000
--- a/update/org.eclipse.update.tests.core/data/reconciliationSites/site2/plugins/org.eclipse.update.core_2.0.0/src.jar
+++ /dev/null
Binary files differ
diff --git a/update/org.eclipse.update.tests.core/data/resources.properties b/update/org.eclipse.update.tests.core/data/resources.properties
deleted file mode 100644
index 1a3ab90..0000000
--- a/update/org.eclipse.update.tests.core/data/resources.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################

-# Copyright (c) 2000, 2003 IBM Corporation and others.

-# All rights reserved. This program and the accompanying materials 

-# are made available under the terms of the Common Public License v1.0

-# which accompanies this distribution, and is available at

-# http://www.eclipse.org/legal/cpl-v10.html

-# 

-# Contributors:

-#     IBM Corporation - initial API and implementation

-###############################################################################

-HTTP_PATH_1=/org.eclipse.update.tests.core.updatetests/UpdateManager2/

-HTTP_PATH_2=/org.eclipse.update.tests.core.updatetests/UpdateManager/

-HTTP_PATH_3=/org.eclipse.update.tests.core.updatetests/Site with space/
\ No newline at end of file
diff --git a/update/org.eclipse.update.tests.core/data/site.xml b/update/org.eclipse.update.tests.core/data/site.xml
deleted file mode 100644
index 3fc60c7..0000000
--- a/update/org.eclipse.update.tests.core/data/site.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<site type="org.eclipse.update.core.file">

-<description url="info/siteInfo.html"/>

-  <feature url="testAPI/features/feature3">

-    <category name="eclipse/UML"/>

-  </feature>

-  <feature url="http://www.eclipse.org/feature2">

-    <category name="eclipse/J2EE"/>

-  </feature>

-  <feature url="http://www.eclipse.org/feature1">

-    <category name="eclipse/J2EE"/>

-  </feature>

-  <archive path="plugins/org.eclipse.update.plugin1_1.1.1.jar" url="plugins/org.eclipse.update.plugin1_1.1.1"/>    

-  <category-def label="J2EE tools" name="eclipse/J2EE"/>

-  <category-def label="EJB Tools" name="eclipse/J2EE/EJB"/>

-  <category-def label="UML tools" name="eclipse/UML"/>

-  <category-def label="Messaging Tools" name="B2B"/>

-  <category-def label="Eclipse Tools" name="eclipse"/>

-</site>
\ No newline at end of file
diff --git a/update/org.eclipse.update.tests.core/data/site2/site.xml b/update/org.eclipse.update.tests.core/data/site2/site.xml
deleted file mode 100644
index 39d1c11..0000000
--- a/update/org.eclipse.update.tests.core/data/site2/site.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<site url="Info.html" type="org.eclipse.update.core.file">

-  <feature url="features/feature1"/>

-  <archive path="org.eclipse.update.plugin1" url="plugins/plugin1"/>

-  <archive path="org.eclipse.update.archive2" url="plugins/plugin2"/>

-</site>
\ No newline at end of file
diff --git a/update/org.eclipse.update.tests.core/data/siteTestLocalSite/plugins/feature1_plugin2_5.0.0/plugin.xml b/update/org.eclipse.update.tests.core/data/siteTestLocalSite/plugins/feature1_plugin2_5.0.0/plugin.xml
deleted file mode 100644
index 7f81c46..0000000
--- a/update/org.eclipse.update.tests.core/data/siteTestLocalSite/plugins/feature1_plugin2_5.0.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<plugin name="JUnit Test Framework" id="org.eclipse.update.core.tests.feature1.plugin2" version="5.0.0" vendor-name="junit.org">

-  <runtime>

-    <library name="junit.jar">

-      <export name="*"/>

-    </library>

-  </runtime>

-</plugin>
\ No newline at end of file
diff --git a/update/org.eclipse.update.tests.core/data/siteTestLocalSite/plugins/feature1_plugin2_5.0.0/src.jar b/update/org.eclipse.update.tests.core/data/siteTestLocalSite/plugins/feature1_plugin2_5.0.0/src.jar
deleted file mode 100644
index 2d4d609..0000000
--- a/update/org.eclipse.update.tests.core/data/siteTestLocalSite/plugins/feature1_plugin2_5.0.0/src.jar
+++ /dev/null
Binary files differ
diff --git a/update/org.eclipse.update.tests.core/data/siteTestLocalSite/plugins/feature1_plugin2_5.0.1/plugin.xml b/update/org.eclipse.update.tests.core/data/siteTestLocalSite/plugins/feature1_plugin2_5.0.1/plugin.xml
deleted file mode 100644
index efb3c26..0000000
--- a/update/org.eclipse.update.tests.core/data/siteTestLocalSite/plugins/feature1_plugin2_5.0.1/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<plugin name="JUnit Test Framework" id="org.eclipse.update.core.tests.feature1.plugin2" version="5.0.1" vendor-name="junit.org">

-  <runtime>

-    <library name="junit.jar">

-      <export name="*"/>

-    </library>

-  </runtime>

-</plugin>
\ No newline at end of file
diff --git a/update/org.eclipse.update.tests.core/data/siteTestLocalSite/plugins/feature1_plugin2_5.0.1/src.jar b/update/org.eclipse.update.tests.core/data/siteTestLocalSite/plugins/feature1_plugin2_5.0.1/src.jar
deleted file mode 100644
index 2d4d609..0000000
--- a/update/org.eclipse.update.tests.core/data/siteTestLocalSite/plugins/feature1_plugin2_5.0.1/src.jar
+++ /dev/null
Binary files differ
diff --git a/update/org.eclipse.update.tests.core/data/testAPI/features/feature3/feature.xml b/update/org.eclipse.update.tests.core/data/testAPI/features/feature3/feature.xml
deleted file mode 100644
index f878d60..0000000
--- a/update/org.eclipse.update.tests.core/data/testAPI/features/feature3/feature.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature id="org.eclipse.update.core.tests.feature3" image="feature1.gif" label="Third Feature" provider-name="Smart Company" version="1.0.0" >
-  <description>Description</description>
-  <copyright>copyright</copyright>
-  <license>license</license>
-  <url>
-    <update label="URL to update the feature" url="http://www.eclipse.org/"/>
-    <discovery label="Discovery 1" url="http://www.eclipse.org"/>
-    <discovery label="Discovery 2" url="http://www.eclipse.org"/>
-  </url>
-  <plugin download-size="1500" id="org.eclipse.update.plugin1" install-size="1000" fragment="false" nl="us" os="WIN32,LINUX" version="1.1.1"/>
-</feature>
\ No newline at end of file
diff --git a/update/org.eclipse.update.tests.core/data/testAPI/plugins/org.eclipse.update.plugin1_1.1.1/plugin.xml b/update/org.eclipse.update.tests.core/data/testAPI/plugins/org.eclipse.update.plugin1_1.1.1/plugin.xml
deleted file mode 100644
index e01846c..0000000
--- a/update/org.eclipse.update.tests.core/data/testAPI/plugins/org.eclipse.update.plugin1_1.1.1/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin name="JUnit Test Framework" id="org.eclipse.update.core.tests.feature1.plugin1" version="3.5.6" vendor-name="junit.org">
-  <runtime>
-    <library name="junit.jar">
-      <export name="*"/>
-    </library>
-  </runtime>
-</plugin>
\ No newline at end of file
diff --git a/update/org.eclipse.update.tests.core/data/testAPI/plugins/org.eclipse.update.plugin1_1.1.1/src.jar b/update/org.eclipse.update.tests.core/data/testAPI/plugins/org.eclipse.update.plugin1_1.1.1/src.jar
deleted file mode 100644
index 2d4d609..0000000
--- a/update/org.eclipse.update.tests.core/data/testAPI/plugins/org.eclipse.update.plugin1_1.1.1/src.jar
+++ /dev/null
Binary files differ
diff --git a/update/org.eclipse.update.tests.core/data/testAPI/site.xml b/update/org.eclipse.update.tests.core/data/testAPI/site.xml
deleted file mode 100644
index 4c15d43..0000000
--- a/update/org.eclipse.update.tests.core/data/testAPI/site.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<site type="org.eclipse.update.core.file">
-<description url="info/siteInfo.html"/>
-  <feature url="features/feature3">
-    <category name="eclipse/UML"/>
-  </feature>
-  <feature url="http://www.eclipse.org/feature2">
-    <category name="eclipse/J2EE"/>
-  </feature>
-  <feature url="http://www.eclipse.org/feature1">
-    <category name="eclipse/J2EE"/>
-  </feature>
-  <archive path="plugins/org.eclipse.update.plugin1_1.1.1.jar" url="plugins/org.eclipse.update.plugin1_1.1.1"/>    
-  <category-def label="J2EE tools" name="eclipse/J2EE"/>
-  <category-def label="EJB Tools" name="eclipse/J2EE/EJB"/>
-  <category-def label="UML tools" name="eclipse/UML"/>
-  <category-def label="Messaging Tools" name="B2B"/>
-  <category-def label="Eclipse Tools" name="eclipse"/>
-</site>
\ No newline at end of file
diff --git a/update/org.eclipse.update.tests.core/data/validation/site2/.eclipseproduct b/update/org.eclipse.update.tests.core/data/validation/site2/.eclipseproduct
deleted file mode 100644
index 8b829aa..0000000
--- a/update/org.eclipse.update.tests.core/data/validation/site2/.eclipseproduct
+++ /dev/null
@@ -1,3 +0,0 @@
-id=another.product.id

-name=Name of the product

-ver=1.2.4
\ No newline at end of file
diff --git a/update/org.eclipse.update.tests.core/data/validation/site3/.eclipseextension b/update/org.eclipse.update.tests.core/data/validation/site3/.eclipseextension
deleted file mode 100644
index 6d72df7..0000000
--- a/update/org.eclipse.update.tests.core/data/validation/site3/.eclipseextension
+++ /dev/null
@@ -1 +0,0 @@
-id=id.of.extended.product
\ No newline at end of file
diff --git a/update/org.eclipse.update.tests.core/data/validation/site4/.eclipseUM b/update/org.eclipse.update.tests.core/data/validation/site4/.eclipseUM
deleted file mode 100644
index acc84e9..0000000
--- a/update/org.eclipse.update.tests.core/data/validation/site4/.eclipseUM
+++ /dev/null
@@ -1 +0,0 @@
-id=different.product.id
\ No newline at end of file
diff --git a/update/org.eclipse.update.tests.core/data/validation/site5/.eclipseUM b/update/org.eclipse.update.tests.core/data/validation/site5/.eclipseUM
deleted file mode 100644
index 196c522..0000000
--- a/update/org.eclipse.update.tests.core/data/validation/site5/.eclipseUM
+++ /dev/null
@@ -1,3 +0,0 @@
-id=org.eclipse.platform

-name=a Product 

-version=3.5.6
\ No newline at end of file
diff --git a/update/org.eclipse.update.tests.core/data/validation/site6/.eclipseUM b/update/org.eclipse.update.tests.core/data/validation/site6/.eclipseUM
deleted file mode 100644
index 597f9f8..0000000
--- a/update/org.eclipse.update.tests.core/data/validation/site6/.eclipseUM
+++ /dev/null
@@ -1 +0,0 @@
-id=org.eclipse.sdk
\ No newline at end of file
diff --git a/update/org.eclipse.update.tests.core/data/xmls/apitests/org.eclipse.test.feature_1.0.0/feature.xml b/update/org.eclipse.update.tests.core/data/xmls/apitests/org.eclipse.test.feature_1.0.0/feature.xml
deleted file mode 100644
index 1511800..0000000
--- a/update/org.eclipse.update.tests.core/data/xmls/apitests/org.eclipse.test.feature_1.0.0/feature.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<feature id="org.test1.ident1" label="Feature One" nl="en_us,fr,de" os="OS_WIN32,OS_LINUX" provider-name="Object Technology International" version="1.0.0" ws="WS_WIN32,WS_MOTIF,WS_GTK">

-  <description>Test feature for testIdentifier test</description>

-  <copyright>Copyright (c) the company</copyright>

-  <license>Do you accept the license ?</license>

-  <url>

-    <update label="URL to update teh feature" url="http://www.eclipse.org"/>

-    <discovery label="Discovery 1" url="http://www.eclipse.org"/>

-    <discovery label="Discovery 2" url="http://www.eclipse.org"/>

-  </url>

-  <plugin download-size="1500" id="org.eclipse.update.core.tests.feature1.plugin1" install-size="1000" fragment="false" nl="us" os="OS_WIN32" version="3.5.6" ws="WS_WIN32"/>

-  <plugin download-size="1200" id="org.eclipse.update.core.tests.feature1.plugin2" install-size="978" fragment="false" version="5.0.0"/>

-</feature>
\ No newline at end of file
diff --git a/update/org.eclipse.update.tests.core/data/xmls/apitests/org.eclipse_test_feature/feature.xml b/update/org.eclipse.update.tests.core/data/xmls/apitests/org.eclipse_test_feature/feature.xml
deleted file mode 100644
index 9f05cda..0000000
--- a/update/org.eclipse.update.tests.core/data/xmls/apitests/org.eclipse_test_feature/feature.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<feature id="org.test1.ident2" label="Feature One" nl="en_us,fr,de" os="OS_WIN32,OS_LINUX" provider-name="Object Technology International" version="1.0.0" ws="WS_WIN32,WS_MOTIF,WS_GTK">

-  <description>Test feature for testIdentifier test</description>

-  <copyright>Copyright (c) the company</copyright>

-  <license>Do you accept the license ?</license>

-  <url>

-    <update label="URL to update teh feature" url="http://www.eclipse.org"/>

-    <discovery label="Discovery 1" url="http://www.eclipse.org"/>

-    <discovery label="Discovery 2" url="http://www.eclipse.org"/>

-  </url>

-  <plugin download-size="1500" url="org.eclipse.update.core.tests.feature1.plugin1" id="org.eclipse.update.core.tests.feature1.plugin1" install-size="1000" fragment="false" nl="us" os="OS_WIN32" version="3.5.6" ws="WS_WIN32"/>

-  <plugin download-size="1200" id="org.eclipse.update.core.tests.feature1.plugin2" install-size="978" fragment="false" version="5.0.0"/>

-</feature>
\ No newline at end of file
diff --git a/update/org.eclipse.update.tests.core/data/xmls/feature_1.0.0/feature.xml b/update/org.eclipse.update.tests.core/data/xmls/feature_1.0.0/feature.xml
deleted file mode 100644
index c4ee139..0000000
--- a/update/org.eclipse.update.tests.core/data/xmls/feature_1.0.0/feature.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<feature id="org.eclipse.update.core.tests.feature1" image="feature1.gif" label="Feature One" nl="en,fr,de" os="OS_WIN32,OS_LINUX" provider-name="Object Technology International" version="1.0.4" ws="WS_WIN32,WS_MOTIF,WS_GTK">

-  <description>I believe this is the description of feature 1, well, feature 1 is an exceptional feature that you should install right NOW on your machine... try it.</description>

-  <copyright>Ok, now, this is a very very complex Copyright  not prepared by a lawyer Copyright (c) the company</copyright>

-  <license>#1 Do you accept it #2 you do nto accept it ...Do you accpt it ?</license>

-  <url>

-    <update label="URL to update the feature" url="http://www.eclipse.org/path/feature1/"/>

-    <discovery label="Discovery 1" url="http://www.eclipse.org"/>

-    <discovery label="Discovery 2" url="http://www.eclipse.org"/>

-  </url>

-  <plugin download-size="1500" id="org.eclipse.update.core.tests.feature1.plugin1" install-size="1000" fragment="false" nl="us" os="OS_WIN32" version="3.5.6" ws="WS_WIN32"/>

-  <plugin download-size="1200" id="org.eclipse.update.core.tests.feature1.plugin2" install-size="978" fragment="false" version="5.0.0"/>

-</feature>
\ No newline at end of file
diff --git a/update/org.eclipse.update.tests.core/data/xmls/feature_1.0.0/feature1.gif b/update/org.eclipse.update.tests.core/data/xmls/feature_1.0.0/feature1.gif
deleted file mode 100644
index 03e30a2..0000000
--- a/update/org.eclipse.update.tests.core/data/xmls/feature_1.0.0/feature1.gif
+++ /dev/null
Binary files differ
diff --git a/update/org.eclipse.update.tests.core/data/xmls/site1/site.xml b/update/org.eclipse.update.tests.core/data/xmls/site1/site.xml
deleted file mode 100644
index 44823c0..0000000
--- a/update/org.eclipse.update.tests.core/data/xmls/site1/site.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<site url="info" type="org.eclipse.update.core.file">

-  <feature id="org.isv.feature3" url="www.eclipse.org/feature3" version="3.4.5">

-    <category name="eclipse/UML"/>

-  </feature>

-  <feature id="org.eclipse.update.core.tests.feature2" url="www.eclipse.org/feature2" version="3.4.6">

-    <category name="eclipse/J2EE"/>

-  </feature>

-  <feature id="org.eclipse.update.core.tests.fature1" url="www.eclipse.org/feature1" version="2.3.5">

-    <category name="eclipse/J2EE"/>

-  </feature>

-  <archive path="org.eclipse.update.plugin1" url="www.eclipse.org/pluign1"/>

-  <archive path="org.eclipse.update.archive2" url="www.eclipse.org/plugin2"/>

-  <archive path="org.eclipse.update.plugin3" url="www.eclipse.org/plugin3"/>

-  <archive path="org.eclipse.unknown.plugin" url="www.eclipse.org/plugins/plugin4"/>

-  <archive path="org.eclipse.update.core.tests.feature1.foo1" url="www.eclipse.org/plugin1"/>

-  <category-def label="J2EE tools" name="eclipse/J2EE"/>

-  <category-def label="EJB Tools" name="eclipse/J2EE/EJB"/>

-  <category-def label="UML tools" name="eclipse/UML"/>

-  <category-def label="Messaging Tools" name="B2B"/>

-  <category-def label="Eclipse tools" name="eclipse"/>

-</site>
\ No newline at end of file
diff --git a/update/org.eclipse.update.tests.core/plugin.properties b/update/org.eclipse.update.tests.core/plugin.properties
deleted file mode 100644
index 1caa664..0000000
--- a/update/org.eclipse.update.tests.core/plugin.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################

-# Copyright (c) 2000, 2003 IBM Corporation and others.

-# All rights reserved. This program and the accompanying materials 

-# are made available under the terms of the Common Public License v1.0

-# which accompanies this distribution, and is available at

-# http://www.eclipse.org/legal/cpl-v10.html

-# 

-# Contributors:

-#     IBM Corporation - initial API and implementation

-###############################################################################

-

-name = Install/Update Core Tests

-provider-name = Eclipse.org
\ No newline at end of file
diff --git a/update/org.eclipse.update.tests.core/plugin.xml b/update/org.eclipse.update.tests.core/plugin.xml
deleted file mode 100644
index 30bd540..0000000
--- a/update/org.eclipse.update.tests.core/plugin.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<plugin

-   id="org.eclipse.update.tests.core"

-   name="%name"

-   version="2.1.0"

-   provider-name="%provider-name"

-   class="org.eclipse.update.tests.UpdateTestsPlugin">

-

-   <runtime>

-      <library name="updatetests.jar">

-         <export name="*"/>

-      </library>

-   </runtime>

-   <requires>

-      <import plugin="org.eclipse.core.runtime"/>

-      <import plugin="org.junit"/>

-      <import plugin="org.apache.xerces"/>

-      <import plugin="org.eclipse.core.resources"/>

-      <import plugin="org.eclipse.update.core"/>

-      <import plugin="org.eclipse.tomcat"/>

-      <import plugin="org.eclipse.help.appserver"/>

-   </requires>

-

-

-   <extension

-         id="feature1"

-         point="org.eclipse.update.core.featureTypes">

-      <feature-factory

-            class="org.eclipse.update.internal.core.FeatureExecutableFactory">

-      </feature-factory>

-   </extension>

-   <extension

-         id="ftp"

-         point="org.eclipse.update.core.siteTypes">

-      <site-factory

-            class="org.eclipse.update.tests.implementation.SiteFTPFactory">

-      </site-factory>

-   </extension>

-

-</plugin>

diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/AllTests.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/AllTests.java
deleted file mode 100644
index cc441bd..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/AllTests.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2000, 2003 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials 

- * are made available under the terms of the Common Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/cpl-v10.html

- * 

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-package org.eclipse.update.tests;

-

-import junit.framework.Test;

-import junit.framework.TestSuite;

-import org.eclipse.update.tests.api.AllAPITests;

-import org.eclipse.update.tests.configurations.AllConfigurationsTests;

-import org.eclipse.update.tests.core.boot.AllPlatformConfigurationTests;

-import org.eclipse.update.tests.model.AllModelTests;

-import org.eclipse.update.tests.nestedfeatures.AllNestedTests;

-import org.eclipse.update.tests.parser.AllParserTests;

-import org.eclipse.update.tests.reconciliation.AllReconciliationTests;

-import org.eclipse.update.tests.regularInstall.AllRegularInstallTests;

-import org.eclipse.update.tests.regularRemove.AllRegularRemoveTests;

-import org.eclipse.update.tests.sitevalidation.AllSiteValidationTests;

-import org.eclipse.update.tests.types.AllTypesTests;

-import org.eclipse.update.tests.uivalues.AllCoreUITests;

-

-public class AllTests extends TestSuite {

-	public AllTests(String name) {

-		super(name);

-	}

-	public static Test suite() throws Exception {

-		TestSuite suite = new TestSuite();

-		suite.setName("All Update Manager Tests");

-		suite.addTest(AllSiteValidationTests.suite());

-		suite.addTest(AllPlatformConfigurationTests.suite());

-		suite.addTest(AllRegularInstallTests.suite());

-		suite.addTest(AllAPITests.suite());

-		suite.addTest(AllParserTests.suite());

-		suite.addTest(AllCoreUITests.suite());

-		suite.addTest(AllConfigurationsTests.suite());

-		suite.addTest(AllTypesTests.suite());

-		suite.addTest(AllRegularRemoveTests.suite());

-		suite.addTest(AllNestedTests.suite());	

-		suite.addTest(AllReconciliationTests.suite());					

-		suite.addTest(AllModelTests.suite());		

-		return suite;

-	}

-}

diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/UpdateManagerTestCase.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/UpdateManagerTestCase.java
deleted file mode 100644
index 6462a1b..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/UpdateManagerTestCase.java
+++ /dev/null
@@ -1,159 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2000, 2003 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials 

- * are made available under the terms of the Common Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/cpl-v10.html

- * 

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-package org.eclipse.update.tests;

-

-

-import java.io.File;

-import java.io.IOException;

-import java.net.*;

-import java.util.*;

-

-import junit.framework.TestCase;

-import org.eclipse.core.runtime.*;

-import org.eclipse.core.runtime.IPluginDescriptor;

-import org.eclipse.core.runtime.Platform;

-import org.eclipse.update.configuration.IConfiguredSite;

-import org.eclipse.update.core.*;

-import org.eclipse.update.core.IFeature;

-import org.eclipse.update.core.IPluginEntry;

-import org.eclipse.update.internal.core.*;

-import org.eclipse.update.internal.core.UpdateManagerUtils;

-/**

- * All Help System Test cases must subclass this base Testcase.

- * See SampleTestCase.java for a template.

- */

-

-public abstract class UpdateManagerTestCase extends TestCase {

-

-	protected static ResourceBundle bundle;

-	protected static String dataPath;

-

-	protected static URL SOURCE_FILE_SITE;

-	protected static URL SOURCE_FILE_SITE_INSTALLED;

-	protected static URL SOURCE_HTTP_SITE;

-	protected static URL TARGET_FILE_SITE;

-

-	private static final String DATA_PATH = "data/";

-

-	/**

-	 * Default Constructor

-	 */

-	public UpdateManagerTestCase(String name) {

-		super(name);

-		try {

-			init();

-		} catch (Exception e) {

-			fail(e.toString());

-			e.printStackTrace();

-		}

-	}

-

-	protected static void init() throws MissingResourceException, IOException, MalformedURLException {

-

-		IPluginDescriptor dataDesc = Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.update.tests.core");

-		URL resolvedURL = Platform.resolve(dataDesc.getInstallURL());

-		URL dataURL = new URL(resolvedURL, DATA_PATH);

-		dataPath = dataURL.getFile();

-		String homePath = (System.getProperty("user.home")).replace(File.separatorChar, '/');

-

-		if (bundle == null) {

-			ClassLoader l = new URLClassLoader(new URL[] { dataURL }, null);

-			bundle = ResourceBundle.getBundle("resources", Locale.getDefault(), l);

-		}

-

-		try {

-			SOURCE_FILE_SITE = new File(dataPath).toURL();

-			SOURCE_FILE_SITE_INSTALLED = new File(dataPath + "testAPI/").toURL();

-			SOURCE_HTTP_SITE = new URL("http", getHttpHost(), getHttpPort(), bundle.getString("HTTP_PATH_1"));

-			TARGET_FILE_SITE = new URL("file", null, homePath + "/target/");

-		} catch (Exception e) {

-			fail(e.toString());

-			e.printStackTrace();

-		}

-

-		//cleanup target 

-		File target = new File(homePath + "/target/");

-		UpdateManagerUtils.removeFromFileSystem(target);

-

-		// setup cache site to false

-		InternalSiteManager.globalUseCache = false;

-	}

-

-	/**

-	 * Simple implementation of setUp. Subclasses are prevented 

-	 * from overriding this method to maintain logging consistency.

-	 * umSetUp() should be overriden instead.

-	 */

-	protected final void setUp() throws Exception {

-		System.out.println("----- " + this.getName());

-		System.out.println(this.getName() + ": setUp...");

-		umSetUp();

-	}

-

-	/**

-	 * Sets up the fixture, for example, open a network connection.

-	 * This method is called before a test is executed.

-	 */

-	protected void umSetUp() throws Exception {

-		// do nothing.

-	}

-

-	/**

-	 * Simple implementation of tearDown.  Subclasses are prevented 

-	 * from overriding this method to maintain logging consistency.

-	 * umTearDown() should be overriden instead.

-	 */

-	protected final void tearDown() throws Exception {

-		System.out.println(this.getName() + ": tearDown...\n");

-		umTearDown();

-	}

-

-	/**

-	 * Tears down the fixture, for example, close a network connection.

-	 * This method is called after a test is executed.

-	 */

-	protected void umTearDown() throws Exception {

-		// do nothing.

-	}

-

-	protected static String getHttpHost() {

-		return UpdateTestsPlugin.getWebAppServerHost();

-	}

-

-	protected static int getHttpPort() {

-		return UpdateTestsPlugin.getWebAppServerPort();

-	}

-

-	protected void remove(IFeature feature, IConfiguredSite configSite) throws CoreException {

-		ISite site = configSite.getSite();

-		remove(feature, site);

-	}

-

-	protected void remove(IFeature feature, ISite site) throws CoreException {

-		site.getFeatureReference(feature);

-		// remove the plugins and features dir

-		String sitePath = site.getURL().getFile();

-		File file = null;

-

-		String featureName = feature.getVersionedIdentifier().getIdentifier().toString() + "_" + feature.getVersionedIdentifier().getVersion().toString();

-		file = new File(sitePath, "features" + File.separator + featureName);

-		System.out.println("****************************************Removing :" + file);

-		UpdateManagerUtils.removeFromFileSystem(file);

-

-		IPluginEntry[] entries = feature.getPluginEntries();

-		for (int i = 0; i < entries.length; i++) {

-			String name = entries[i].getVersionedIdentifier().getIdentifier().toString() + "_" + entries[i].getVersionedIdentifier().getVersion().toString() + File.separator;

-			file = new File(sitePath, "plugins" + File.separator + name);

-			System.out.println("****************************************Removing :" + file);

-			UpdateManagerUtils.removeFromFileSystem(file);

-		}

-	}

-}

diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/UpdateTestsPlugin.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/UpdateTestsPlugin.java
deleted file mode 100644
index 5beceeb..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/UpdateTestsPlugin.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2000, 2003 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials 

- * are made available under the terms of the Common Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/cpl-v10.html

- * 

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-package org.eclipse.update.tests;

-import org.eclipse.core.runtime.*;

-import org.eclipse.help.internal.appserver.WebappManager;

-import org.eclipse.update.internal.core.UpdateCore;

-

-/**

- * manages the startuo and shutown of the 

- * web server

- */

-public class UpdateTestsPlugin extends Plugin {

-

-	private static String appServerHost = null;

-	private static int appServerPort = 0;

-	private static UpdateTestsPlugin plugin;

-	private static boolean initialized=false;

-

-	public UpdateTestsPlugin(IPluginDescriptor descriptor) {

-		super(descriptor);

-		plugin = this;

-	}

-

-	public static UpdateTestsPlugin getPlugin() {

-		return plugin;

-	}

-

-	/**

-	 * Called by Platform after loading the plugin

-	 */

-	public void startup() throws CoreException {

-

-	}

-

-	/**

-	 * Shuts down this plug-in and discards all plug-in state.

-	 * @exception CoreException if this method fails to shut down

-	 *   this plug-in 

-	 */

-	public void shutdown() throws CoreException {

-		WebappManager.stop("org.eclipse.update.tests.core.updatetests");

-		super.shutdown();

-	}

-

-	/**

-	 * Returns the host identifier for the web app server

-	 */

-	public static String getWebAppServerHost() {

-		if (!initialized) initialize();

-		return appServerHost;

-	}

-

-	/**

-	 * Returns the port identifier for the web app server

-	 */

-	public static int getWebAppServerPort() {

-		if (!initialized) initialize();		

-		return appServerPort;

-	}

-	/**

-	 * Method initialize.

-	 */

-	private static void initialize() {

-		String text = null;

-		try {

-			WebappManager.start("org.eclipse.update.tests.core.updatetests", "org.eclipse.update.tests.core", new Path("webserver"));

-			appServerHost = WebappManager.getHost();

-			appServerPort = WebappManager.getPort();

-

-			text = "The webServer did start ip:" + appServerHost + ":" + appServerPort;

-		} catch (CoreException e) {

-			text = "The webServer didn't start ";

-			IStatus status = new Status(IStatus.ERROR, "org.eclipse.update.tests.core", IStatus.OK, "WebServer not started. Update Tests results are invalid", null);

-			UpdateCore.warn("",new CoreException(status));

-		}finally {

-			System.out.println(text);

-			initialized = true;

-		}

-	}

-

-}

diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/AllAPITests.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/AllAPITests.java
deleted file mode 100644
index ab96b39..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/AllAPITests.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2000, 2003 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials 

- * are made available under the terms of the Common Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/cpl-v10.html

- * 

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-package org.eclipse.update.tests.api;

-import junit.framework.Test;

-import junit.framework.TestSuite;

-

-import org.eclipse.update.tests.UpdateManagerTestCase;

-

-/**

- * Manages the API tests

- */

-public class AllAPITests extends UpdateManagerTestCase {

-	/**

-	 * Constructor

-	 */

-	public AllAPITests(String name) {

-		super(name);

-	}

-	

-	/**

-	 * List of API tests

-	 */

-	public static Test suite() throws Exception {

-		TestSuite suite = new TestSuite();

-		suite.setName("API Tests");

-

-		suite.addTest(new TestSuite(TestSiteAPI.class));

-		suite.addTest(new TestSuite(TestLocalSiteAPI.class));		

-		suite.addTest(new TestSuite(TestUpdateManagerUtilsAPI.class));		

-		suite.addTest(new TestSuite(TestDefaultExecutableFeatureAPI.class));

-		suite.addTest(new TestSuite(TestDefaultPackageFeatureAPI.class));

-		suite.addTest(new TestSuite(TestPluginContainerAPI.class));

-		suite.addTest(new TestSuite(TestSiteManagerAPI.class));		

-		suite.addTest(new TestSuite(TestNestedFeatureAPI.class));

-		suite.addTest(new TestSuite(TestFeatureContentProvider_FileFilterAPI.class));

-		return suite;

-	}

-}

diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/DefaultFeature.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/DefaultFeature.java
deleted file mode 100644
index 3456bb3..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/DefaultFeature.java
+++ /dev/null
@@ -1,173 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2000, 2003 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials 

- * are made available under the terms of the Common Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/cpl-v10.html

- * 

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-package org.eclipse.update.tests.api;

-

-import java.net.URL;

-

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.update.core.*;

-import org.eclipse.update.core.model.*;

-import org.eclipse.update.internal.core.FeatureExecutableContentProvider;

-/**

- * Abstract Class that implements most of the behavior of a feature

- * A feature ALWAYS belongs to an ISite

- */

-public class DefaultFeature extends Feature {

-

-

-	/**

-	 * Copy constructor

-	 */

-	public DefaultFeature(IFeature sourceFeature, ISite targetSite) throws CoreException {

-		this(targetSite);

-		this.setFeatureContentProvider(sourceFeature.getFeatureContentProvider());

-		this.setIdentifier(sourceFeature.getVersionedIdentifier());

-		this.setLabel(sourceFeature.getLabel());

-		this.setUpdateSiteEntry(sourceFeature.getUpdateSiteEntry());

-		this.setDiscoverySiteEntries(sourceFeature.getDiscoverySiteEntries());

-		this.setProvider(sourceFeature.getProvider());

-		this.setDescription(sourceFeature.getDescription());

-		this.setCopyright(sourceFeature.getCopyright());

-		this.setLicense(sourceFeature.getLicense());

-		this.setPluginEntries(sourceFeature.getPluginEntries());

-		this.setImage(sourceFeature.getImage());

-	}

-	

-	/**

-	 * Constructor

-	 */

-	public DefaultFeature(ISite targetSite) throws CoreException {

-		super();

-		this.setSite(targetSite);		

-	}	

-	

-	

-	/**

-	 * Sets the identifier

-	 * @param identifier The identifier to set

-	 */

-	public void setIdentifier(VersionedIdentifier identifier) {

-		setFeatureIdentifier(identifier.getIdentifier());

-		setFeatureVersion(identifier.getVersion().toString());

-	}

-

-	/**

-	 * Sets the discoverySiteEntries

-	 * @param discoveryInfos The discoveryInfos to set

-	 */

-	public void setDiscoverySiteEntries(IURLEntry[] discoveryInfos) {

-		setDiscoverySiteEntryModels((URLEntryModel[]) discoveryInfos);

-	}

-

-	/**

-	 * Sets the updateSiteEntry

-	 * @param updateInfo The updateInfo to set

-	 */

-	public void setUpdateSiteEntry(IURLEntry updateInfo) {

-		setUpdateSiteEntryModel((URLEntryModel) updateInfo);

-	}

-

-	/**

-	 * Adds a discoveryInfo

-	 * @param discoveryInfo The discoveryInfo to add

-	 */

-	public void addDiscoverySiteEntry(IURLEntry discoveryInfo) {

-		addDiscoverySiteEntryModel((URLEntryModel) discoveryInfo);

-	}

-

-	/**

-	 * Sets the description

-	 * @param description The description to set

-	 */

-	public void setDescription(IURLEntry description) {

-		setDescriptionModel((URLEntryModel) description);

-	}

-

-	/**

-	 * Sets the copyright

-	 * @param copyright The copyright to set

-	 */

-	public void setCopyright(IURLEntry copyright) {

-		setCopyrightModel((URLEntryModel) copyright);

-	}

-

-	/**

-	 * Sets the license

-	 * @param license The license to set

-	 */

-	public void setLicense(IURLEntry license) {

-		setLicenseModel((URLEntryModel) license);

-	}

-

-	/**

-	 * Sets the image

-	 * @param image The image to set

-	 */

-	public void setImage(URL image) {

-		if (image==null) return;

-		setImageURLString(image.toExternalForm());

-	}

-

-	/**

-	 * Adds an import

-	 * @param anImport The import to add

-	 */

-	public void addImport(IImport anImport) {

-		if (anImport != null) {

-			addImportModel((ImportModel) anImport);

-		}

-	}

-

-

-	/**

-	 * Sets the pluginEntries

-	 * @param pluginEntries The pluginEntries to set

-	 */

-	public void setPluginEntries(IPluginEntry[] pluginEntries) {

-		if (pluginEntries != null) {

-			for (int i = 0; i < pluginEntries.length; i++) {

-				addPluginEntry(pluginEntries[i]);

-			}

-		}

-	}

-

-

-	/**

-	 * sets teh URL isf not already present

-	 */

-	public void setURL(URL url) throws CoreException{

-		//if (getFeatureContentProvider()==null){

-			FeatureContentProvider contentProvider = new FeatureExecutableContentProvider(url);

-			this.setFeatureContentProvider(contentProvider);

-			contentProvider.setFeature(this);

-		//}

-	}

-	

-	

-	/*

-	 * @see IPluginContainer#addPluginEntry(IPluginEntry)

-	 */

-	public void addPluginEntry(IPluginEntry pluginEntry) {

-		if (pluginEntry != null) {

-			addPluginEntryModel((PluginEntryModel) pluginEntry);

-		}

-	}

-

-	/*

-	 * @see IFeature#addNonPluginEntry(INonPluginEntry)

-	 */

-	public void addNonPluginEntry(INonPluginEntry dataEntry) {

-		if (dataEntry != null) {

-			addNonPluginEntryModel((NonPluginEntryModel) dataEntry);

-		}

-	}	

-

-	}
\ No newline at end of file
diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/MyURLEntry.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/MyURLEntry.java
deleted file mode 100644
index 5944db4..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/MyURLEntry.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2000, 2003 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials 

- * are made available under the terms of the Common Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/cpl-v10.html

- * 

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-package org.eclipse.update.tests.api;

-import java.net.MalformedURLException;

-import java.net.URL;

-

-import org.eclipse.update.core.URLEntry;

-

-/**

- * Wrapper around URLEntry

- */

-public class MyURLEntry extends URLEntry {

-	

-	public MyURLEntry(String annotation, URL url) throws MalformedURLException {

-		super();

-		setAnnotation(annotation);

-		if (url!=null) {

-			setURLString(url.toExternalForm());

-			resolve(null,null);

-		}

-	}

-

-}

diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/TestDefaultExecutableFeatureAPI.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/TestDefaultExecutableFeatureAPI.java
deleted file mode 100644
index 6c8b84f..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/TestDefaultExecutableFeatureAPI.java
+++ /dev/null
@@ -1,207 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2000, 2003 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials 

- * are made available under the terms of the Common Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/cpl-v10.html

- * 

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-package org.eclipse.update.tests.api;

-import java.net.MalformedURLException;

-import java.net.URL;

-

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.update.core.*;

-import org.eclipse.update.internal.core.UpdateManagerUtils;

-import org.eclipse.update.tests.UpdateManagerTestCase;

-

-

-

-public class TestDefaultExecutableFeatureAPI extends UpdateManagerTestCase {

-	

-	private DefaultFeature remoteFeature=null;

-	

-	/**

-	 * Test the testFeatures()

-	 */

-	public TestDefaultExecutableFeatureAPI(String arg0) {

-		super(arg0);

-	}

-	

-	/**

-	 * the feature to test

-	 */

-	private DefaultFeature getFeature() throws MalformedURLException, CoreException {

-		if (remoteFeature == null){

-

-		ISite site = SiteManager.getSite(SOURCE_FILE_SITE);

-		URL url = UpdateManagerUtils.getURL(site.getURL(),"testAPI/"+Site.DEFAULT_INSTALLED_FEATURE_PATH+"feature3/",null);

-		SiteFeatureReference ref = new SiteFeatureReference();

-		ref.setSite(site);

-		ref.setURL(url);

-		IFeature feature = ref.getFeature();

-		remoteFeature = new DefaultFeature(feature,site);

-

-		}

-		return remoteFeature;

-	}

-	

-	/**

-	 * @see IFeature#testIdentifier()

-	 */

-	public void testIdentifier() throws CoreException, MalformedURLException {

-		String id1 = "xmls/apitests/org.eclipse.test.feature_1.0.0/";

-		String id2 = "xmls/apitests/org.eclipse_test_feature";

-		VersionedIdentifier ident1 = new VersionedIdentifier("org.test1.ident1","1.0.0");

-		VersionedIdentifier ident2 = new VersionedIdentifier("org.test1.ident2","1.0.0");		

-		

-

-			ISite site = SiteManager.getSite(SOURCE_FILE_SITE);

-			

-			URL url1 = UpdateManagerUtils.getURL(site.getURL(),id1,null);			

-			remoteFeature = new DefaultFeature(site);

-			remoteFeature.setURL(url1);

-			remoteFeature.setIdentifier(ident1);

-			assertEquals(ident1.toString(),remoteFeature.getVersionedIdentifier().toString());

-	 	

-			 URL url2 = UpdateManagerUtils.getURL(site.getURL(),id2,null);		

-			remoteFeature = new DefaultFeature(site);

-			remoteFeature.setURL(url2);

-			remoteFeature.setIdentifier(ident2);

-			assertEquals(ident2.toString(),remoteFeature.getVersionedIdentifier().toString());

-		

-

-	}

-

-

-	/**

-	 * @see IFeature#testSite()

-	 */

-	public void testSite() throws MalformedURLException, CoreException{

-		String ident1 = Site.DEFAULT_INSTALLED_FEATURE_PATH+"feature3/";		

-

-			ISite site = SiteManager.getSite(SOURCE_FILE_SITE);

-			

-			URL id = UpdateManagerUtils.getURL(site.getURL(),ident1,null);			

-			remoteFeature = new DefaultFeature(site);

-			remoteFeature.setURL(id);

-			assertEquals(site,remoteFeature.getSite());

-

-	}

-

-

-	/**

-	 * @see IFeature#testLabel()

-	 */

-	public void testLabel() throws CoreException,MalformedURLException {

-		String label = "dummy label";

-		Feature feature = getFeature();

-		feature.setLabel(label);

-		assertEquals(label,feature.getLabel());

-	}

-

-

-	/**

-	 * @see IFeature#testUpdateURL()

-	 */

-	public void testUpdateURL() throws CoreException,MalformedURLException {

-		URL url = null;

-		String label = "OTI Site";

-		try {

-			url = new URL("http://www.oti.com/");

-			

-		} catch (java.net.MalformedURLException e){} // impossible eh !

-		DefaultFeature feature = getFeature();

-		feature.setUpdateSiteEntry(new MyURLEntry(label, url));

-		assertEquals(url,feature.getUpdateSiteEntry().getURL());

-		assertEquals(label,feature.getUpdateSiteEntry().getAnnotation());

-

-	} 

-

-

-	

-	/**

-	 * @see IFeature#testDiscoveryURLs()

-	 */

-	public void testDiscoveryURLs() throws CoreException,MalformedURLException {

-		IURLEntry[] urlInfo = new MyURLEntry[2];

-		URL[] url = new URL[2];

-		String[] label = new String[2];

-		try {

-			url[0] = new URL("http://www.oti.com/");

-			url[1] = new URL("http://eclipse.org/");

-			label[0] = "OTI Site";

-			label[1] = "Eclipse Site";

-		} catch (java.net.MalformedURLException e){} // impossible eh !

-		DefaultFeature feature = getFeature();

-		for (int i=0;i<2;i++){

-				urlInfo[i] = new MyURLEntry(label[i],url[i]);

-		}

-		feature.setDiscoverySiteEntries(urlInfo);

-		for (int i=0; i<feature.getDiscoverySiteEntries().length;i++){

-			assertEquals(urlInfo[i],feature.getDiscoverySiteEntries()[i]);

-		}

-

-	}

-

-

-	/**

-	 * @see IFeature#testProvider()

-	 */

-	public void testProvider() throws CoreException,MalformedURLException {

-		String provider = "not so dummy provider";

-		IFeature feature = getFeature();

-		((Feature)feature).setProvider(provider);

-		assertEquals(provider,feature.getProvider());

-	}

-

-

-	/**

-	 * @see IFeature#testDescription()

-	 */

-	public void testDescription() throws CoreException,MalformedURLException {

-		String desc = "pretty long description as a string with \r\n and \t and \n";

-		IURLEntry info = new MyURLEntry(desc,null);

-		DefaultFeature feature = getFeature();

-		feature.setDescription(info);

-		assertEquals(desc,feature.getDescription().getAnnotation());

-	}

-	

-	/**

-	 * @see IFeature#testDescription()

-	 */

-	public void testDescription1() throws CoreException, MalformedURLException {

-		URL url = null;

-		try {

-			url = new URL("http://www.oti.com");

-		} catch (MalformedURLException e){/*pretty impossible*/}

-		IURLEntry info = new MyURLEntry(null,url);

-		DefaultFeature feature = getFeature();

-		feature.setDescription(info);

-		assertEquals(url,feature.getDescription().getURL());

-	}	

-	

-	/**

-	 * @see IFeature#testDescription()

-	 */

-	public void testDescription2() throws CoreException, MalformedURLException {

-		

- 	 URL url = null;

-		try {

-			url = new URL("http://www.oti.com");

-		} catch (MalformedURLException e){/*pretty impossible*/}

-		String desc = "pretty long description as a string with \r\n and \t and \n";

-		IURLEntry info = new MyURLEntry(desc,url);

-		DefaultFeature feature = getFeature();

-		feature.setDescription(info);

-		String result = feature.getDescription().getAnnotation();

-		assertEquals(desc,result);

-		assertEquals(url,feature.getDescription().getURL());

-	}	

-

-

-

-}

-

diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/TestDefaultPackageFeatureAPI.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/TestDefaultPackageFeatureAPI.java
deleted file mode 100644
index 95d0157..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/TestDefaultPackageFeatureAPI.java
+++ /dev/null
@@ -1,201 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2000, 2003 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials 

- * are made available under the terms of the Common Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/cpl-v10.html

- * 

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-package org.eclipse.update.tests.api;

-import java.net.MalformedURLException;

-import java.net.URL;

-

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.update.core.*;

-import org.eclipse.update.internal.core.UpdateManagerUtils;

-import org.eclipse.update.tests.UpdateManagerTestCase;

-

-

-

-public class TestDefaultPackageFeatureAPI extends UpdateManagerTestCase {

-	

-	private	DefaultFeature remoteFeature=null;

-	

-	/**

-	 * Test the testFeatures()

-	 */

-	public TestDefaultPackageFeatureAPI(String arg0) {

-		super(arg0);

-	}

-	

-	/**

-	 * the feature to test

-	 */

-	private DefaultFeature getFeature() throws MalformedURLException, CoreException {

-		if (remoteFeature == null){

-		ISite site = SiteManager.getSite(SOURCE_FILE_SITE);

-		URL id = UpdateManagerUtils.getURL(site.getURL(),"org.eclipse.update.core.feature1_1.0.0.jar",null);	

-		remoteFeature = new DefaultFeature(site);

-		remoteFeature.setURL(id);

-		}

-		return remoteFeature;

-	}

-	

-	/**

-	 * @see IFeature#testIdentifier()

-	 */

-	public void testIdentifier() throws CoreException, MalformedURLException {

-		

-		String id1 = "features/org.eclipse.test.feature_1.0.0.jar";

-		String id2 = "features/org.eclipse_test_feature.jar";

-		VersionedIdentifier ident1 = new VersionedIdentifier("org.test1.ident1","1.0.0");

-		VersionedIdentifier ident2 = new VersionedIdentifier("org.test1.ident2","1.0.0");		

-		

-

-			ISite site = SiteManager.getSite(SOURCE_FILE_SITE);

-			

-			URL url1 = UpdateManagerUtils.getURL(site.getURL(),id1,null);			

-			remoteFeature = new DefaultFeature(site);

-			remoteFeature.setURL(url1);

-			remoteFeature.setIdentifier(ident1);

-			assertEquals(ident1.toString(),remoteFeature.getVersionedIdentifier().toString());

-		

-			 URL url2 = UpdateManagerUtils.getURL(site.getURL(),id2,null);		

-			remoteFeature = new DefaultFeature(site);

-			remoteFeature.setURL(url2);

-			remoteFeature.setIdentifier(ident2);			

-			assertEquals(ident2.toString(),remoteFeature.getVersionedIdentifier().toString());

-	}

-

-

-	/**

-	 * @see IFeature#testSite()

-	 */

-	public void testSite() throws MalformedURLException, CoreException {

-		String ident1 = "org.eclipse.test.feature_1.0.0.jar";		

-

-			ISite site = SiteManager.getSite(SOURCE_FILE_SITE);

-			

-			URL id = UpdateManagerUtils.getURL(site.getURL(),ident1,null);		

-			remoteFeature = new DefaultFeature(site);

-			remoteFeature.setURL(id);	

-			assertEquals(site,remoteFeature.getSite());

-

-	}

-

-

-	/**

-	 * @see IFeature#testLabel()

-	 */

-	public void testLabel() throws CoreException, MalformedURLException {

-		String label = "dummy label";

-		Feature feature = getFeature();

-		feature.setLabel(label);

-		assertEquals(label,feature.getLabel());

-	}

-

-

-	/**

-	 * @see IFeature#testUpdateURL()

-	 */

-	public void testUpdateURL() throws CoreException, MalformedURLException {

-		URL url = null;

-		String label = "OTI Site";

-		try {

-			url = new URL("http://www.oti.com/");

-			

-		} catch (java.net.MalformedURLException e){} // impossible eh !

-		DefaultFeature feature = getFeature();

-		feature.setUpdateSiteEntry(new MyURLEntry(label, url));

-		assertEquals(url,feature.getUpdateSiteEntry().getURL());

-		assertEquals(label,feature.getUpdateSiteEntry().getAnnotation());

-

-	} 

-

-

-	

-	/**

-	 * @see IFeature#testDiscoveryURLs()

-	 */

-	public void testDiscoveryURLs() throws CoreException, MalformedURLException {

-		IURLEntry[] urlInfo = new URLEntry[2];

-		URL[] url = new URL[2];

-		String[] label = new String[2];

-		try {

-			url[0] = new URL("http://www.oti.com/");

-			url[1] = new URL("http://eclipse.org/");

-			label[0] = "OTI Site";

-			label[1] = "Eclipse Site";

-		} catch (java.net.MalformedURLException e){} // impossible eh !

-		DefaultFeature feature = getFeature();

-		for (int i=0;i<2;i++){

-				urlInfo[i] = new MyURLEntry(label[i],url[i]);

-		}

-		feature.setDiscoverySiteEntries(urlInfo);

-		for (int i=0; i<feature.getDiscoverySiteEntries().length;i++){

-			assertEquals(urlInfo[i],feature.getDiscoverySiteEntries()[i]);

-		}

-

-

-	}

-

-

-	/**

-	 * @see IFeature#testProvider()

-	 */

-	public void testProvider() throws CoreException, MalformedURLException {

-		String provider = "not so dummy provider";

-		Feature feature = getFeature();

-		feature.setProvider(provider);

-		assertEquals(provider,feature.getProvider());

-	}

-

-

-	/**

-	 * @see IFeature#testDescription()

-	 */

-	public void testDescription() throws CoreException, MalformedURLException {

-		String desc = "pretty long description as a string with \r\n and \t and \n";

-		IURLEntry info = new MyURLEntry(desc,null);

-		DefaultFeature feature = getFeature();

-		feature.setDescription(info);

-		assertEquals(desc,feature.getDescription().getAnnotation());

-	}

-	

-	/**

-	 * @see IFeature#testDescription()

-	 */

-	public void testDescription1() throws CoreException, MalformedURLException {

-		URL url = null;

-		try {

-			url = new URL("http://www.oti.com");

-		} catch (MalformedURLException e){/*pretty impossible*/}

-		IURLEntry info = new MyURLEntry(null,url);

-		DefaultFeature feature = getFeature();

-		feature.setDescription(info);

-		assertEquals(url,feature.getDescription().getURL());

-	}	

-	

-	/**

-	 * @see IFeature#testDescription()

-	 */

-	public void testDescription2() throws CoreException, MalformedURLException {

-		

-		URL url = null;

-		try {

-			url = new URL("http://www.oti.com");

-		} catch (MalformedURLException e){/*pretty impossible*/}

-		String desc = "pretty long description as a string with \r\n and \t and \n";

-		IURLEntry info = new MyURLEntry(desc,url);

-		DefaultFeature feature = getFeature();

-		feature.setDescription(info);

-		assertEquals(desc,feature.getDescription().getAnnotation());

-		assertEquals(url,feature.getDescription().getURL());

-	}

-

-

-

-}

-

diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/TestFeatureContentProvider_FileFilterAPI.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/TestFeatureContentProvider_FileFilterAPI.java
deleted file mode 100644
index 011305a..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/TestFeatureContentProvider_FileFilterAPI.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.update.tests.api;
-import org.eclipse.update.core.FeatureContentProvider;
-import org.eclipse.update.internal.core.FeatureExecutableContentProvider;
-import org.eclipse.update.tests.UpdateManagerTestCase;
-
-
-
-public class TestFeatureContentProvider_FileFilterAPI extends UpdateManagerTestCase {
-	
-	private DefaultFeature remoteFeature=null;
-	
-	/**
-	 * Test the testFeatures()
-	 */
-	public TestFeatureContentProvider_FileFilterAPI(String arg0) {
-		super(arg0);
-	}
-	
-	public void testFileFilter(){
-		
-		String p1 = "/p1/p2/a.*";
-		String p2 = "p1/p2/b.*";
-		String p3 = "/p1/p2/a.txt";
-		String p4 = "/p1/p2/*.txt";
-		
-		String name1 = "/p1/p2/a.txt";
-		String name2 = "/p1/p2/b.txt";
-		String name3 = "/p3/p2/a.txt";
-		String name4 = "p1/p2/a.txt";
-		String name5 = "/p1/p2/b.txt";
-		String name6 = "/p1/p2/c.txt";
-		String name7 = "/p1/p2/p3/a.txt";
-		
-		
-		FeatureContentProvider cp = new FeatureExecutableContentProvider(null);
-		
-		FeatureContentProvider.FileFilter filter1 = cp.new FileFilter(p1);
-		FeatureContentProvider.FileFilter filter2 = cp.new FileFilter(p2);
-		FeatureContentProvider.FileFilter filter3 = cp.new FileFilter(p3);
-		FeatureContentProvider.FileFilter filter4 = cp.new FileFilter(p4);
-
-		assertTrue("1.1",filter1.accept(name1));		
-		assertTrue("1.2",!filter1.accept(name2));		
-		assertTrue("1.3",!filter1.accept(name3));	
-		assertTrue("1.4",!filter1.accept(name4));		
-		assertTrue("1.5",!filter1.accept(name5));		
-		assertTrue("1.6",!filter1.accept(name6));		
-		assertTrue("1.7",!filter1.accept(name7));
-	
-		assertTrue("2.1",!filter2.accept(name1));		
-		assertTrue("2.2",!filter2.accept(name2));		
-		assertTrue("2.3",!filter2.accept(name3));	
-		assertTrue("2.4",!filter2.accept(name4));		
-		assertTrue("2.5",!filter2.accept(name5));		
-		assertTrue("2.6",!filter2.accept(name6));		
-		assertTrue("2.7",!filter2.accept(name7));
-
-		assertTrue("3.1",filter3.accept(name1));		
-		assertTrue("3.2",!filter3.accept(name2));		
-		assertTrue("3.3",!filter3.accept(name3));	
-		assertTrue("3.4",!filter3.accept(name4));		
-		assertTrue("3.5",!filter3.accept(name5));		
-		assertTrue("3.6",!filter3.accept(name6));		
-		assertTrue("3.7",!filter3.accept(name7));
-		
-		assertTrue("4.1",filter4.accept(name1));		
-		assertTrue("4.2",filter4.accept(name2));		
-		assertTrue("4.3",!filter4.accept(name3));	
-		assertTrue("4.4",!filter4.accept(name4));		
-		assertTrue("4.5",filter4.accept(name5));		
-		assertTrue("4.6",filter4.accept(name6));		
-		assertTrue("4.7",!filter4.accept(name7));								
-					
-	}
-}
-
diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/TestLocalSiteAPI.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/TestLocalSiteAPI.java
deleted file mode 100644
index 2ea68ec..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/TestLocalSiteAPI.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2000, 2003 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials 

- * are made available under the terms of the Common Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/cpl-v10.html

- * 

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-package org.eclipse.update.tests.api;

-import java.net.URL;

-

-import org.eclipse.update.core.*;

-import org.eclipse.update.core.model.CategoryModel;

-import org.eclipse.update.core.model.SiteModel;

-import org.eclipse.update.tests.UpdateManagerTestCase;

-

-public class TestLocalSiteAPI extends UpdateManagerTestCase {

-	

-	/**

-	 * Test the getFeatures()

-	 */

-	public TestLocalSiteAPI(String arg0) {

-		super(arg0);

-	}

-	

-	public void testFileParsing() throws Exception {

-

-		ISite site = SiteManager.getSite(new URL(SOURCE_FILE_SITE,"siteTestLocalSite/"));

-		IArchiveReference[] info = site.getArchives();

-		

-		if (info.length<=0){

-			fail("no plugins in site: "+site.getURL().toExternalForm());

-		}

-		 

-		boolean found1 = false;

-		boolean found2 = false;

-		String name1= "plugins/org.eclipse.update.core.tests.feature1.plugin2_5.0.0.jar";

-		String name2 = "plugins/org.eclipse.update.core.tests.feature1.plugin2_5.0.1.jar";

-		

-		for (int i =0; i<info.length; i++){

-			if (info[i].getPath().equals(name1)) found1 = true;

-			if (info[i].getPath().equals(name2)) found2 = true;

-		}

-		

-		if (!found1 || !found2){

-			fail("Cannot find plugin : org.eclipse.update.core.tests.feature1.plugin2 version 5.0.0 and 5.0.1 on the site, by parsing file system");

-		}

-		

-

-	}

-	

-	

-	public void testCategories() throws Exception {

-

-		ISite site = SiteManager.getSite(SOURCE_FILE_SITE);

-		

-		ICategory category = new Category("category","Label of category");

-		

-		((SiteModel)site).addCategoryModel((CategoryModel)category);

-		

-		ICategory[] categories = site.getCategories();

-		boolean found = false;

-		for (int index = 0; index < categories.length; index++) {

-			ICategory element = categories[index];

-			if (element.getName().equals("category")) found = true;

-		}

-		if (!found) fail("cannot find category 'category' in site");

-

-		ISiteFeatureReference ref = new SiteFeatureReference();

-		ref.setSite(site);

-		ref.addCategory(category);		

-		categories = ref.getCategories();

-		found = false;

-		for (int index = 0; index < categories.length; index++) {

-			ICategory element = categories[index];

-			if (element.getName().equals("category")) found = true;

-		}

-		if (!found) fail("cannot find category 'category' in feature");

-		

-			}

-

-}

-

diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/TestNestedFeatureAPI.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/TestNestedFeatureAPI.java
deleted file mode 100644
index 5db09e4..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/TestNestedFeatureAPI.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.update.tests.api;
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.update.core.*;
-import org.eclipse.update.internal.core.UpdateManagerUtils;
-import org.eclipse.update.tests.UpdateManagerTestCase;
-
-public class TestNestedFeatureAPI extends UpdateManagerTestCase {
-
-	/**
-	 * Test the testFeatures()
-	 */
-	public TestNestedFeatureAPI(String arg0) {
-		super(arg0);
-	}
-
-	/**
-	 * the feature to test
-	 */
-	private IFeature getRootFeature() throws MalformedURLException, CoreException {
-		ISite site = SiteManager.getSite(new URL(SOURCE_FILE_SITE, "nestedFeatureSiteTest/site.xml"));
-		URL url = UpdateManagerUtils.getURL(site.getURL(), Site.DEFAULT_INSTALLED_FEATURE_PATH + "rootfeature.jar", null);
-		SiteFeatureReference ref = new SiteFeatureReference();
-		ref.setSite(site);
-		ref.setURL(url);
-		ref.setType(ISite.DEFAULT_PACKAGED_FEATURE_TYPE);
-		IFeature feature = ref.getFeature();
-		return feature;
-	}
-
-	/**
-	 * the feature to test
-	 */
-	private IFeature getChildFeature() throws MalformedURLException, CoreException {
-
-		ISite site = SiteManager.getSite(new URL(SOURCE_FILE_SITE, "nestedFeatureSiteTest/"));
-		URL url = UpdateManagerUtils.getURL(site.getURL(), Site.DEFAULT_INSTALLED_FEATURE_PATH + "org.eclipse.update.core.tests.childrenfeature_2.0.0.jar", null);
-		SiteFeatureReference ref = new SiteFeatureReference();
-		ref.setSite(site);
-		ref.setURL(url);
-		ref.setType(ISite.DEFAULT_PACKAGED_FEATURE_TYPE);
-		IFeature feature = ref.getFeature();
-		return feature;
-	}
-
-	/*
-	 * 
-	 */
-	public void testNested() throws Exception {
-
-		IFeature rootFeature = getRootFeature();
-		IFeatureReference[] ref = rootFeature.getIncludedFeatureReferences();
-		IFeature childFeature = getChildFeature();
-		assertEquals("Children feature are not equal", childFeature, ref[0].getFeature());
-	}
-
-	/**
-	 * the feature to test
-	 */
-	private IFeature getRootFeature2() throws MalformedURLException, CoreException {
-		ISite site = SiteManager.getSite(new URL(SOURCE_FILE_SITE, "nestedFeatureSiteTest2/site.xml"));
-		URL url = UpdateManagerUtils.getURL(site.getURL(), Site.DEFAULT_INSTALLED_FEATURE_PATH + "rootfeature.jar", null);
-		SiteFeatureReference ref = new SiteFeatureReference();
-		ref.setSite(site);
-		ref.setURL(url);
-		ref.setType(ISite.DEFAULT_PACKAGED_FEATURE_TYPE);
-		IFeature feature = ref.getFeature();
-		return feature;
-	}
-
-	/**
-	 * the feature to test
-	 */
-	private IFeature getChildFeature2() throws MalformedURLException, CoreException {
-
-		ISite site = SiteManager.getSite(new URL(SOURCE_FILE_SITE, "nestedFeatureSiteTest2/site.xml"));
-		URL url = UpdateManagerUtils.getURL(site.getURL(), Site.DEFAULT_INSTALLED_FEATURE_PATH + "childrenfeature.jar", null);
-		SiteFeatureReference ref = new SiteFeatureReference();
-		ref.setSite(site);
-		ref.setURL(url);
-		ref.setType(ISite.DEFAULT_PACKAGED_FEATURE_TYPE);
-		IFeature feature = ref.getFeature();
-		return feature;
-	}
-
-	/*
-	 * 
-	 */
-	public void testNested2() throws Exception {
-
-		IFeature rootFeature = getRootFeature2();
-		IFeatureReference[] ref = rootFeature.getIncludedFeatureReferences();
-		IFeature childFeature = getChildFeature2();
-		assertEquals("Children feature are not equal", childFeature, ref[0].getFeature());
-	}
-
-	/**
-	 * the feature to test
-	 */
-	private IFeature getRootFeature3() throws MalformedURLException, CoreException {
-		ISite site = SiteManager.getSite(new URL(SOURCE_FILE_SITE, "nestedFeatureSiteTest3/site.xml"));
-		URL url = UpdateManagerUtils.getURL(site.getURL(), Site.DEFAULT_INSTALLED_FEATURE_PATH + "rootfeature.jar", null);
-		SiteFeatureReference ref = new SiteFeatureReference();
-		ref.setSite(site);
-		ref.setURL(url);
-		ref.setType(ISite.DEFAULT_PACKAGED_FEATURE_TYPE);
-		IFeature feature = ref.getFeature();
-		return feature;
-	}
-
-	/**
-	 * the feature to test
-	 */
-	private IFeature getChildFeature3() throws MalformedURLException, CoreException {
-
-		ISite site = SiteManager.getSite(new URL(SOURCE_FILE_SITE, "nestedFeatureSiteTest3/site.xml"));
-		URL url = UpdateManagerUtils.getURL(site.getURL(), Site.DEFAULT_INSTALLED_FEATURE_PATH + "childrenfeature.jar", null);
-		SiteFeatureReference ref = new SiteFeatureReference();
-		ref.setSite(site);
-		ref.setURL(url);
-		ref.setType(ISite.DEFAULT_PACKAGED_FEATURE_TYPE);
-		IFeature feature = ref.getFeature();
-		return feature;
-	}
-
-	/*
-	 * 
-	 */
-	/*	public void testNested3() throws Exception {
-	
-			IFeature rootFeature = getRootFeature3();
-			IFeatureReference[] ref = rootFeature.getIncludedFeatureReferences();
-			IFeature childFeature = getChildFeature3();
-			assertEquals(
-				"Children feature are not equal",
-				childFeature,
-				ref[0].getFeature());
-		}
-	*/
-
-}
diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/TestPluginContainerAPI.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/TestPluginContainerAPI.java
deleted file mode 100644
index 0bd1fef..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/TestPluginContainerAPI.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2000, 2003 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials 

- * are made available under the terms of the Common Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/cpl-v10.html

- * 

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-package org.eclipse.update.tests.api;

-import java.net.MalformedURLException;

-import java.net.URL;

-

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.update.core.*;

-import org.eclipse.update.internal.core.UpdateManagerUtils;

-import org.eclipse.update.tests.UpdateManagerTestCase;

-

-public class TestPluginContainerAPI extends UpdateManagerTestCase {

-

-	private Site site;

-	private DefaultFeature feature;

-

-	/**

-	 * the Site to test

-	 */

-	private Site getSite() throws CoreException, MalformedURLException {

-		if (site == null) {

-

-			site = (Site)SiteManager.getSite(new URL(SOURCE_FILE_SITE,"testAPI/"));

-

-		}

-		return site;

-	}

-

-	/**

-	 * the feature to test

-	 */

-	private DefaultFeature getFeature() throws MalformedURLException, CoreException {

-		if (feature == null) {

-			ISite site = getSite();

-			URL id = UpdateManagerUtils.getURL(site.getURL(),"org.eclipse.update.core.feature1_1.0.0.jar",null);						

-			feature = new DefaultFeature(site);

-			feature.setURL(id);	

-		}

-		return feature;

-	}

-

-	/**

-	 * Test the getFeatures()

-	 */

-	public TestPluginContainerAPI(String arg0) throws CoreException {

-		super(arg0);

-	}

-

-	public void testAbstractFeature() throws CoreException, MalformedURLException {

-		PluginEntry pluginEntry = new PluginEntry();

-		pluginEntry.setVersionedIdentifier(new VersionedIdentifier("id", "6"));

-		Feature _feature = getFeature();

-		((DefaultFeature)_feature).addPluginEntry(pluginEntry);

-		assertEquals(_feature.getPluginEntryCount(), 1);

-		assertEquals(_feature.getPluginEntries()[0], pluginEntry);

-

-	}

-

-	public void testAbstactSite() throws CoreException, MalformedURLException {

-		PluginEntry pluginEntry = new PluginEntry();

-		pluginEntry.setVersionedIdentifier(new VersionedIdentifier("id", "6"));

-		Site _site = getSite();

-		_site.addPluginEntry(pluginEntry);

-		assertEquals(_site.getPluginEntryCount(), 1);

-		assertEquals(_site.getPluginEntries()[0], pluginEntry);

-

-	}

-

-}

diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/TestSiteAPI.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/TestSiteAPI.java
deleted file mode 100644
index 6d7cdfa..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/TestSiteAPI.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2000, 2003 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials 

- * are made available under the terms of the Common Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/cpl-v10.html

- * 

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-package org.eclipse.update.tests.api;

-import java.io.File;

-import java.net.URL;

-

-import org.eclipse.update.core.ISite;

-import org.eclipse.update.core.SiteManager;

-import org.eclipse.update.tests.UpdateManagerTestCase;

-

-public class TestSiteAPI extends UpdateManagerTestCase {

-	

-	/**

-	 * Test the getFeatures()

-	 */

-	public TestSiteAPI(String arg0) {

-		super(arg0);

-	}

-	

-	public void testURL() throws Exception {

-

-		ISite site = SiteManager.getSite(SOURCE_FILE_SITE);

-		assertEquals(new File(site.getURL().getFile()),new File(SOURCE_FILE_SITE.getFile()));

-		

-		ISite site2 = SiteManager.getSite(SOURCE_HTTP_SITE);

-		assertEquals(site2.getURL(),new URL("http", getHttpHost(),getHttpPort(), bundle.getString("HTTP_PATH_1")+"site.xml"));

-

-	}

-

-}

-

diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/TestSiteManagerAPI.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/TestSiteManagerAPI.java
deleted file mode 100644
index 75fd89e..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/TestSiteManagerAPI.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2000, 2003 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials 

- * are made available under the terms of the Common Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/cpl-v10.html

- * 

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-package org.eclipse.update.tests.api;

-import java.io.File;

-import java.net.URL;

-

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.update.core.*;

-import org.eclipse.update.configuration.*;

-import org.eclipse.update.internal.core.*;

-import org.eclipse.update.tests.UpdateManagerTestCase;

-

-public class TestSiteManagerAPI extends UpdateManagerTestCase {

-	

-	/**

-	 * Test the getFeatures()

-	 */

-	public TestSiteManagerAPI(String arg0) {

-		super(arg0);

-	}

-	

-	public void testFile() throws Exception {

-		ISite fileSite = SiteManager.getSite(TARGET_FILE_SITE);

-		String site = fileSite.getURL().toExternalForm();		

-		assertEquals(TARGET_FILE_SITE.toExternalForm(), site);

-	}

-	

-	public void testUnknown() throws Exception {

-		URL url = new URL("ftp://255.255.255.255/");

-		try {

-		SiteManager.getSite(url);

-		fail("Connected to ftp://255.255.255.255/, should not happen");

-		} catch (CoreException e){

-			// expected

-		} catch (IllegalArgumentException e){

-			// expected as the version of the WebDav HTTP Connection returns so

-		}

-	}

-	

-	public void testLocalSite() throws Exception {

-		

-		ILocalSite site = SiteManager.getLocalSite();

-		IConfiguredSite[] instSites = site.getCurrentConfiguration().getConfiguredSites();

-		assertTrue(instSites.length>0);

-		System.out.println("Local Site:"+instSites[0].getSite().getURL().toExternalForm());

-		

-		ISite remoteSite = SiteManager.getSite(SOURCE_FILE_SITE_INSTALLED);

-		IFeature remoteFeature = remoteSite.getFeatureReferences()[0].getFeature();

-		remove(remoteFeature,instSites[0].getSite());		

-		instSites[0].getSite().install(remoteFeature,null,null);

-		

-		IFeatureReference[] features = site.getCurrentConfiguration().getConfiguredSites()[0].getSite().getFeatureReferences();

-		assertTrue(features.length>0);

-

-		//cleanup

-		assertNotNull(remoteFeature);		

-		File file = new File(instSites[0].getSite().getURL().getFile()+File.separator+Site.DEFAULT_INSTALLED_FEATURE_PATH+remoteFeature.getVersionedIdentifier());

-		UpdateManagerUtils.removeFromFileSystem(file);

-		file = new File(instSites[0].getSite().getURL().getFile()+File.separator+Site.DEFAULT_PLUGIN_PATH+"org.eclipse.update.plugin1_1.1.1");

-		UpdateManagerUtils.removeFromFileSystem(file);		

-		File localFile = new File(new URL(((SiteLocal)SiteManager.getLocalSite()).getLocationURL(),SiteLocal.SITE_LOCAL_FILE).getFile());

-		UpdateManagerUtils.removeFromFileSystem(localFile);	

-		UpdateManagerUtils.removeFromFileSystem(new File(((InstallConfiguration)site.getCurrentConfiguration()).getURL().getFile()));				

-		

-

-	}

-	

-

-}

-

diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/TestUpdateManagerUtilsAPI.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/TestUpdateManagerUtilsAPI.java
deleted file mode 100644
index d82488e..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/api/TestUpdateManagerUtilsAPI.java
+++ /dev/null
@@ -1,229 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2000, 2003 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials 

- * are made available under the terms of the Common Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/cpl-v10.html

- * 

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-package org.eclipse.update.tests.api;

-import java.net.URL;

-

-import org.eclipse.update.internal.core.UpdateManagerUtils;

-import org.eclipse.update.tests.UpdateManagerTestCase;

-

-public class TestUpdateManagerUtilsAPI extends UpdateManagerTestCase {

-	

-	/**

-	 * Test the getFeatures()

-	 */

-	public TestUpdateManagerUtilsAPI(String arg0) {

-		super(arg0);

-	}

-	

-	public void testgetURL() throws Exception {

-		URL url1 = new URL("http://www.eclipse.org");

-		URL url2 = new URL("file://c:/hello");

-		URL url3 = new URL("file:/home/eclipse/");

-		URL url4 = new URL("ftp:/host:8080/path/");

-		URL url5 = new URL("jar:file:/tmp/100100!/");

-		

-		String default1 = "default1/default";

-		String default2 = "/default2/";

-		

-		String str1 = "http://dev.eclipse.org";

-		String str2 = "relative1/path/";

-		String str3 = "/relative2/path";

-		

-		String result1=null;

-		String result2=null;

-		

-		//****************************************************************************************

-		// 1.0

-		result1 = UpdateManagerUtils.getURL(url1,str1,default1).toExternalForm();

-		 result2 = "http://dev.eclipse.org";

-		assertEquals("1.0",result2,result1);

-		

-		// 1.1

-		 result1 = UpdateManagerUtils.getURL(null,str1,null).toExternalForm();

-		 result2 = "http://dev.eclipse.org";

-		assertEquals("1.1",result2,result1);

-		

-		// 1.2

-		 result1 = UpdateManagerUtils.getURL(url1,str1,null).toExternalForm();

-		 result2 = "http://dev.eclipse.org";

-		assertEquals("1.2",result2,result1);

-		

-		// 1.3

-		 result1 = UpdateManagerUtils.getURL(url1,str2,default1).toExternalForm();

-		 result2 = "http://www.eclipse.org/relative1/path/";

-		assertEquals("1.3",result2,result1);

-		

-		// 1.4

-		 result1 = UpdateManagerUtils.getURL(url1,str3,default1).toExternalForm();

-		 result2 = "http://www.eclipse.org/relative2/path";

-		assertEquals("1.4",result2,result1);

-		

-		// 1.5

-		 result1 = UpdateManagerUtils.getURL(url1,null,default1).toExternalForm();

-		 result2 = "http://www.eclipse.org/default1/default";

-		assertEquals("1.5",result2,result1);

-		

-		// 1.6

-		 result1 = UpdateManagerUtils.getURL(url1,null,default2).toExternalForm();

-		 result2 = "http://www.eclipse.org/default2/";

-		assertEquals("1.6",result2,result1);

-		

-		//****************************************************************************************

-		// 2.0

-		 result1 = UpdateManagerUtils.getURL(url2,str1,default1).toExternalForm();

-		 result2 = "http://dev.eclipse.org";

-		assertEquals("2.0",result2,result1);

-		

-		// 2.1

-		 result1 = UpdateManagerUtils.getURL(null,str1,null).toExternalForm();

-		 result2 = "http://dev.eclipse.org";

-		assertEquals("2.1",result2,result1);

-		

-		// 2.2

-		 result1 = UpdateManagerUtils.getURL(url2,str1,null).toExternalForm();

-		 result2 = "http://dev.eclipse.org";

-		assertEquals("2.2",result2,result1);

-		

-		// 2.3

-		 result1 = UpdateManagerUtils.getURL(url2,str2,default1).toExternalForm();

-		 result2 = "file://c:/relative1/path/";

-		assertEquals("2.3",result2,result1);

-		

-		// 2.4

-		 result1 = UpdateManagerUtils.getURL(url2,str3,default1).toExternalForm();

-		 result2 = "file://c:/relative2/path";

-		assertEquals("2.4",result2,result1);

-		

-		// 2.5

-		 result1 = UpdateManagerUtils.getURL(url2,null,default1).toExternalForm();

-		 result2 = "file://c:/default1/default";

-		assertEquals("2.5",result2,result1);

-		

-		// 2.6

-		 result1 = UpdateManagerUtils.getURL(url2,null,default2).toExternalForm();

-		 result2 = "file://c:/default2/";

-		assertEquals("2.6",result2,result1);

-		

-

-		//****************************************************************************************

-		// 3.0

-		 result1 = UpdateManagerUtils.getURL(url3,str1,default1).toExternalForm();

-		 result2 = "http://dev.eclipse.org";

-		assertEquals("3.0",result2,result1);

-		

-		// 3.1

-		 result1 = UpdateManagerUtils.getURL(null,str1,null).toExternalForm();

-		 result2 = "http://dev.eclipse.org";

-		assertEquals("3.1",result2,result1);

-		

-		// 3.2

-		 result1 = UpdateManagerUtils.getURL(url3,str1,null).toExternalForm();

-		 result2 = "http://dev.eclipse.org";

-		assertEquals("3.2",result2,result1);

-		

-		// 3.3

-		 result1 = UpdateManagerUtils.getURL(url3,str2,default1).toExternalForm();

-		 result2 = "file:/home/eclipse/relative1/path/";

-		assertEquals("3.3",result2,result1);

-		

-		// 3.4

-		 result1 = UpdateManagerUtils.getURL(url3,str3,default1).toExternalForm();

-		 result2 = "file:/home/eclipse/relative2/path";

-		assertEquals("3.4",result2,result1);

-		

-		// 3.5

-		 result1 = UpdateManagerUtils.getURL(url3,null,default1).toExternalForm();

-		 result2 = "file:/home/eclipse/default1/default";

-		assertEquals("3.5",result2,result1);

-		

-		// 3.6

-		 result1 = UpdateManagerUtils.getURL(url3,null,default2).toExternalForm();

-		 result2 = "file:/home/eclipse/default2/";

-		assertEquals("3.6",result2,result1);

-				

-		//****************************************************************************************

-		// 4.0

-		 result1 = UpdateManagerUtils.getURL(url4,str1,default1).toExternalForm();

-		 result2 = "http://dev.eclipse.org";

-		assertEquals("4.0",result2,result1);

-		

-		// 4.1

-		 result1 = UpdateManagerUtils.getURL(null,str1,null).toExternalForm();

-		 result2 = "http://dev.eclipse.org";

-		assertEquals("4.1",result2,result1);

-		

-		// 4.2

-		 result1 = UpdateManagerUtils.getURL(url4,str1,null).toExternalForm();

-		 result2 = "http://dev.eclipse.org";

-		assertEquals("4.2",result2,result1);

-		

-		// 4.3

-		 result1 = UpdateManagerUtils.getURL(url4,str2,default1).toExternalForm();

-		 result2 = "ftp:/host:8080/path/relative1/path/";

-		assertEquals("4.3",result2,result1);

-		

-		// 4.4

-		 result1 = UpdateManagerUtils.getURL(url4,str3,default1).toExternalForm();

-		 result2 = "ftp:/host:8080/path/relative2/path";

-		assertEquals("4.4",result2,result1);

-		

-		// 4.5

-		 result1 = UpdateManagerUtils.getURL(url4,null,default1).toExternalForm();

-		 result2 = "ftp:/host:8080/path/default1/default";

-		assertEquals("4.5",result2,result1);

-		

-		// 4.6

-		 result1 = UpdateManagerUtils.getURL(url4,null,default2).toExternalForm();

-		 result2 = "ftp:/host:8080/path/default2/";

-		assertEquals("4.6",result2,result1);

-		

-		//****************************************************************************************

-		// 5.0

-		 result1 = UpdateManagerUtils.getURL(url5,str1,default1).toExternalForm();

-		 result2 = "http://dev.eclipse.org";

-		assertEquals("5.0",result2,result1);

-		

-		// 5.1

-		 result1 = UpdateManagerUtils.getURL(null,str1,null).toExternalForm();

-		 result2 = "http://dev.eclipse.org";

-		assertEquals("5.1",result2,result1);

-		

-		// 5.2

-		 result1 = UpdateManagerUtils.getURL(url5,str1,null).toExternalForm();

-		 result2 = "http://dev.eclipse.org";

-		assertEquals("5.2",result2,result1);

-		

-		// 5.3

-		 result1 = UpdateManagerUtils.getURL(url5,str2,default1).toExternalForm();

-		 result2 = "jar:file:/tmp/100100!/relative1/path/";

-		assertEquals("5.3",result2,result1);

-		

-		// 5.4

-		 result1 = UpdateManagerUtils.getURL(url5,str3,default1).toExternalForm();

-		 result2 = "jar:file:/tmp/100100!/relative2/path";

-		assertEquals("5.4",result2,result1);

-		

-		// 5.5

-		 result1 = UpdateManagerUtils.getURL(url5,null,default1).toExternalForm();

-		 result2 = "jar:file:/tmp/100100!/default1/default";

-		assertEquals("5.5",result2,result1);

-		

-		// 5.6

-		 result1 = UpdateManagerUtils.getURL(url5,null,default2).toExternalForm();

-		 result2 = "jar:file:/tmp/100100!/default2/";

-		assertEquals("5.6",result2,result1);				

-

-	}

-	

-	

-

-}

-

diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/configurations/AllConfigurationsTests.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/configurations/AllConfigurationsTests.java
deleted file mode 100644
index 7e4e003..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/configurations/AllConfigurationsTests.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2000, 2003 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials 

- * are made available under the terms of the Common Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/cpl-v10.html

- * 

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-package org.eclipse.update.tests.configurations;

-

-import org.eclipse.update.tests.UpdateManagerTestCase;

-import junit.framework.*;

-

-

-public class AllConfigurationsTests extends UpdateManagerTestCase {

-public AllConfigurationsTests(String name) {

-	super(name);

-}

-public static Test suite() {

-	TestSuite suite = new TestSuite();

-	suite.setName("Regular Install Tests");

-	

-	suite.addTest(new TestSuite(TestRevert.class));

-	suite.addTest(new TestSuite(TestBackward.class));

-		

-	return suite;

-}

-}

diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/configurations/TestBackward.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/configurations/TestBackward.java
deleted file mode 100644
index fd00cdc..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/configurations/TestBackward.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2000, 2003 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials 

- * are made available under the terms of the Common Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/cpl-v10.html

- * 

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-package org.eclipse.update.tests.configurations;

-import java.io.File;

-import java.net.URL;

-

-import org.eclipse.update.configuration.*;

-import org.eclipse.update.core.*;

-import org.eclipse.update.internal.core.*;

-import org.eclipse.update.tests.UpdateManagerTestCase;

-

-public class TestBackward extends UpdateManagerTestCase {

-	

-	/**

-	 * Test the getFeatures()

-	 */

-	public TestBackward(String arg0) {

-		super(arg0);

-	}

-	

-	public void testSimpleBackward() throws Exception {

-

-		// cleanup

-		SiteLocal siteLocal = ((SiteLocal)SiteManager.getLocalSite());

-		File localFile = new File(new URL(siteLocal.getLocationURL(),SiteLocal.SITE_LOCAL_FILE).getFile());

-		UpdateManagerUtils.removeFromFileSystem(localFile);		

-		UpdateManagerUtils.removeFromFileSystem(new File(((InstallConfiguration)siteLocal.getCurrentConfiguration()).getURL().getFile()));

-		InternalSiteManager.localSite=null;		

-

-		ILocalSite site = SiteManager.getLocalSite();

-		ISite remoteSite = SiteManager.getSite(SOURCE_HTTP_SITE);

-		IFeatureReference featureRef = remoteSite.getFeatureReferences()[0];

-		

-		IInstallConfiguration oldInstallConfig = site.getCurrentConfiguration();

-		IConfiguredSite oldConfigSite = oldInstallConfig.getConfiguredSites()[0];

-		

-		((ConfiguredSite)oldConfigSite).setUpdatable(true);	

-		assertNotNull("Reference is null",featureRef);

-		remove(featureRef.getFeature(),oldConfigSite);	

-		oldConfigSite.install(featureRef.getFeature(),null,null);

-		site.save();

-	

-		

-		// Activity -> InstallConfig

-		IInstallConfiguration current = site.getCurrentConfiguration();

-		IActivity activity = current.getActivities()[0];	

-		assertTrue(activity.getInstallConfiguration().equals(current));

-		

-		// ConfigSite->InstallConfig

-		IConfiguredSite newConfigSite = current.getConfiguredSites()[0];

-		assertTrue(newConfigSite.getInstallConfiguration().equals(current));

-		

-		// cleanup

-		localFile = new File(new URL(((SiteLocal)SiteManager.getLocalSite()).getLocationURL(),SiteLocal.SITE_LOCAL_FILE).getFile());

-		UpdateManagerUtils.removeFromFileSystem(localFile);		

-		localFile = new File(new URL(((SiteLocal)SiteManager.getLocalSite()).getLocationURL(),SiteLocal.DEFAULT_CONFIG_FILE).getFile());

-		UpdateManagerUtils.removeFromFileSystem(localFile);	

-	

-	}

-

-}

-

diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/configurations/TestRevert.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/configurations/TestRevert.java
deleted file mode 100644
index 8bafde3..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/configurations/TestRevert.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2000, 2003 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials 

- * are made available under the terms of the Common Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/cpl-v10.html

- * 

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-package org.eclipse.update.tests.configurations;

-import java.io.File;

-import java.net.URL;

-

-import org.eclipse.core.boot.IPlatformConfiguration;

-import org.eclipse.update.configuration.*;

-import org.eclipse.update.core.*;

-import org.eclipse.update.internal.core.*;

-import org.eclipse.update.internal.model.ConfigurationPolicyModel;

-import org.eclipse.update.internal.model.ConfiguredSiteModel;

-import org.eclipse.update.tests.UpdateManagerTestCase;

-

-public class TestRevert extends UpdateManagerTestCase {

-	

-	/**

-	 * Test the getFeatures()

-	 */

-	public TestRevert(String arg0) {

-		super(arg0);

-	}

-	

-	public void testSimpleRevertInstall() throws Exception {

-

-		// cleanup

-		SiteLocal siteLocal = ((SiteLocal)SiteManager.getLocalSite());

-		File localFile = new File(new URL(siteLocal.getLocationURL(),SiteLocal.SITE_LOCAL_FILE).getFile());

-		UpdateManagerUtils.removeFromFileSystem(localFile);		

-		UpdateManagerUtils.removeFromFileSystem(new File(((InstallConfiguration)siteLocal.getCurrentConfiguration()).getURL().getFile()));

-		InternalSiteManager.localSite=null;		

-

-		ILocalSite site = SiteManager.getLocalSite();

-		ISite remoteSite = SiteManager.getSite(SOURCE_HTTP_SITE);

-		IFeatureReference featureRef = remoteSite.getFeatureReferences()[0];

-		IFeatureReference featureRef2 = remoteSite.getFeatureReferences()[1];

-		IFeature feature = featureRef.getFeature();

-		

-		// old config, no features installed

-		IInstallConfiguration old = site.getCurrentConfiguration();

-		ConfigurationPolicy excludepolicy = new ConfigurationPolicy();

-		excludepolicy.setPolicy(IPlatformConfiguration.ISitePolicy.USER_EXCLUDE);

-		IConfiguredSite oldConfigSite = old.getConfiguredSites()[0];

-		excludepolicy.setConfiguredSiteModel((ConfiguredSiteModel)oldConfigSite);		

-		((ConfiguredSiteModel)oldConfigSite).setConfigurationPolicyModel((ConfigurationPolicyModel)excludepolicy);

-		

-		// install one feature

-		IInstallConfiguration newConfig = site.cloneCurrentConfiguration();

-		IConfiguredSite configSite = newConfig.getConfiguredSites()[0];

-		if (!configSite.getSite().equals(oldConfigSite.getSite())) fail("Config sites are not equals");

-		site.addConfiguration(newConfig);	

-		

-		((ConfiguredSite)configSite).setUpdatable(true);			

-		IFeatureReference installedFeature = configSite.install(feature,null,null);

-		site.save();

-

-		// unconfigure it

-		configSite.unconfigure(installedFeature.getFeature());

-

-		// install another feature

-		IFeature feature2 = featureRef2.getFeature();

-		IInstallConfiguration newConfig2 = site.cloneCurrentConfiguration();

-		IConfiguredSite anotherConfigSite = newConfig2.getConfiguredSites()[0];

-		if (!anotherConfigSite.getSite().equals(oldConfigSite.getSite())) fail("Config sites are not equals");		

-		site.addConfiguration(newConfig2);		

-		anotherConfigSite.install(feature2,null,null);

-		site.save();

-

-		// revert to old state where no feature where configured

-		site.revertTo(old,null,null);

-		site.save();

-		

-		// check

-		String time = ""+site.getCurrentConfiguration().getCreationDate().getTime();

-		File file = new File(new URL(((SiteLocal)SiteManager.getLocalSite()).getLocationURL(),SiteLocal.DEFAULT_CONFIG_PREFIX+time+".xml").getFile());

-		assertTrue("new configuration does not exist", file.exists());

-		

-		

-		//find configured site

-		IConfiguredSite newConfigSite = null;

-		IConfiguredSite[] sites = site.getCurrentConfiguration().getConfiguredSites();

-		for (int i = 0; i < sites.length; i++) {

-			if (sites[i].getSite().equals(oldConfigSite.getSite())){

-				 newConfigSite = sites[i];

-				 break;

-			}

-		}

-		if (newConfigSite==null) fail("Cannot find configuration site");

-

-		int oldNumber = oldConfigSite.getConfiguredFeatures().length;

-		int newNumber = newConfigSite.getConfiguredFeatures().length;

-		

-		//

-		IFeatureReference[] configFeatures = newConfigSite.getConfiguredFeatures();

-		for (int i = 0; i < configFeatures.length; i++) {

-			System.out.println(configFeatures[i]);

-		}		

-		assertTrue("Wrong number of configured features old:"+oldNumber+" new:"+newNumber,oldNumber==newNumber);

-		

-		// test only 2 install config in local site

-		int newNumberUnconfiguredFeatures = ((ConfiguredSite)newConfigSite).getConfigurationPolicy().getUnconfiguredFeatures().length;

-		int oldNumberUnconfiguredFeatures = ((ConfiguredSite)oldConfigSite).getConfigurationPolicy().getUnconfiguredFeatures().length;		

-		assertEquals("wrong number of unconfigured features",oldNumberUnconfiguredFeatures+2,newNumberUnconfiguredFeatures);

-		

-		// cleanup

-		localFile = new File(new URL(((SiteLocal)SiteManager.getLocalSite()).getLocationURL(),SiteLocal.SITE_LOCAL_FILE).getFile());

-		UpdateManagerUtils.removeFromFileSystem(localFile);		

-		localFile = new File(new URL(((SiteLocal)SiteManager.getLocalSite()).getLocationURL(),SiteLocal.DEFAULT_CONFIG_FILE).getFile());

-		UpdateManagerUtils.removeFromFileSystem(localFile);				

-		UpdateManagerUtils.removeFromFileSystem(file);	

-		time = ""+newConfig.getCreationDate().getTime();

-		file = new File(new URL(((SiteLocal)SiteManager.getLocalSite()).getLocationURL(),"DefaultConfig"+time+".xml").getFile());	

-		UpdateManagerUtils.removeFromFileSystem(file);	

-		time = ""+newConfig2.getCreationDate().getTime();

-		file = new File(new URL(((SiteLocal)SiteManager.getLocalSite()).getLocationURL(),"DefaultConfig"+time+".xml").getFile());	

-		UpdateManagerUtils.removeFromFileSystem(file);	

-	}

-

-}

-

diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/core/boot/AllPlatformConfigurationTests.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/core/boot/AllPlatformConfigurationTests.java
deleted file mode 100644
index fc1fef9..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/core/boot/AllPlatformConfigurationTests.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2000, 2003 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials 

- * are made available under the terms of the Common Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/cpl-v10.html

- * 

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-package org.eclipse.update.tests.core.boot;

-

-import junit.framework.Test;

-import junit.framework.TestSuite;

-

-public class AllPlatformConfigurationTests

-	extends PlatformConfigurationTestCase {

-	/**

-	 * Constructor

-	 */

-	public AllPlatformConfigurationTests(String name) {

-		super(name);

-	}

-	

-	/**

-	 * List of API tests

-	 */

-	public static Test suite() throws Exception {

-		TestSuite suite = new TestSuite();

-		suite.setName("PlatformConfiguration Tests");

-

-		suite.addTest(new TestSuite(TestPlatCfgAPI.class));

-

-		return suite;

-	}

-

-}

-

diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/core/boot/PlatformConfigurationTestCase.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/core/boot/PlatformConfigurationTestCase.java
deleted file mode 100644
index c9fa01e..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/core/boot/PlatformConfigurationTestCase.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2000, 2003 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials 

- * are made available under the terms of the Common Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/cpl-v10.html

- * 

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-package org.eclipse.update.tests.core.boot;

-

-import java.io.File;

-import java.util.Date;

-

-import junit.framework.TestCase;

-

-public class PlatformConfigurationTestCase extends TestCase {

-	

-	protected String tempDir;

-	

-	public PlatformConfigurationTestCase(String name) {

-		super(name);

-		try {

-			init();

-		} catch (Exception e) {

-			fail(e.toString());

-			e.printStackTrace();

-		}

-	}

-	

-	protected void init() {

-	}

-	

-	protected void setUp() {

-		// get new temp directory for testcase

-		String root = getTempDirectoryName();

-		setupDirectory(root);

-		tempDir = root;

-	}

-	

-	protected void tearDown() {

-		// cleanup testcase temp directory

-		if (tempDir != null)

-			cleanupDirectory(tempDir);

-	}

-	

-	protected String getTempDirectoryName() {

-		String tmp = System.getProperty("java.io.tmpdir");

-		if (!tmp.endsWith(File.separator))

-			tmp += File.separator;

-		return tmp+"eclipse"+File.separator+(new Date().getTime()+File.separator);

-	}

-	

-	protected void setupDirectory(String name) {

-		File dir = new File(name);

-		dir.mkdirs();

-	}

-	

-	protected void cleanupDirectory(String name) {

-		File dir = new File(name);

-		deleteDirectory(dir);

-	}

-	

-	private void deleteDirectory(File dir) {

-		File[] list = dir.listFiles();

-		if (list == null)

-			return;

-			

-		for (int i=0; i<list.length; i++) {

-			if (list[i].isDirectory()) 

-				deleteDirectory(list[i]);

-			if (!list[i].delete())

-				System.out.println("Unable to delete "+list[i].toString());

-		}

-	}

-}

-

diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/core/boot/TestPlatCfgAPI.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/core/boot/TestPlatCfgAPI.java
deleted file mode 100644
index ab03278..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/core/boot/TestPlatCfgAPI.java
+++ /dev/null
@@ -1,212 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2000, 2003 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials 

- * are made available under the terms of the Common Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/cpl-v10.html

- * 

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-package org.eclipse.update.tests.core.boot;

-

-import java.io.IOException;

-import java.net.MalformedURLException;

-import java.net.URL;

-import java.util.Date;

-

-import junit.framework.Assert;

-import org.eclipse.core.boot.BootLoader;

-import org.eclipse.core.boot.IPlatformConfiguration;

-import org.eclipse.core.boot.IPlatformConfiguration.ISiteEntry;

-import org.eclipse.core.boot.IPlatformConfiguration.ISitePolicy;

-

-public class TestPlatCfgAPI extends PlatformConfigurationTestCase {

-			

-	public TestPlatCfgAPI(String arg0) {

-		super(arg0);

-	}

-	

-	public void testBasic() throws Exception {

-		

-		// get new config object

-		IPlatformConfiguration cfig = null;

-		try {

-			cfig = BootLoader.getPlatformConfiguration(null);

-		} catch (IOException e) {

-			Assert.fail("0.0.0 "+e.toString());

-		}

-		ISiteEntry[] dflt = cfig.getConfiguredSites();

-		Assert.assertEquals("0.0.1",dflt.length,0);

-		

-		// policy tests

-		ISitePolicy p1 = cfig.createSitePolicy(ISitePolicy.USER_INCLUDE, null);

-		Assert.assertEquals("1.0.0",p1.getType(),ISitePolicy.USER_INCLUDE);

-		Assert.assertEquals("1.0.1",p1.getList().length,0);

-		p1.setList(new String[] {"first"});

-		Assert.assertEquals("1.0.2",p1.getList().length,1);

-		Assert.assertEquals("1.0.3",p1.getList()[0],"first");

-		

-		ISitePolicy p2 = cfig.createSitePolicy(ISitePolicy.USER_EXCLUDE, new String[0]);

-		Assert.assertEquals("1.1.0",p2.getType(),ISitePolicy.USER_EXCLUDE);

-		Assert.assertEquals("1.1.1",p2.getList().length,0);

-		p2.setList(new String[] {"first", "second"});

-		Assert.assertEquals("1.1.2",p2.getList().length,2);

-		Assert.assertEquals("1.1.3",p2.getList()[1],"second");

-		

-		// create some urls

-		URL u1 = null;

-		URL u2 = null;

-

-		URL u4 = null;

-		try {

-			u1 = new URL("file:d:/temp/");

-			u2 = new URL("file://localhost/temp/");

-			new URL("http://some.server/temp/");

-			u4 = new URL("http://bad.url");

-		} catch (MalformedURLException e) {

-			Assert.fail("2.0.0 unable to create URL "+e);

-		}

-				

-		// site creation tests

-		ISiteEntry s1 = cfig.createSiteEntry(u1,p2);

-		Assert.assertEquals("3.0.0",s1.getURL(),u1);

-		Assert.assertEquals("3.0.1",s1.getSitePolicy(),p2);

-		s1.setSitePolicy(p1);

-		Assert.assertEquals("3.0.2",s1.getSitePolicy(),p1);

-		

-		ISiteEntry s2 = cfig.createSiteEntry(u2,p1);

-		Assert.assertEquals("3.1.0",s2.getURL(),u2);

-		Assert.assertEquals("3.1.1",s2.getSitePolicy(),p1);

-		s2.setSitePolicy(p2);

-		Assert.assertEquals("3.1.2",s2.getSitePolicy(),p2);

-		

-		// configure site tests

-		Assert.assertEquals("3.3.0",cfig.getConfiguredSites().length,0);

-		cfig.configureSite(s1);

-		Assert.assertEquals("3.3.1",cfig.getConfiguredSites().length,1);

-		cfig.configureSite(s2);

-		Assert.assertEquals("3.3.2",cfig.getConfiguredSites().length,2);

-		

-		// lookup site tests

-		Assert.assertEquals("3.4.0",cfig.findConfiguredSite(u1),s1);

-		Assert.assertEquals("3.4.1",cfig.findConfiguredSite(u2),s2);

-		Assert.assertNull("3.4.3",cfig.findConfiguredSite(u4));

-		

-		// unconfigure site tests

-		cfig.unconfigureSite(s1);

-		Assert.assertEquals("3.5.0",cfig.getConfiguredSites().length,1);

-		Assert.assertNull("3.5.1",cfig.findConfiguredSite(u1));		

-		cfig.unconfigureSite(s2);

-		Assert.assertEquals("3.5.2",cfig.getConfiguredSites().length,0);

-		Assert.assertNull("3.5.3",cfig.findConfiguredSite(u2));	

-	}

-	

-	public void testSaveRestore() throws Exception {

-				

-		Assert.assertNotNull("0.0 Unable to obtain temp directory",tempDir);

-		

-		// get new config object

-		IPlatformConfiguration cfig = null;

-		try {

-			cfig = BootLoader.getPlatformConfiguration(null);

-		} catch (IOException e) {

-			Assert.fail("0.0.0 "+e.toString());

-		}

-		ISiteEntry[] sites = cfig.getConfiguredSites();

-		Assert.assertEquals("0.0.1",sites.length,0);

-				

-		// create policies

-		ISitePolicy p1 = cfig.createSitePolicy(ISitePolicy.USER_INCLUDE, null);

-		ISitePolicy p2 = cfig.createSitePolicy(ISitePolicy.USER_EXCLUDE, new String[0]);		

-		ISitePolicy p3 = cfig.createSitePolicy(ISitePolicy.USER_INCLUDE, new String[] {"first"});

-		ISitePolicy p4 = cfig.createSitePolicy(ISitePolicy.USER_EXCLUDE, new String[] {"first", "second"});

-						

-		// create some urls

-		URL u1 = null;

-		URL u2 = null;

-		URL u3 = null;

-		URL u4 = null;

-

-		try {

-			u1 = new URL("file:d:/temp/");

-			u2 = new URL("file://localhost/temp/");

-			u3 = new URL("http://some.server/temp/");

-			u4 = new URL("http://another.server/temp/");

-			new URL("http://one.more.server/temp/");

-		} catch (MalformedURLException e) {

-			Assert.fail("1.0 unable to create URL "+e);

-		}

-		

-		// create and configure sites

-		ISiteEntry s1 = cfig.createSiteEntry(u1,p1);

-		cfig.configureSite(s1);

-		ISiteEntry s2 = cfig.createSiteEntry(u2,p2);

-		cfig.configureSite(s2);

-		ISiteEntry s3 = cfig.createSiteEntry(u3,p3);

-		cfig.configureSite(s3);

-		ISiteEntry s4 = cfig.createSiteEntry(u4,p4);

-		cfig.configureSite(s4);

-		sites = cfig.getConfiguredSites();

-		Assert.assertEquals("1.1",sites.length,4);

-		

-		// do save

-		try {

-			cfig.save();

-			Assert.fail("2.0 was expecting IOException");

-		} catch (IOException e) {

-		}

-		

-		URL cfigURL = null;

-		try {

-			cfigURL = new URL("file:"+tempDir+(new Date()).getTime()+"_platform.cfg");

-		} catch(MalformedURLException e) {

-			Assert.fail("2.1 unable to create URL "+e);

-		}

-		

-		try {

-			cfig.save(cfigURL);

-		} catch (IOException e) {

-			Assert.fail("2.2 "+e);

-		}

-		

-		// reload configuration	

-		try {

-			BootLoader.getPlatformConfiguration(cfigURL);

-		} catch (IOException e) {

-			Assert.fail("2.3 "+e.toString());

-		}

-		ISiteEntry[] newSites = cfig.getConfiguredSites();

-		Assert.assertEquals("2.4",newSites.length,4);

-		

-		// check what we've got

-		Assert.assertEquals("3.0.1",sites[0].getURL(),newSites[0].getURL());

-		Assert.assertEquals("3.0.2",sites[0].getSitePolicy().getType(),newSites[0].getSitePolicy().getType());

-		Assert.assertEquals("3.0.3",sites[0].getSitePolicy().getList(),newSites[0].getSitePolicy().getList());

-		

-		Assert.assertEquals("3.1.1",sites[1].getURL(),newSites[1].getURL());

-		Assert.assertEquals("3.1.2",sites[1].getSitePolicy().getType(),newSites[1].getSitePolicy().getType());

-		Assert.assertEquals("3.1.3",sites[1].getSitePolicy().getList(),newSites[1].getSitePolicy().getList());

-		

-		Assert.assertEquals("3.2.1",sites[2].getURL(),newSites[2].getURL());

-		Assert.assertEquals("3.2.2",sites[2].getSitePolicy().getType(),newSites[2].getSitePolicy().getType());

-		Assert.assertEquals("3.2.3",sites[2].getSitePolicy().getList(),newSites[2].getSitePolicy().getList());

-		

-		Assert.assertEquals("3.3.1",sites[3].getURL(),newSites[3].getURL());

-		Assert.assertEquals("3.3.2",sites[3].getSitePolicy().getType(),newSites[3].getSitePolicy().getType());

-		Assert.assertEquals("3.3.3",sites[3].getSitePolicy().getList(),newSites[3].getSitePolicy().getList());

-		

-	}

-	

-	public void testCurrentConfiguration() throws Exception {

-				

-		Assert.assertNotNull("0.0 Unable to obtain temp directory",tempDir);

-		

-		// get new config object

-		IPlatformConfiguration cfig = null;

-		cfig = BootLoader.getCurrentPlatformConfiguration();

-		cfig.getPluginPath();

-		cfig.save();

-	}

-}

-

diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/core/boot/TestPlatCfgDefault.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/core/boot/TestPlatCfgDefault.java
deleted file mode 100644
index e303fb0..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/core/boot/TestPlatCfgDefault.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2000, 2003 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials 

- * are made available under the terms of the Common Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/cpl-v10.html

- * 

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-package org.eclipse.update.tests.core.boot;

-

-import org.eclipse.core.boot.BootLoader;

-import org.eclipse.core.boot.IPlatformConfiguration;

-import org.eclipse.core.boot.IPlatformConfiguration.ISiteEntry;

-import org.eclipse.core.boot.IPlatformConfiguration.ISitePolicy;

-

-public class TestPlatCfgDefault

-	extends PlatformConfigurationTestCase {

-		

-	public TestPlatCfgDefault(String arg0) {

-		super(arg0);

-	}

-	

-	public void testInitial() throws Exception {

-		IPlatformConfiguration cfig = null;

-		cfig = BootLoader.getCurrentPlatformConfiguration();

-		ISiteEntry se = cfig.getConfiguredSites()[0];

-		ISitePolicy sp = cfig.createSitePolicy(ISitePolicy.USER_EXCLUDE, new String[] {"1", "2","3","4","5","6","7","8","9","10","11","12"});

-		se.setSitePolicy(sp);

-		cfig.save();

-		System.out.println("done ...");

-	}

-}

-

diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/implementation/SiteFTP.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/implementation/SiteFTP.java
deleted file mode 100644
index 9f70081..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/implementation/SiteFTP.java
+++ /dev/null
@@ -1,276 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2000, 2003 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials 

- * are made available under the terms of the Common Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/cpl-v10.html

- * 

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-package org.eclipse.update.tests.implementation;

-

-import java.io.InputStream;

-import java.net.URL;

-

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.update.configuration.*;

-import org.eclipse.update.core.*;

-import org.eclipse.update.core.IFeature;

-import org.eclipse.update.core.IFeatureReference;

-import org.eclipse.update.core.IPluginEntry;

-import org.eclipse.update.core.*;

-import org.eclipse.update.core.*;

-import org.eclipse.update.core.*;

-import org.eclipse.update.core.*;

-import org.eclipse.update.core.*;

-import org.eclipse.update.core.IURLEntry;

-import org.eclipse.update.core.model.InstallAbortedException;

-import org.eclipse.update.internal.core.*;

-

-public class SiteFTP implements ISite {

-

-	private URL url;

-	public SiteFTP(URL url){

-		this.url = url;

-	}

-

-	/*

-	 * @see ISite#getFeatureReferences()

-	 */

-	public ISiteFeatureReference[] getFeatureReferences() {

-		return null;

-	}

-

-	/*

-	 * @see ISite#install(IFeature, FeatureVerification verifier,IProgressMonitor)

-	 */

-	public IFeatureReference install(IFeature feature,IVerificationListener verificationListener, IProgressMonitor monitor) throws CoreException {

-		return null;

-	}

-

-	/*

-	 * @see ISite#remove(IFeature, IProgressMonitor)

-	 */

-	public void remove(IFeature feature, IProgressMonitor monitor) throws CoreException {

-	}

-

-	/*

-	 * @see ISite#addSiteChangedListener(IConfiguredSiteChangedListener)

-	 */

-	public void addSiteChangedListener(IConfiguredSiteChangedListener listener) {

-	}

-

-	/*

-	 * @see ISite#removeSiteChangedListener(IConfiguredSiteChangedListener)

-	 */

-	public void removeSiteChangedListener(IConfiguredSiteChangedListener listener) {

-	}

-

-	/*

-	 * @see ISite#getURL()

-	 */

-	public URL getURL() {

-		return url;

-	}

-

-	/*

-	 * @see ISite#getType()

-	 */

-	public String getType() {

-		return "org.eclipse.update.tests.ftp";

-	}

-

-	/*

-	 * @see ISite#getCategories()

-	 */

-	public ICategory[] getCategories() {

-		return null;

-	}

-

-	/*

-	 * @see ISite#getArchives()

-	 */

-	public IArchiveReference[] getArchives() {

-		return null;

-	}

- 

-	/*

-	 * @see ISite#addCategory(ICategory)

-	 */

-	public void addCategory(ICategory category) {

-	}

-

-	/*

-	 * @see ISite#save()

-	 */

-	public void save() throws CoreException {

-	}

-

-	/*

-	 * @see IPluginContainer#getPluginEntries()

-	 */

-	public IPluginEntry[] getPluginEntries() {

-		return null;

-	}

-

-	/*

-	 * @see IPluginContainer#getPluginEntryCount()

-	 */

-	public int getPluginEntryCount() {

-		return 0;

-	}

-

-	/*

-	 * @see ISite#getDownloadSizeFor(IFeature)

-	 */

-	public long getDownloadSizeFor(IFeature feature) {

-		return 0;

-	}

-

-	/*

-	 * @see ISite#getInstallSizeFor(IFeature)

-	 */

-	public long getInstallSizeFor(IFeature feature) {

-		return 0;

-	}

-

-

-	/*

-	 * @see IPluginContainer#store(IPluginEntry, String, InputStream)

-	 */

-	public void store(IPluginEntry entry, String name, InputStream inStream) throws CoreException {

-	}

-

-	/*

-	 * @see IAdaptable#getAdapter(Class)

-	 */

-	public Object getAdapter(Class adapter) {

-		return null;

-	}

-

-	/*

-	 * @see IPluginContainer#remove(IPluginEntry)

-	 */

-	public void remove(IPluginEntry entry) throws CoreException {

-	}

-

-	/*

-	 * @see ISite#setSiteContentConsumer(ISiteContentConsumer)

-	 */

-	public void setSiteContentConsumer(ISiteContentConsumer contentConsumer) {

-	}

-

-	/*

-	 * @see ISite#setSiteContentProvider(ISiteContentProvider)

-	 */

-	public void setSiteContentProvider(ISiteContentProvider siteContentProvider) {

-	}

-

-	/*

-	 * @see ISite#getSiteContentProvider()

-	 */

-	public ISiteContentProvider getSiteContentProvider() {

-		return null;

-	}

-

-	/*

-	 * @see ISite#getDefaultPackagedFeatureType()

-	 */

-	public String getDefaultPackagedFeatureType() {

-		return null;

-	}

-

-	/*

-	 * @see ISite#store(IFeature, String, InputStream, IProgressMonitor)

-	 */

-	public void store(IFeature feature, String name, InputStream inStream, IProgressMonitor monitor) throws CoreException {

-	}

-

-

-	/*

-	 * @see IPluginContainer#remove(IPluginEntry, IProgressMonitor)

-	 */

-	public void remove(IPluginEntry entry, IProgressMonitor monitor) throws CoreException {

-	}

-

-	/*

-	 * @see ISite#getCategory(String)

-	 */

-	public ICategory getCategory(String key) {

-		return null;

-	}

-

-	/*

-	 * @see ISite#createSiteContentConsumer(IFeature)

-	 */

-	public ISiteContentConsumer createSiteContentConsumer(IFeature feature) throws CoreException {

-		return null;

-	}

-

-	/*

-	 * @see ISite#getFeatureReference(IFeature)

-	 */

-	public ISiteFeatureReference getFeatureReference(IFeature feature) {

-		return null;

-	}

-

-	/*

-	 * @see ISite#getDescription()

-	 */

-	public IURLEntry getDescription() {

-		return null;

-	}

-

-	/*

-	 * @see ISite#getPluginEntriesOnlyReferencedBy(IFeature)

-	 */

-	public IPluginEntry[] getPluginEntriesOnlyReferencedBy(IFeature feature) throws CoreException {

-		return null;

-	}

-

-	/**

-	 * @see ISite#addPluginEntry(IPluginEntry)

-	 */

-	public void addPluginEntry(IPluginEntry pluginEntry) {

-	}

-

-	/**

-	 * @see org.eclipse.update.core.ISite#install(IFeature, IFeatureReference[], IVerificationListener, IProgressMonitor)

-	 */

-	public IFeatureReference install(IFeature feature, IFeatureReference[] optionalfeatures, IVerificationListener verificationListener, IProgressMonitor monitor) throws InstallAbortedException, CoreException {

-		return null;

-	}

-

-	/**

-	 * @see org.eclipse.update.core.ISite#getConfiguredSite()

-	 */

-	public IConfiguredSite getCurrentConfiguredSite() {

-		return null;

-	}

-

-	/**

-	 * @see org.eclipse.update.core.ISite#createFeature(String, URL)

-	 */

-	public IFeature createFeature(String type, URL url) throws CoreException {

-		return null;

-	}

-

-	/**

-	 * @see org.eclipse.update.core.ISite#createFeature(java.lang.String, java.net.URL, org.eclipse.core.runtime.IProgressMonitor)

-	 */

-	public IFeature createFeature(String type, URL url, IProgressMonitor monitor) throws CoreException {

-		return null;

-	}

-

-

-	/**

-	 * @see org.eclipse.update.core.ISite#getRawFeatureReferences()

-	 */

-	public ISiteFeatureReference[] getRawFeatureReferences() {

-		return null;

-	}

-

-

-}

diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/implementation/SiteFTPFactory.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/implementation/SiteFTPFactory.java
deleted file mode 100644
index 03cb986..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/implementation/SiteFTPFactory.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2000, 2003 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials 

- * are made available under the terms of the Common Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/cpl-v10.html

- * 

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-package org.eclipse.update.tests.implementation;

-import java.io.IOException;

-import java.io.InputStream;

-import java.net.MalformedURLException;

-import java.net.URL;

-

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.update.core.*;

-import org.eclipse.update.core.model.*;

-import org.eclipse.update.internal.core.URLEncoder;

-

-public class SiteFTPFactory extends SiteModelFactory implements ISiteFactory {

-

-	public static final String FILE = "a/b/c/";

-

-	/*

-	 * @see ISiteFactory#createSite(URL, boolean)

-	 */

-	public ISite createSite(URL url)

-		throws CoreException, InvalidSiteTypeException {

-		ISite site = null;

-		InputStream siteStream = null;

-

-		try {

-			URL resolvedURL = URLEncoder.encode(url);

-			siteStream = resolvedURL.openStream();

-

-			SiteModelFactory factory = (SiteModelFactory) this;

-			factory.parseSite(siteStream);

-

-			site = new SiteFTP(new URL("http://eclipse.org/" + FILE));

-			

-		} catch (MalformedURLException e) {

-			throw Utilities.newCoreException("Unable to create URL", e);

-		} catch (IOException e) {

-			throw Utilities.newCoreException("Unable to access URL",ISite.SITE_ACCESS_EXCEPTION, e);

-		} finally {

-			try {

-				siteStream.close();

-			} catch (Exception e) {

-			}

-		}

-		return site;

-	}

-

-	/*

-	 * @see SiteModelFactory#canParseSiteType(String)

-	 */

-	public boolean canParseSiteType(String type) {

-		return "org.eclipse.update.tests.core.ftp".equalsIgnoreCase(type);

-	}

-

-}

diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/model/AllModelTests.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/model/AllModelTests.java
deleted file mode 100644
index dad8de5..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/model/AllModelTests.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2000, 2003 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials 

- * are made available under the terms of the Common Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/cpl-v10.html

- * 

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-package org.eclipse.update.tests.model;

-import junit.framework.Test;

-import junit.framework.TestSuite;

-

-import org.eclipse.update.tests.UpdateManagerTestCase;

-

-/**

- * Manages the API tests

- */

-public class AllModelTests extends UpdateManagerTestCase {

-	/**

-	 * Constructor

-	 */

-	public AllModelTests(String name) {

-		super(name);

-	}

-	

-	/**

-	 * List of API tests

-	 */

-	public static Test suite() throws Exception {

-		TestSuite suite = new TestSuite();

-		suite.setName("Model Tests");

-

-		suite.addTest(new TestSuite(FeatureMain.class));

-		suite.addTest(new TestSuite(SiteMain.class));		

-

-		return suite;

-	}

-}

diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/model/FeatureMain.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/model/FeatureMain.java
deleted file mode 100644
index 4ec15e7..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/model/FeatureMain.java
+++ /dev/null
@@ -1,186 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2000, 2003 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials 

- * are made available under the terms of the Common Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/cpl-v10.html

- * 

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-package org.eclipse.update.tests.model;

-

-import java.io.*;

-import java.net.URL;

-import java.util.ResourceBundle;

-

-import org.eclipse.update.core.model.*;

-import org.eclipse.update.tests.UpdateManagerTestCase;

-

-public class FeatureMain extends UpdateManagerTestCase {

-

-	public FeatureMain(String testcase){

-		super(testcase);

-	}

-

-	public void testMain() throws Exception {

-		

-		FeatureModelFactory factory = new FeatureModelFactory();

-		InputStream is = null;

-		FeatureModel feature = null;

-		PrintWriter w = new PrintWriter(System.out);

-		

-		w.println("Parsing feature ...");

-		try {

-			is = FeatureMain.class.getResourceAsStream("feature.xml");		

-			feature = factory.parseFeature(is);

-		} finally {

-			if (is != null) {

-				try { is.close();} catch(IOException e) {}

-			}

-		}

-		

-		String base = "http://another.server/feature.xml";

-		w.println("Resolving feature using "+base+" ...");

-		ResourceBundle bundle = null;

-		bundle = ResourceBundle.getBundle("org/eclipse/update/tests/model/test");

-		feature.resolve(new URL(base), new URL(base));

-				

-		w.close();

-	}

-	

-	private static void writeFeature(PrintWriter w, int level, FeatureModel feature) {

-		if (feature == null) return;

-		

-		String in = getIndent(level);

-		w.println(in+"<?xml version=\"1.0\" encoding=\"UTF-8\"?>");

-		

-		w.println(in+"<feature");

-		w.println(in+"   "+"id=\""+feature.getFeatureIdentifier()+"\"");

-		w.println(in+"   "+"version=\""+feature.getFeatureVersion()+"\"");

-		w.println(in+"   "+"label=\""+feature.getLabel()+"\"");

-		w.println(in+"   "+"provider-name=\""+feature.getProvider()+"\"");

-		w.println(in+"   "+"image=\""+feature.getImageURLString()+"\" -> "+feature.getImageURL());

-		w.println(in+"   "+"os=\""+feature.getOS()+"\"");

-		w.println(in+"   "+"ws=\""+feature.getWS()+"\"");

-		w.println(in+"   "+"nl=\""+feature.getNL()+"\"");

-		w.println(in+"   "+"application=\""+feature.getApplication()+"\"");

-		w.println(in+"   "+">");

-		

-		writeDescription(w, level+1, feature.getDescriptionModel());

-		writeCopyright(w, level+1, feature.getCopyrightModel());

-		writeLicense(w, level+1, feature.getLicenseModel());

-		writeURLs(w, level+1, feature);

-		writePrereqs(w, level+1, feature);

-		writePluginEntries(w, level+1, feature);

-		writeNonPluginEntries(w, level+1, feature);

-		         

-        w.println(in+"</feature>");

-	}

-	

-	private static void writeDescription(PrintWriter w, int level, URLEntryModel ue) {

-		String in = getIndent(level);

-		w.println("");

-		w.println(in+"<description url=\""+ue.getURLString()+"\" -> "+ue.getURL()+">");

-		w.println(in+ue.getAnnotation());

-		w.println(in+"</description>");

-	}

-	

-	private static void writeCopyright(PrintWriter w, int level, URLEntryModel ue) {

-		String in = getIndent(level);

-		w.println("");

-		w.println(in+"<copyright url=\""+ue.getURLString()+"\" -> "+ue.getURL()+">");

-		w.println(in+ue.getAnnotation());

-		w.println(in+"</copyright>");

-	}

-	

-	private static void writeLicense(PrintWriter w, int level, URLEntryModel ue) {

-		String in = getIndent(level);

-		w.println("");

-		w.println(in+"<license url=\""+ue.getURLString()+"\" -> "+ue.getURL()+">");

-		w.println(in+ue.getAnnotation());

-		w.println(in+"</license>");

-	}

-	

-	private static void writeURLs(PrintWriter w, int level, FeatureModel feature) {

-		String in = getIndent(level);

-		String in2 = getIndent(level+1);

-		w.println("");

-		w.println(in+"<url>");

-		

-		URLEntryModel update = feature.getUpdateSiteEntryModel();

-		w.println(in2+"<update");

-		w.println(in2+"   "+"url=\""+update.getURLString()+"\" -> "+update.getURL());

-		w.println(in2+"   "+"label=\""+update.getAnnotation()+"\"");

-		w.println(in2+"   "+"/>");

-		

-		URLEntryModel[] discovery = feature.getDiscoverySiteEntryModels();

-		for (int i=0; i<discovery.length; i++) {

-			w.println(in2+"<discovery");

-			w.println(in2+"   "+"url=\""+discovery[i].getURLString()+"\" -> "+discovery[i].getURL());

-			w.println(in2+"   "+"label=\""+discovery[i].getAnnotation()+"\"");

-			w.println(in2+"   "+"/>");

-		}

-		

-		w.println(in+"</url>");

-	}

-	

-	private static void writePrereqs(PrintWriter w, int level, FeatureModel feature) {

-		String in = getIndent(level);

-		String in2 = getIndent(level+1);

-		w.println("");

-		w.println(in+"<requires>");

-		

-		ImportModel[] imp = feature.getImportModels();

-		for (int i=0; i<imp.length; i++) {

-			w.println(in2+"<import");

-			w.println(in2+"   "+"plugin=\""+imp[i].getIdentifier()+"\"");

-			w.println(in2+"   "+"version=\""+imp[i].getVersion()+"\"");

-			w.println(in2+"   "+"match=\""+imp[i].getMatchingRuleName()+"\"");

-			w.println(in2+"   "+"/>");

-		}

-		

-		w.println(in+"</requires>");

-	}

-	

-	private static void writePluginEntries(PrintWriter w, int level, FeatureModel feature) {

-		String in = getIndent(level);

-		w.println("");

-		

-		PluginEntryModel[] plugin = feature.getPluginEntryModels();

-		for (int i=0; i<plugin.length; i++) {

-			w.println(in+"<plugin");

-			w.println(in+"   "+"id=\""+plugin[i].getPluginIdentifier()+"\"");

-			w.println(in+"   "+"version=\""+plugin[i].getPluginVersion()+"\"");

-			w.println(in+"   "+"fragment=\""+plugin[i].isFragment()+"\"");

-			w.println(in+"   "+"os=\""+plugin[i].getOS()+"\"");

-			w.println(in+"   "+"ws=\""+plugin[i].getWS()+"\"");

-			w.println(in+"   "+"nl=\""+plugin[i].getNL()+"\"");

-			w.println(in+"   "+"download-size=\""+plugin[i].getDownloadSize()+"\"");

-			w.println(in+"   "+"install-size=\""+plugin[i].getInstallSize()+"\"");

-			w.println(in+"   "+"/>");

-		}

-	}

-	

-	private static void writeNonPluginEntries(PrintWriter w, int level, FeatureModel feature) {

-		String in = getIndent(level);

-		w.println("");

-		

-		NonPluginEntryModel[] data = feature.getNonPluginEntryModels();

-		for (int i=0; i<data.length; i++) {

-			w.println(in+"<data");

-			w.println(in+"   "+"id=\""+data[i].getIdentifier()+"\"");

-			w.println(in+"   "+"download-size=\""+data[i].getDownloadSize()+"\"");

-			w.println(in+"   "+"install-size=\""+data[i].getInstallSize()+"\"");

-			w.println(in+"   "+"/>");

-		}

-	}

-	

-	

-	private static String getIndent(int level) {

-		String indent = "";

-		for (int i=0; i<level; i++) 

-			indent += "   ";

-		return indent;

-	}

-}

diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/model/SiteMain.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/model/SiteMain.java
deleted file mode 100644
index 890837d..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/model/SiteMain.java
+++ /dev/null
@@ -1,155 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2000, 2003 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials 

- * are made available under the terms of the Common Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/cpl-v10.html

- * 

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-package org.eclipse.update.tests.model;

-

-import java.io.*;

-import java.net.URL;

-

-import org.eclipse.update.core.SiteFeatureReferenceModel;

-import org.eclipse.update.core.model.*;

-import org.eclipse.update.tests.UpdateManagerTestCase;

-

-public class SiteMain extends UpdateManagerTestCase {

-	

-	public SiteMain(String name){

-		super(name);

-	}

-

-	public void testMain() throws Exception {

-		

-		PrintWriter w = new PrintWriter(System.out);

-		process("site_old_format.xml",w);

-		process("site.xml",w);

-		try {

-			process("site_with_type.xml",w);

-			fail("InvalidSiteTypeException not thrown");

-		} catch (InvalidSiteTypeException e) {

-			assertEquals(e.getNewType(),"some.other.site.type");

-		} finally {

-			w.close();

-		}

-	}

-	

-	private static void process(String xml, PrintWriter w) throws Exception {

-		

-		SiteModelFactory factory = new SiteModelFactory();

-		InputStream is = null;

-		SiteModel site = null;

-		

-		w.println("");

-		w.println("Parsing site map ...");

-		try {

-			is = SiteMain.class.getResourceAsStream(xml);		

-			site = factory.parseSite(is);

-		}  finally {

-			if (is != null) {

-				try { is.close();} catch(IOException e) {}

-			}

-		}

-		

-		if (site == null) return;

-		

-		String base = "http://another.server/site.xml";

-		w.println("Resolving site using "+base+" ...");

-		site.resolve(new URL(base), null);

-		

-		w.println("Writing site ...");

-		writeSite(w,0,site);

-	}

-	

-	private static void writeSite(PrintWriter w, int level, SiteModel site) {

-		if (site == null) return;

-		

-		String in = getIndent(level);

-		w.println(in+"<?xml version=\"1.0\" encoding=\"UTF-8\"?>");

-		

-		w.println(in+"<site");

-		w.println(in+"   "+"type=\""+site.getType()+"\"");

-		w.println(in+"   "+">");

-		

-		writeDescription(w, level+1, site.getDescriptionModel());

-		writeFeatures(w, level+1, site);

-		writeArchives(w, level+1, site);

-		writeCategoryDefs(w, level+1, site);

-         

-        w.println(in+"</feature>");

-	}

-	

-	private static void writeDescription(PrintWriter w, int level, URLEntryModel ue) {

-		if (ue == null) return;

-		String in = getIndent(level);

-		w.println("");

-		w.println(in+"<description url=\""+ue.getURLString()+"\" -> "+ue.getURL()+">");

-		w.println(in+ue.getAnnotation());

-		w.println(in+"</description>");

-	}

-	

-	private static void writeFeatures(PrintWriter w, int level, SiteModel site) {

-		String in = getIndent(level);

-		getIndent(level+1);

-		w.println("");

-		

-		SiteFeatureReferenceModel[] features = site.getFeatureReferenceModels();

-		for (int i=0; i<features.length; i++) {

-			w.println(in+"<feature");

-			w.println(in+"   "+"type=\""+features[i].getType()+"\"");

-			w.println(in+"   "+"url=\""+features[i].getURLString()+"\" -> "+features[i].getURL());

-			w.println(in+"   "+">");

-			writeCategories(w, level+1, features[i]);

-			w.println(in+"</feature>");

-		}

-	}

-	

-	private static void writeArchives(PrintWriter w, int level, SiteModel site) {

-		String in = getIndent(level);

-		w.println("");

-		

-		ArchiveReferenceModel[] archive = site.getArchiveReferenceModels();

-		for (int i=0; i<archive.length; i++) {

-			w.println(in+"<archive");

-			w.println(in+"   "+"path=\""+archive[i].getPath()+"\"");

-			w.println(in+"   "+"url=\""+archive[i].getURLString()+"\" -> "+archive[i].getURL());

-			w.println(in+"   "+"/>");

-		}

-	}

-	

-	private static void writeCategoryDefs(PrintWriter w, int level, SiteModel site) {

-		String in = getIndent(level);

-		getIndent(level+1);

-		w.println("");

-		

-		CategoryModel[] cat = site.getCategoryModels();

-		for (int i=0; i<cat.length; i++) {

-			w.println(in+"<category-def");

-			w.println(in+"   "+"name=\""+cat[i].getName()+"\"");

-			w.println(in+"   "+"label=\""+cat[i].getLabel()+"\"");

-			w.println(in+"   "+">");

-			writeDescription(w, level+1, cat[i].getDescriptionModel());

-			w.println(in+"</category-def>");

-		}

-	}

-	

-	private static void writeCategories(PrintWriter w, int level, SiteFeatureReferenceModel feature) {

-		String in = getIndent(level);

-		String[] cat = feature.getCategoryNames();

-		for (int i=0; i<cat.length; i++) {

-			w.println(in+"<category name=\""+cat[i]+"\"");

-		}

-	}

-	

-	private static String getIndent(int level) {

-		String indent = "";

-		for (int i=0; i<level; i++) 

-			indent += "   ";

-		return indent;

-	}

-}

-

diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/model/feature.xml b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/model/feature.xml
deleted file mode 100644
index 1db9650..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/model/feature.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<feature id="my.feature" version="3.7.1" label="%s1" provider-name="VK Inc."

-         image="images/feature.gif" os="Win32" ws="Win32" nl="en_CA,en_US"

-         application="org.eclipse.ui.workbench">

-

-   <install-handler url="install/handler.html" library="custom.jar" class="InstallHandler"/>

-   

-   <description url="http://www.tools.com/features/my.feature">

-      Description of my.feature

-   </description>

-   

-   <copyright url="copyright/my.feature">

-      Copyright for my.feature

-   </copyright>

-   

-   <license url="%url1">

-      License for my.feature

-   </license>

-   

-   <url>

-      <update url="http://www.tools.com/update" label="Update site"/>

-      <discovery url="http://www.tools.com/discovery1" label="%s2"/>

-      <discovery url="%url2" label="%s3 Discovery site 2"/>

-      <discovery url="%url3 http://www.tools.com/discovery3" label="Discovery site 3"/>

-   </url>

-   

-   <requires>

-      <import plugin="plugin.1" version="1.0.0" match="perfect"/>

-      <import plugin="plugin.2" version="3.2.0"/>

-      <import plugin="plugin.3"/>

-   </requires>

-   

-   <plugin id="my.plugin.1" version="1.0.0" fragment="true"

-           os="Win32" ws="Win32" nl="en_US" download-size="23456" install-size="1234567"/>

-   <plugin id="my.plugin.2" version="1.0.1"/>

-   <plugin id="my.plugin.3" version="1.0.2"/>

-   

-   <data id="examples.zip" download-size="23456" install-size="1234567"/>

-   <data id="custom/rt.jar"/>

-

-</feature>
\ No newline at end of file
diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/model/site.xml b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/model/site.xml
deleted file mode 100644
index 7516f26..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/model/site.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<site>

-

-   <description url="http://www.tools.com/updateSite">

-      Site description

-   </description>

-

-   <feature type="my.feature.type" url="feature1.jar">

-      <category name="tools"/>

-      <category name="utilities"/>

-      <category name="windows.tools"/>

-   </feature>

-   

-   <feature type="" url="file:/feature2.jar">

-      <category name="utilities"/>

-   </feature>

-   

-   

-   <archive path="first/archive" url="archive1.jar"/>

-   <archive path="second/archive" url="archive2.jar"/>

-   

-   <category-def name="tools" label="Development Tools">

-      <description url="http://www.tools.com/tools">

-         This is description for tools

-      </description>

-   </category-def>

-   

-   <category-def name="utilities" label="Utilities">

-      <description url="tools.html"/>/

-   </category-def>

-   

-   <category-def name="windows.tools" label="Windows Development Tools"/>

-

-</site>
\ No newline at end of file
diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/model/site_old_format.xml b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/model/site_old_format.xml
deleted file mode 100644
index dd10ef7..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/model/site_old_format.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<site url="www.tools.com/updateSite">

-

-   <feature type="my.feature.type" url="feature1.jar">

-      <category name="tools"/>

-      <category name="utilities"/>

-      <category name="windows.tools"/>

-   </feature>

-   

-   <feature type="" url="feature2.jar">

-      <category name="utilities"/>

-   </feature>

-  

-   <archive path="first/archive" url="archive1.jar"/>

-   <archive path="second/archive" url="archive2.jar"/>

-   

-   <category-def name="tools" label="Development Tools">

-      <description url="http://www.tools.com/tools">

-         This is description for tools

-      </description>

-   </category-def>

-   

-   <category-def name="utilities" label="Utilities">

-      <description url="utilities.html"/>

-   </category-def>

-   

-   <category-def name="windows.tools" label="Windows Development Tools"/>

-

-</site>
\ No newline at end of file
diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/model/site_with_type.xml b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/model/site_with_type.xml
deleted file mode 100644
index 2ee3a3f..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/model/site_with_type.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<site url="http://www.tools.com/updateSite" type="some.other.site.type">

-

-</site>
\ No newline at end of file
diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/model/test.properties b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/model/test.properties
deleted file mode 100644
index 4201818..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/model/test.properties
+++ /dev/null
@@ -1,14 +0,0 @@
-###############################################################################

-# Copyright (c) 2000, 2003 IBM Corporation and others.

-# All rights reserved. This program and the accompanying materials 

-# are made available under the terms of the Common Public License v1.0

-# which accompanies this distribution, and is available at

-# http://www.eclipse.org/legal/cpl-v10.html

-# 

-# Contributors:

-#     IBM Corporation - initial API and implementation

-###############################################################################

-s1 = String 1

-s2 = String 2

-url1 = relative/index.html

-url2 = http://some.server/tools.html

diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/nativeTests/TestLocalSystemInfo.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/nativeTests/TestLocalSystemInfo.java
deleted file mode 100644
index ffcccbd..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/nativeTests/TestLocalSystemInfo.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.update.tests.nativeTests;
-import java.io.File;
-
-import org.eclipse.update.configuration.IVolume;
-import org.eclipse.update.configuration.LocalSystemInfo;
-import org.eclipse.update.tests.UpdateManagerTestCase;
-
-public class TestLocalSystemInfo extends UpdateManagerTestCase {
-
-	/**
-	 * Test the natives
-	 */
-	public TestLocalSystemInfo(String arg0) {
-		super(arg0);
-	}
-
-	public void testNative() throws Exception {
-	
-		// mount point
-       IVolume[] a = LocalSystemInfo.getVolumes();
-        if (a==null) throw new Exception("cannot find native library");
-		System.out.println("Found "+a.length+" mount points.");
-		for (int i =0; i<a.length;i++){
-			System.out.print("#"+i+" - "+a[i]);
-			
-			File root = a[i].getFile();
-			String label = a[i].getLabel();
-			if (label==null) label="NO LABEL";
-			int type = a[i].getType();
-			long size = LocalSystemInfo.getFreeSpace(root);
-			System.out.println(" ->:"+label+":"+getType(type)+":"+getSize(size));
-		}
-	}
-	
-	private String getType(int type){
-		switch (type) {
-			case LocalSystemInfo.VOLUME_FIXED :
-				return "VOLUME FIXED";
-			case LocalSystemInfo.VOLUME_REMOTE :
-				return "VOLUME REMOTE";
-			case LocalSystemInfo.VOLUME_REMOVABLE :
-				return "VOLUME REMOVABLE";
-			case LocalSystemInfo.VOLUME_CDROM :
-				return "VOLUME CDROM";				
-			case LocalSystemInfo.VOLUME_UNKNOWN :
-				return "VOLUME UNKNOWN";
-			default :
-				return "WRONG VOLUME INFO";
-		}
-	}
-	
-	private String getSize(long size){
-		if (size==LocalSystemInfo.SIZE_UNKNOWN) return "UNKNOWN SIZE";
-		
-		long kb = size/(1024*1024);
-		return new String(size+" ("+kb+"MB)");
-	}
-}
diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/nestedfeatures/AllNestedTests.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/nestedfeatures/AllNestedTests.java
deleted file mode 100644
index dc233c0..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/nestedfeatures/AllNestedTests.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.update.tests.nestedfeatures;
-import org.eclipse.update.tests.UpdateManagerTestCase;
-import junit.framework.*;
-
-public class AllNestedTests extends UpdateManagerTestCase {
-public AllNestedTests(String name) {
-	super(name);
-}
-public static Test suite() {
-	TestSuite suite = new TestSuite();
-	suite.setName("Nested Install Tests");
-	
-	// the following will take all teh test methods in teh class that start with 'test'
-
-	suite.addTest(new TestSuite(TestInstall.class));
-
-	// or you can specify the method
-	//suite.addTest(new TestGetFeature("methodThatDoesNotStartWithtest"));	
-	
-	return suite;
-}
-}
diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/nestedfeatures/TestInstall.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/nestedfeatures/TestInstall.java
deleted file mode 100644
index 6325657..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/nestedfeatures/TestInstall.java
+++ /dev/null
@@ -1,294 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.update.tests.nestedfeatures;
-import java.io.File;
-import java.net.URL;
-
-import org.eclipse.update.configuration.IConfiguredSite;
-import org.eclipse.update.configuration.ILocalSite;
-import org.eclipse.update.core.*;
-import org.eclipse.update.internal.core.*;
-import org.eclipse.update.tests.UpdateManagerTestCase;
-
-public class TestInstall extends UpdateManagerTestCase {
-
-	/**
-	 * Constructor for Test1
-	 */
-	public TestInstall(String arg0) {
-		super(arg0);
-	}
-
-	public void testFileSite() throws Exception {
-
-		ISite remoteSite =
-			SiteManager.getSite(new URL(SOURCE_FILE_SITE, "nestedFeatureSiteTest/site.xml"));
-		IFeature remoteFeature = remoteSite.getFeatureReferences()[0].getFeature();
-		ISite localSite = SiteManager.getSite(TARGET_FILE_SITE);
-		localSite.install(remoteFeature, null, null);
-
-		// verify root Feature
-		String site = localSite.getURL().getFile();
-		IPluginEntry[] entries = remoteFeature.getPluginEntries();
-		assertTrue("no plugins entry", (entries != null && entries.length != 0));
-		String pluginName = entries[0].getVersionedIdentifier().toString();
-		File pluginFile = new File(site, Site.DEFAULT_PLUGIN_PATH + pluginName);
-		assertTrue(
-			"plugin files not installed locally:" + pluginFile,
-			pluginFile.exists());
-		File pluginXMLFile =
-			new File(
-				site,
-				Site.DEFAULT_PLUGIN_PATH + pluginName + File.separator + "plugin.xml");
-		assertTrue("plugin.xml file not installed locally", pluginXMLFile.exists());
-
-		File featureFile =
-			new File(
-				site,
-				Site.DEFAULT_INSTALLED_FEATURE_PATH
-					+ remoteFeature.getVersionedIdentifier().toString());
-		assertTrue(
-			"feature info not installed locally:" + featureFile,
-			featureFile.exists());
-
-		// clean plugins & feature
-		for (int i = 0; i < entries.length; i++) {
-			pluginName = entries[0].getVersionedIdentifier().toString();
-			pluginFile = new File(site, Site.DEFAULT_PLUGIN_PATH + pluginName);
-			UpdateManagerUtils.removeFromFileSystem(pluginFile);
-		}
-		UpdateManagerUtils.removeFromFileSystem(featureFile);
-
-		// verify child Feature
-		IFeature childFeature =
-			remoteFeature.getIncludedFeatureReferences()[0].getFeature();
-		entries = childFeature.getPluginEntries();
-		assertTrue("no plugins entry", (entries != null && entries.length != 0));
-		pluginName = entries[0].getVersionedIdentifier().toString();
-		pluginFile = new File(site, Site.DEFAULT_PLUGIN_PATH + pluginName);
-		assertTrue(
-			"plugin files not installed locally:" + pluginFile,
-			pluginFile.exists());
-		pluginXMLFile =
-			new File(
-				site,
-				Site.DEFAULT_PLUGIN_PATH + pluginName + File.separator + "plugin.xml");
-		assertTrue("plugin.xml file not installed locally", pluginXMLFile.exists());
-
-		featureFile =
-			new File(
-				site,
-				Site.DEFAULT_INSTALLED_FEATURE_PATH
-					+ childFeature.getVersionedIdentifier().toString());
-		assertTrue(
-			"feature info not installed locally:" + featureFile,
-			featureFile.exists());
-
-		// clean plugins
-		for (int i = 0; i < entries.length; i++) {
-			pluginName = entries[0].getVersionedIdentifier().toString();
-			pluginFile = new File(site, Site.DEFAULT_PLUGIN_PATH + pluginName);
-			UpdateManagerUtils.removeFromFileSystem(pluginFile);
-		}
-
-		// clean features
-		UpdateManagerUtils.removeFromFileSystem(featureFile);
-		UpdateManagerUtils.removeFromFileSystem(new File(localSite.getURL().getFile()));
-	}
-
-	/**
-	 * 
-	 */
-	public void testHTTPSite() throws Exception {
-
-		ISite remoteSite =
-			SiteManager.getSite(new URL(SOURCE_HTTP_SITE, "nestedFeatureSiteTest/"));
-		IFeatureReference[] features = remoteSite.getFeatureReferences();
-		IFeature remoteFeature = null;
-
-		if (features == null || features.length == 0)
-			fail("No features on the site");
-
-		for (int i = 0; i < features.length; i++) {
-			if (features[i].getURL().toExternalForm().endsWith("rootfeature.jar")) {
-				remoteFeature = features[i].getFeature();
-				break;
-			}
-		}
-
-		assertNotNull("Cannot find rootfeature.jar on site", remoteFeature);
-		ISite localSite = SiteManager.getSite(TARGET_FILE_SITE);
-		localSite.install(remoteFeature, null, null);
-
-		// rootfeature.jar should not be in the local site
-		IFeatureReference[] localFeatures = localSite.getFeatureReferences();
-		if (localFeatures == null || localFeatures.length == 0)
-			fail("No features on the target site");
-
-		boolean found = false;
-		for (int i = 0; i < localFeatures.length; i++) {
-			if (localFeatures[i].getURL().toExternalForm().endsWith("rootfeature.jar")) {
-				found = true;
-				break;
-			}
-		}
-
-		assertTrue(
-			"Found rootfeature.jar on target site. Target site feature ref shouldnot contain JAR file",
-			!found);
-
-		// check root
-		String site = localSite.getURL().getFile();
-		IPluginEntry[] entries = remoteFeature.getPluginEntries();
-		assertTrue("no plugins entry", (entries != null && entries.length != 0));
-
-		String pluginName = entries[0].getVersionedIdentifier().toString();
-		File pluginFile = new File(site, Site.DEFAULT_PLUGIN_PATH + pluginName);
-		assertTrue(
-			"plugin files not installed locally:" + pluginFile,
-			pluginFile.exists());		
-		File pluginXMLFile = new File(site, Site.DEFAULT_PLUGIN_PATH + pluginName+ File.separator + "plugin.xml");
-		assertTrue(
-			"plugin info not installed locally:" + pluginXMLFile,
-			pluginXMLFile.exists());
-
-		File featureFile =
-			new File(
-				site,
-				Site.DEFAULT_INSTALLED_FEATURE_PATH
-					+ remoteFeature.getVersionedIdentifier().toString());
-		assertTrue("feature info not installed locally", featureFile.exists());
-
-		// clean plugins & feature
-		for (int i = 0; i < entries.length; i++) {
-			pluginName = entries[0].getVersionedIdentifier().toString();
-			pluginFile = new File(site, Site.DEFAULT_PLUGIN_PATH + pluginName);
-			UpdateManagerUtils.removeFromFileSystem(pluginFile);
-		}
-		UpdateManagerUtils.removeFromFileSystem(featureFile);
-
-		// verify child Feature
-		IFeature childFeature =
-			remoteFeature.getIncludedFeatureReferences()[0].getFeature();
-		entries = childFeature.getPluginEntries();
-		assertTrue("no plugins entry", (entries != null && entries.length != 0));
-		pluginName = entries[0].getVersionedIdentifier().toString();
-		pluginFile = new File(site, Site.DEFAULT_PLUGIN_PATH + pluginName);
-		assertTrue(
-			"plugin files not installed locally:" + pluginFile,
-			pluginFile.exists());
-		pluginXMLFile =
-			new File(
-				site,
-				Site.DEFAULT_PLUGIN_PATH + pluginName + File.separator + "plugin.xml");
-		assertTrue("plugin.xml file not installed locally", pluginXMLFile.exists());
-
-		featureFile =
-			new File(
-				site,
-				Site.DEFAULT_INSTALLED_FEATURE_PATH
-					+ childFeature.getVersionedIdentifier().toString());
-		assertTrue(
-			"feature info not installed locally:" + featureFile,
-			featureFile.exists());
-
-		// clean plugins
-		for (int i = 0; i < entries.length; i++) {
-			pluginName = entries[0].getVersionedIdentifier().toString();
-			pluginFile = new File(site, Site.DEFAULT_PLUGIN_PATH + pluginName);
-			UpdateManagerUtils.removeFromFileSystem(pluginFile);
-		}
-
-		// clean features
-		UpdateManagerUtils.removeFromFileSystem(featureFile);
-		UpdateManagerUtils.removeFromFileSystem(new File(localSite.getURL().getFile()));
-	}
-
-	public void testInstall() throws Exception {
-
-		// cleanup local files...
-		URL localURL = ((SiteLocal) SiteManager.getLocalSite()).getLocationURL();
-		File localFile =
-			new File(new URL(localURL, SiteLocal.SITE_LOCAL_FILE).getFile());
-		UpdateManagerUtils.removeFromFileSystem(localFile);
-
-		URL INSTALL_SITE = null;
-		try {
-			INSTALL_SITE = new URL(SOURCE_FILE_SITE, "nestedFeatureSiteTest/site.xml");
-		} catch (Exception e) {
-			fail(e.toString());
-			e.printStackTrace();
-		}
-
-		ISite remoteSite = SiteManager.getSite(INSTALL_SITE);
-		IFeatureReference[] features = remoteSite.getFeatureReferences();
-		IFeature remoteFeature = null;
-
-		if (features == null || features.length == 0)
-			fail("No features on the site");
-
-		for (int i = 0; i < features.length; i++) {
-			if (features[i].getURL().toExternalForm().endsWith("rootfeature.jar")) {
-				remoteFeature = features[i].getFeature();
-				break;
-			}
-		}
-
-		assertNotNull("Cannot find rootfeature.jar on site", remoteFeature);
-		ILocalSite localSite = SiteManager.getLocalSite();
-		IConfiguredSite site =
-			localSite.getCurrentConfiguration().getConfiguredSites()[0];
-
-		((ConfiguredSite)site).setUpdatable(true);
-		site.install(remoteFeature, null, null);
-
-		IPluginEntry[] entries = remoteFeature.getPluginEntries();
-		assertTrue("no plugins entry", (entries != null && entries.length != 0));
-
-		String sitePath = site.getSite().getURL().getFile();
-		String pluginName = entries[0].getVersionedIdentifier().toString();
-		File pluginFile = new File(sitePath, Site.DEFAULT_PLUGIN_PATH + pluginName);
-		assertTrue("plugin info not installed locally"+pluginFile, pluginFile.exists());
-
-		File featureFile =
-			new File(
-				sitePath,
-				Site.DEFAULT_INSTALLED_FEATURE_PATH
-					+ remoteFeature.getVersionedIdentifier().toString());
-		assertTrue("feature info not installed locally", featureFile.exists());
-
-		//cleanup
-		File file =
-			new File(
-				site.getSite().getURL().getFile()
-					+ File.separator
-					+ Site.DEFAULT_INSTALLED_FEATURE_PATH
-					+ remoteFeature.getVersionedIdentifier());
-		// clean plugins
-		for (int i = 0; i < entries.length; i++) {
-			pluginName = entries[0].getVersionedIdentifier().toString();
-			pluginFile =
-				new File(
-					site.getSite().getURL().getFile(),
-					Site.DEFAULT_PLUGIN_PATH + pluginName);
-			UpdateManagerUtils.removeFromFileSystem(pluginFile);
-		}
-
-		UpdateManagerUtils.removeFromFileSystem(file);
-		UpdateManagerUtils.removeFromFileSystem(pluginFile);
-		UpdateManagerUtils.removeFromFileSystem(localFile);
-		UpdateManagerUtils.removeFromFileSystem(
-			new File(
-				((InstallConfiguration) localSite.getCurrentConfiguration())
-					.getURL()
-					.getFile()));
-	}
-}
diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/parser/AllParserTests.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/parser/AllParserTests.java
deleted file mode 100644
index 4cc01a9..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/parser/AllParserTests.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2000, 2003 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials 

- * are made available under the terms of the Common Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/cpl-v10.html

- * 

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-package org.eclipse.update.tests.parser;

-

-import org.eclipse.update.tests.UpdateManagerTestCase;

-import junit.framework.*;

-

-

-public class AllParserTests extends UpdateManagerTestCase {

-public AllParserTests(String name) {

-	super(name);

-}

-public static Test suite() {

-	TestSuite suite = new TestSuite();

-	suite.setName("Parsing Tests");

-	

-	// the following will take all teh test methods in teh class that start with 'test'

-	suite.addTest(new TestSuite(TestFeatureParse.class));

-	suite.addTest(new TestSuite(TestSiteParse.class));	

-	suite.addTest(new TestSuite(TestCategories.class));		

-	

-	// or you can specify the method

-	//suite.addTest(new TestGetFeature("methodThatDoesNotStartWithtest"));	

-	

-	return suite;

-}

-}

diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/parser/TestCategories.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/parser/TestCategories.java
deleted file mode 100644
index a150186..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/parser/TestCategories.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2000, 2003 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials 

- * are made available under the terms of the Common Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/cpl-v10.html

- * 

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-package org.eclipse.update.tests.parser;

-import java.net.URL;

-

-import org.eclipse.update.core.*;

-import org.eclipse.update.tests.UpdateManagerTestCase;

-

-public class TestCategories extends UpdateManagerTestCase {

-	/**

-	 * Constructor for Test1

-	 */

-	public TestCategories(String arg0) {

-		super(arg0);

-	}

-

-	public void testCategories() throws Exception {

-

-		URL remoteUrl = new URL(SOURCE_FILE_SITE + "xmls/site1/");

-		ISite remoteSite = SiteManager.getSite(remoteUrl);

-

-		ISiteFeatureReference[] feature = remoteSite.getFeatureReferences();

-		//ICategory[] categories = remoteSite.getCategories();

-

-		ICategory featureCategory = feature[0].getCategories()[0];

-

-		assertEquals("UML tools", featureCategory.getLabel());

-

-	}

-

-	public void testOrderedCategories() throws Exception {

-

-		URL remoteUrl = new URL(SOURCE_FILE_SITE + "xmls/site1/");

-		ISite remoteSite = SiteManager.getSite(remoteUrl);

-

-		ICategory[] categories = remoteSite.getCategories();

-		for (int i = 0; i < categories.length; i++) {

-			System.out.println("Cat ordered->" + categories[i].getName());

-		}

-

-		assertEquals("Eclipse tools", categories[1].getLabel());

-

-	}

-

-	public void testTranslatedCategories() throws Exception {

-

-		ISite remoteSite = SiteManager.getSite(SOURCE_HTTP_SITE);

-

-		ICategory[] categories = remoteSite.getCategories();

-

-		assertEquals("Required Drivers", categories[0].getLabel());

-

-	}

-}

diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/parser/TestFeatureParse.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/parser/TestFeatureParse.java
deleted file mode 100644
index 48d30ab..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/parser/TestFeatureParse.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2000, 2003 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials 

- * are made available under the terms of the Common Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/cpl-v10.html

- * 

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-package org.eclipse.update.tests.parser;

-

-import java.net.URL;

-

-import org.eclipse.update.core.*;

-import org.eclipse.update.core.model.DefaultFeatureParser;

-import org.eclipse.update.core.model.FeatureModel;

-import org.eclipse.update.core.model.URLEntryModel;

-import org.eclipse.update.internal.core.*;

-import org.eclipse.update.tests.UpdateManagerTestCase;

-import org.xml.sax.SAXParseException;

-

-public class TestFeatureParse extends UpdateManagerTestCase {

-

-	/**

-	 * Constructor for Test1

-	 */

-	public TestFeatureParse(String arg0) {

-		super(arg0);

-	}

-

-	public void testParse() throws Exception {

-

-		String xmlFile = "xmls/feature_1.0.0/";

-		ISite remoteSite = SiteManager.getSite(SOURCE_FILE_SITE);

-		URL url = UpdateManagerUtils.getURL(remoteSite.getURL(), xmlFile, null);

-

-		SiteFeatureReference ref = new SiteFeatureReference();

-		ref.setSite(remoteSite);

-		ref.setURL(url);

-		IFeature feature = ref.getFeature();

-

-		String prov = feature.getProvider();

-		assertEquals("Object Technology International", prov);

-

-	}

-

-	public void testParseValid1() throws Exception {

-

-		try {

-			URL remoteURL = new URL(SOURCE_FILE_SITE + "parsertests/feature1.xml");

-			DefaultFeatureParser parser = new DefaultFeatureParser();

-			parser.init(new FeatureExecutableFactory());

-			URL resolvedURL = URLEncoder.encode(remoteURL);

-			FeatureModel remoteFeature = parser.parse(resolvedURL.openStream());

-			remoteFeature.resolve(remoteURL, null);

-

-		} catch (SAXParseException e) {

-			fail("Exception should NOT be thrown");

-		}

-	}

-

-	public void testParseValid1bis() throws Exception {

-

-		try {

-			URL remoteURL = new URL(SOURCE_FILE_SITE + "parsertests/feature1bis.xml");

-			DefaultFeatureParser parser = new DefaultFeatureParser();

-			parser.init(new FeatureExecutableFactory());

-			URL resolvedURL = URLEncoder.encode(remoteURL);

-			FeatureModel remoteFeature = parser.parse(resolvedURL.openStream());

-			remoteFeature.resolve(remoteURL, null);

-

-		} catch (SAXParseException e) {

-			fail("Exception should NOT be thrown");

-		}

-	}

-

-	public void testParseValid2() throws Exception {

-

-		try {

-			URL remoteURL = new URL(SOURCE_FILE_SITE + "parsertests/feature2.xml");

-			DefaultFeatureParser parser = new DefaultFeatureParser();

-			parser.init(new FeatureExecutableFactory());

-			URL resolvedURL = URLEncoder.encode(remoteURL);

-			FeatureModel remoteFeature = parser.parse(resolvedURL.openStream());

-			remoteFeature.resolve(remoteURL, null);

-

-		} catch (SAXParseException e) {

-			fail("Exception should not be thrown" + e.getMessage());

-		}

-	}

-

-	public void testParseValid3() throws Exception {

-

-		try {

-			URL remoteURL = new URL(SOURCE_FILE_SITE + "parsertests/feature3.xml");

-			DefaultFeatureParser parser = new DefaultFeatureParser();

-			parser.init(new FeatureExecutableFactory());

-			URL resolvedURL = URLEncoder.encode(remoteURL);

-			FeatureModel remoteFeature = parser.parse(resolvedURL.openStream());

-			remoteFeature.resolve(remoteURL, null);

-

-			String copyrightString = remoteFeature.getCopyrightModel().getURL().getFile();

-			boolean resolved = copyrightString.indexOf(SiteManager.getOS()) != -1;

-			assertTrue("Copyright URL not resolved:" + copyrightString, resolved);

-		} catch (SAXParseException e) {

-			fail("Exception should not be thrown" + e.getMessage());

-		}

-	}

-

-	// parse type

-	public void testParseValid4() throws Exception {

-

-		try {

-			URL remoteURL = new URL(SOURCE_FILE_SITE + "parsertests/feature4.xml");

-			DefaultFeatureParser parser = new DefaultFeatureParser();

-			parser.init(new FeatureExecutableFactory());

-			URL resolvedURL = URLEncoder.encode(remoteURL);

-			FeatureModel remoteFeature = parser.parse(resolvedURL.openStream());

-			remoteFeature.resolve(remoteURL, null);

-

-			URLEntryModel[] models = remoteFeature.getDiscoverySiteEntryModels();

-			assertTrue("Discovery model is not a Web Model", models[0].getType()==IURLEntry.WEB_SITE);

-			URLEntryModel copyright = remoteFeature.getCopyrightModel();

-			assertTrue("Copyright model is not an Update Model", copyright.getType()==IURLEntry.UPDATE_SITE);

-			

-		} catch (SAXParseException e) {

-			fail("Exception should not be thrown" + e.getMessage());

-		}

-	}

-

-}

diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/parser/TestSiteParse.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/parser/TestSiteParse.java
deleted file mode 100644
index bc00473..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/parser/TestSiteParse.java
+++ /dev/null
@@ -1,288 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2000, 2003 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials 

- * are made available under the terms of the Common Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/cpl-v10.html

- * 

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-package org.eclipse.update.tests.parser;

-

-import java.io.File;

-import java.net.URL;

-

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.update.core.*;

-import org.eclipse.update.core.model.*;

-import org.eclipse.update.internal.core.SiteFileFactory;

-import org.eclipse.update.internal.core.URLEncoder;

-import org.eclipse.update.tests.UpdateManagerTestCase;

-import org.xml.sax.SAXParseException;

-

-public class TestSiteParse extends UpdateManagerTestCase {

-

-	/**

-	 * Constructor for Test1

-	 */

-	public TestSiteParse(String arg0) {

-		super(arg0);

-	}

-

-	public void testParse() throws Exception {

-

-		URL remoteUrl = new URL(SOURCE_FILE_SITE + "xmls/site1/");

-		ISite remoteSite = SiteManager.getSite(remoteUrl);

-

-		//IFeatureReference[] feature = remoteSite.getFeatureReferences();

-		//ICategory[] categories = remoteSite.getCategories();

-

-		String path = remoteUrl.getFile();

-		String path2 = remoteSite.getDescription().getURL().getFile();

-		assertEquals(new File(path + "index.html"), new File(path2));

-

-	}

-

-	public void testNumberOfFeatures() throws Exception {

-

-		URL remoteURL = new URL("http", getHttpHost(), getHttpPort(), bundle.getString("HTTP_PATH_2"));

-		ISite remoteSite = SiteManager.getSite(remoteURL);

-

-		IFeatureReference[] feature = remoteSite.getFeatureReferences();

-		assertEquals(feature.length, 2);

-

-	}

-

-	public void testParseValid1() throws Exception {

-

-		URL remoteURL = new URL(SOURCE_FILE_SITE + "parsertests/site.xml");

-		DefaultSiteParser parser = new DefaultSiteParser();

-		parser.init(new SiteFileFactory());

-		URL resolvedURL = URLEncoder.encode(remoteURL);

-		SiteModel remoteSite = parser.parse(resolvedURL.openStream());

-		remoteSite.resolve(remoteURL, null);

-

-		FeatureReferenceModel[] feature = remoteSite.getFeatureReferenceModels();

-		CategoryModel[] categories = remoteSite.getCategoryModels();

-		ArchiveReferenceModel[] archives = remoteSite.getArchiveReferenceModels();

-

-		assertTrue("Wrong number of features", feature.length == 6);

-		assertTrue("Wrong number of categories", categories.length == 3);

-		assertTrue("Wrong number of archives", archives.length == 0);

-

-		String path = new URL(SOURCE_FILE_SITE + "parsertests/").getFile();

-		String path2 = remoteSite.getDescriptionModel().getURL().getFile();

-		assertEquals(path + "index.html", path2);

-

-	}

-

-	public void testParseValid2() throws Exception {

-

-		URL remoteURL = new URL(SOURCE_FILE_SITE + "parsertests/reddot.xml");

-		DefaultSiteParser parser = new DefaultSiteParser();

-		parser.init(new SiteFileFactory());

-		URL resolvedURL = URLEncoder.encode(remoteURL);

-		SiteModel remoteSite = parser.parse(resolvedURL.openStream());

-		remoteSite.resolve(remoteURL, null);

-

-		FeatureReferenceModel[] feature = remoteSite.getFeatureReferenceModels();

-		CategoryModel[] categories = remoteSite.getCategoryModels();

-		ArchiveReferenceModel[] archives = remoteSite.getArchiveReferenceModels();

-

-		assertTrue("Wrong number of features", feature.length == 2);

-		assertTrue("Wrong number of categories", categories.length == 1);

-		assertTrue("Wrong number of archives", archives.length == 2);

-

-		String valideString = "This category contains all of the<currently>available versions of Red Dot feature.<greeting>Hello, world!</greeting>";

-		assertEquals(valideString, remoteSite.getCategoryModels()[0].getDescriptionModel().getAnnotation());

-

-		String path = new URL(SOURCE_FILE_SITE + "parsertests/").getFile();

-		String path2 = remoteSite.getDescriptionModel().getURL().getFile();

-		assertEquals(path + "index.html", path2);

-

-	}

-

-	public void testParseValid3() throws Exception {

-

-		URL remoteURL = new URL(SOURCE_FILE_SITE + "parsertests/reddot1.xml");

-		DefaultSiteParser parser = new DefaultSiteParser();

-		parser.init(new SiteFileFactory());

-		URL resolvedURL = URLEncoder.encode(remoteURL);

-		SiteModel remoteSite = parser.parse(resolvedURL.openStream());

-		remoteSite.resolve(remoteURL, null);

-

-		FeatureReferenceModel[] feature = remoteSite.getFeatureReferenceModels();

-		CategoryModel[] categories = remoteSite.getCategoryModels();

-		ArchiveReferenceModel[] archives = remoteSite.getArchiveReferenceModels();

-

-		assertTrue("Wrong number of features", feature.length == 2);

-		assertTrue("Wrong number of categories", categories.length == 1);

-		assertTrue("Wrong number of archives", archives.length == 2);

-

-		String valideString = "This category contains all of the<currently>available versions of Red Dot feature.";

-		assertEquals(valideString, remoteSite.getCategoryModels()[0].getDescriptionModel().getAnnotation());

-

-		String path = new URL(SOURCE_FILE_SITE + "parsertests/").getFile();

-		String path2 = remoteSite.getDescriptionModel().getURL().getFile();

-		assertEquals(path + "index.html", path2);

-

-	}

-

-	public void testParseValid4() throws Exception {

-

-		URL remoteURL = new URL(SOURCE_FILE_SITE + "SiteURLTest/data/site.xml");

-		DefaultSiteParser parser = new DefaultSiteParser();

-		parser.init(new SiteFileFactory());

-		URL resolvedURL = URLEncoder.encode(remoteURL);

-		SiteModel remoteSite = parser.parse(resolvedURL.openStream());

-		remoteSite.resolve(remoteURL, null);

-

-		FeatureReferenceModel[] feature = remoteSite.getFeatureReferenceModels();

-		//CategoryModel[] categories = remoteSite.getCategoryModels();

-		ArchiveReferenceModel[] archives = remoteSite.getArchiveReferenceModels();

-

-		assertTrue("Wrong number of features", feature.length == 2);

-		assertTrue("Wrong number of archives", archives.length == 3);

-

-		URL path1 = new URL(SOURCE_FILE_SITE + "SiteURLTest/data/artifacts/features/helpFeature.jar");

-		URL url1 = feature[0].getURL();

-		assertEquals(path1, url1);

-		URL path2 = new URL(SOURCE_FILE_SITE + "SiteURLTest/data/artifacts/plugins/help.jar");

-		assertEquals(path2, archives[0].getURL());

-

-		String path = new URL(SOURCE_FILE_SITE + "SiteURLTest/data/info/").getFile();

-		String path3 = remoteSite.getDescriptionModel().getURL().getFile();

-		assertEquals(path + "siteInfo.html", path3);

-

-	}

-

-	public void testParseValid5() throws Exception {

-

-		URL remoteURL = new URL(SOURCE_FILE_SITE + "parsertests/site2.xml");

-		DefaultSiteParser parser = new DefaultSiteParser();

-		parser.init(new SiteFileFactory());

-		URL resolvedURL = URLEncoder.encode(remoteURL);

-		SiteModel remoteSite = parser.parse(resolvedURL.openStream());

-		remoteSite.resolve(remoteURL, null);

-

-		FeatureReferenceModel[] featureRef = remoteSite.getFeatureReferenceModels();

-		//CategoryModel[] categories = remoteSite.getCategoryModels();

-		ArchiveReferenceModel[] archives = remoteSite.getArchiveReferenceModels();

-

-		assertTrue("Wrong number of features", featureRef.length == 1);

-		assertTrue("Wrong number of archives", archives.length == 0);

-

-		try {

-			((FeatureReference) featureRef[0]).getFeature();

-		} catch (CoreException e) {

-			Throwable e1 = e.getStatus().getException();

-			if (e1.getMessage().indexOf("not-eclipse") == -1) {

-				throw e;

-			}

-		}

-	}

-

-	public void testParseValid6() throws Exception {

-

-		URL remoteURL = new URL(SOURCE_FILE_SITE + "parsertests/site4.xml");

-		DefaultSiteParser parser = new DefaultSiteParser();

-		parser.init(new SiteFileFactory());

-		URL resolvedURL = URLEncoder.encode(remoteURL);

-		SiteModel remoteSite = parser.parse(resolvedURL.openStream());

-		remoteSite.resolve(remoteURL, null);

-

-		FeatureReferenceModel[] featureRef = remoteSite.getFeatureReferenceModels();

-		//CategoryModel[] categories = remoteSite.getCategoryModels();

-		ArchiveReferenceModel[] archives = remoteSite.getArchiveReferenceModels();

-

-		assertTrue("Wrong number of features", featureRef.length == 2);

-		assertTrue("Wrong number of archives", archives.length == 0);

-

-		try {

-			((FeatureReference) featureRef[0]).getFeature();

-		} catch (CoreException e) {

-			Throwable e1 = e.getStatus().getException();

-			String msg = e1.getMessage().replace(File.separatorChar, '/');

-			if (msg.indexOf("_1.0.0.jar/feature.xml") == -1) {

-				throw e;

-			}

-		}

-	}

-

-	public void testParseUnknownCategory() throws Exception {

-

-		URL remoteURL = new URL(SOURCE_FILE_SITE + "parsertests/site3.xml");

-		DefaultSiteParser parser = new DefaultSiteParser();

-		parser.init(new SiteFileFactory());

-		URL resolvedURL = URLEncoder.encode(remoteURL);

-		SiteModel remoteSite = parser.parse(resolvedURL.openStream());

-		remoteSite.resolve(remoteURL, null);

-

-		FeatureReferenceModel[] featureRef = remoteSite.getFeatureReferenceModels();

-		ICategory[] categories = ((SiteFeatureReference) featureRef[0]).getCategories();

-		assertTrue(categories.length == 0);

-	}

-

-	public void testParseValid7() throws Exception {

-

-		try {

-			URL remoteURL = new URL(SOURCE_FILE_SITE + "parsertests/site7.xml");

-			DefaultSiteParser parser = new DefaultSiteParser();

-			parser.init(new SiteFileFactory());

-			URL resolvedURL = URLEncoder.encode(remoteURL);

-			SiteModel remoteSite = parser.parse(resolvedURL.openStream());

-			remoteSite.resolve(remoteURL, null);

-

-		} catch (SAXParseException e) {

-			fail("Exception should not be thrown" + e.getMessage());

-		}

-	}

-

-	public void testParseValid8() throws Exception {

-

-		try {

-			URL remoteURL = new URL(SOURCE_FILE_SITE + "parsertests/site8.xml");

-			DefaultSiteParser parser = new DefaultSiteParser();

-			parser.init(new SiteFileFactory());

-			URL resolvedURL = URLEncoder.encode(remoteURL);

-			SiteModel remoteSite = parser.parse(resolvedURL.openStream());

-			remoteSite.resolve(remoteURL, null);

-

-		} catch (SAXParseException e) {

-			fail("Exception should not be thrown" + e.getMessage());

-		}

-	}

-

-	public void testParseValid9() throws Exception {

-

-		try {

-			URL remoteURL = new URL(SOURCE_FILE_SITE + "parsertests/site9.xml");

-			DefaultSiteParser parser = new DefaultSiteParser();

-			parser.init(new SiteFileFactory());

-			URL resolvedURL = URLEncoder.encode(remoteURL);

-			SiteModel remoteSite = parser.parse(resolvedURL.openStream());

-			remoteSite.resolve(remoteURL, null);

-		} catch (SAXParseException e) {

-			fail("Exception should not be thrown" + e.getMessage());

-		}

-	}

-

-	public void testParseValid10() throws Exception {

-

-		SiteModel remoteSite = null;

-		try {

-			URL remoteURL = new URL(SOURCE_FILE_SITE + "parsertests/site10.xml");

-			DefaultSiteParser parser = new DefaultSiteParser();

-			parser.init(new SiteFileFactory());

-			URL resolvedURL = URLEncoder.encode(remoteURL);

-			remoteSite = parser.parse(resolvedURL.openStream());

-			remoteSite.resolve(remoteURL, null);

-		} catch (SAXParseException e) {

-			fail("Exception should not be thrown" + e.getMessage());

-		}

-		FeatureReferenceModel[] models = remoteSite.getFeatureReferenceModels();

-		assertEquals("Invalid versioned identifier", models[0].getFeatureIdentifier(), "org.eclipse.test.feature");

-	}

-

-}

diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/reconciliation/AllReconciliationTests.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/reconciliation/AllReconciliationTests.java
deleted file mode 100644
index 8b9d17a..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/reconciliation/AllReconciliationTests.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.update.tests.reconciliation;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.update.tests.UpdateManagerTestCase;
-
-/**
- * Manages the API tests
- */
-public class AllReconciliationTests extends UpdateManagerTestCase {
-	/**
-	 * Constructor
-	 */
-	public AllReconciliationTests(String name) {
-		super(name);
-	}
-	
-	/**
-	 * List of API tests
-	 */
-	public static Test suite() throws Exception {
-		TestSuite suite = new TestSuite();
-		suite.setName("API Tests");
-
-
-		suite.addTest(new TestSuite(TestSiteReconciliation.class));
-
-		return suite;
-	}
-}
diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/reconciliation/TestSiteReconciliation.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/reconciliation/TestSiteReconciliation.java
deleted file mode 100644
index 59dcf9c..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/reconciliation/TestSiteReconciliation.java
+++ /dev/null
@@ -1,172 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.update.tests.reconciliation;
-import java.io.File;
-import java.net.URL;
-
-import org.eclipse.core.boot.BootLoader;
-import org.eclipse.core.boot.IPlatformConfiguration.ISiteEntry;
-import org.eclipse.core.boot.IPlatformConfiguration.ISitePolicy;
-import org.eclipse.core.internal.boot.PlatformConfiguration;
-import org.eclipse.update.configuration.IConfiguredSite;
-import org.eclipse.update.configuration.ILocalSite;
-import org.eclipse.update.core.IFeatureReference;
-import org.eclipse.update.core.SiteManager;
-import org.eclipse.update.internal.core.*;
-import org.eclipse.update.tests.UpdateManagerTestCase;
-
-public class TestSiteReconciliation extends UpdateManagerTestCase {
-	
-
-	
-
-	/**
-	 * Test the getFeatures()
-	 */
-	public TestSiteReconciliation(String arg0) {
-		super(arg0);
-	}
-
-	private void addConfigSite(int policy, URL url,String[] listOfPlugins) throws Exception {
-		String xmlFile = ((SiteLocal)SiteManager.getLocalSite()).getLocationURL().getFile();
-		UpdateManagerUtils.removeFromFileSystem(new File(xmlFile));		
-		InternalSiteManager.localSite=null;
-		// get new config object
-		PlatformConfiguration cfig = (PlatformConfiguration)BootLoader.getCurrentPlatformConfiguration();
-		ISitePolicy p1 = cfig.createSitePolicy(policy, listOfPlugins);	
-		ISiteEntry s1 = cfig.createSiteEntry(url,p1);
-		cfig.configureSite(s1);	
-	}
-	
-	private void removeConfigSite(URL url) throws Exception {
-		// get new config object
-		PlatformConfiguration cfig = (PlatformConfiguration)BootLoader.getCurrentPlatformConfiguration();
-		ISiteEntry s1 = cfig.findConfiguredSite(url);
-		assertNotNull("Unable to find site entry:"+url,s1);
-		cfig.unconfigureSite(s1);
-		cfig.save();
-	}	
-	/**
-	 * Site 1 contains a feature which needs a plugin taht is not on the path when we start
-	 * it will never be configured
-	 */
-	public void testNewSiteInclude1() throws Exception {
-	
-		int policy  = ISitePolicy.USER_INCLUDE;
-		URL url = new URL("file",null,dataPath+"reconciliationSites/site1/");
-		String[] plugins = new String[]{};
-		addConfigSite(policy,url, plugins);
-
-		ILocalSite local = SiteManager.getLocalSite();
-		((SiteLocal)local).setStamp(0);
-		IConfiguredSite[] newSites = local.getCurrentConfiguration().getConfiguredSites();
-		IConfiguredSite newSite = null;
-		for (int i = 0; i < newSites.length; i++) {
-			if (UpdateManagerUtils.sameURL(newSites[i].getSite().getURL(),url)){
-				newSite = newSites[i];
-			}
-		}
-		
-		if (newSite==null) fail("Site not found in configuration");
-		
-		IFeatureReference[] ref = newSite.getConfiguredFeatures();
-		assertEquals("Wrong number of configured features",0,ref.length);		
-		ref = ((ConfiguredSite)newSite).getConfigurationPolicy().getUnconfiguredFeatures();
-		assertEquals("Wrong number of unconfigured features",0,ref.length);		
-		
-		removeConfigSite(url);
-	}
-
-	public void testNewSiteExclude1() throws Exception {
-		
-		int policy  = ISitePolicy.USER_EXCLUDE;
-		URL url = new URL("file",null,dataPath+"reconciliationSites/site1/");
-		String[] plugins = new String[]{};
-		addConfigSite(policy,url, plugins);
-		
-		ILocalSite local = SiteManager.getLocalSite();
-		((SiteLocal)local).setStamp(0);		
-		IConfiguredSite[] newSites = local.getCurrentConfiguration().getConfiguredSites();
-		IConfiguredSite newSite = null;
-		for (int i = 0; i < newSites.length; i++) {
-			if (UpdateManagerUtils.sameURL(newSites[i].getSite().getURL(),url)){
-				newSite = newSites[i];
-			}
-		}
-		
-		if (newSite==null) fail("Site not found in configuration");
-		
-		IFeatureReference[] ref = newSite.getConfiguredFeatures();
-		assertEquals("Wrong number of configured features",0,ref.length);		
-		ref = ((ConfiguredSite)newSite).getConfigurationPolicy().getUnconfiguredFeatures();
-		assertEquals("Wrong number of unconfigured features",0,ref.length);				
-		removeConfigSite(url);
-	}
-
-	/**
-	 * Site 2 contains a feature which needs a plugin taht is on the path when we start
-	 * it will be configured
-	 */
-	public void testNewSiteInclude2() throws Exception {
-		
-		int policy  = ISitePolicy.USER_INCLUDE;
-		URL url = new URL("file",null,dataPath+"reconciliationSites/site2/");
-		String[] plugins = new String[]{};
-		addConfigSite(policy,url, plugins);
-		ILocalSite local = SiteManager.getLocalSite();
-		((SiteLocal)local).setStamp(0);		
-		IConfiguredSite[] newSites = local.getCurrentConfiguration().getConfiguredSites();
-		IConfiguredSite newSite = null;
-		for (int i = 0; i < newSites.length; i++) {
-			if (UpdateManagerUtils.sameURL(newSites[i].getSite().getURL(),url)){
-				newSite = newSites[i];
-			}
-		}
-		
-		if (newSite==null) fail("Site not found in configuration");
-		
-		IFeatureReference[] ref = newSite.getConfiguredFeatures();
-		assertEquals("Wrong number of configured features",0,ref.length);
-		ref = ((ConfiguredSite)newSite).getConfigurationPolicy().getUnconfiguredFeatures();
-		assertEquals("Wrong number of unconfigured features",0,ref.length);
-		
-		removeConfigSite(url);
-	}
-
-
-
-	public void testNewSiteExclude2() throws Exception {
-		
-		int policy  = ISitePolicy.USER_EXCLUDE;
-		URL url = new URL("file",null,dataPath+"reconciliationSites/site2/");
-		String[] plugins = new String[]{};
-		addConfigSite(policy,url, plugins);
-		ILocalSite local = SiteManager.getLocalSite();
-		((SiteLocal)local).setStamp(0);		
-		IConfiguredSite[] newSites = local.getCurrentConfiguration().getConfiguredSites();
-		IConfiguredSite newSite = null;
-		for (int i = 0; i < newSites.length; i++) {
-			if (UpdateManagerUtils.sameURL(newSites[i].getSite().getURL(),url)){
-				newSite = newSites[i];
-			}
-		}
-		
-		if (newSite==null) fail("Site not found in configuration");
-		
-		IFeatureReference[] ref = newSite.getConfiguredFeatures();
-		assertEquals("Wrong number of configured features",0,ref.length);
-		ref = ((ConfiguredSite)newSite).getConfigurationPolicy().getUnconfiguredFeatures();
-		assertEquals("Wrong number of unconfigured features",0,ref.length);
-
-		removeConfigSite(url);
-	}
-}
-
diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/regularInstall/AllRegularInstallTests.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/regularInstall/AllRegularInstallTests.java
deleted file mode 100644
index d857b55..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/regularInstall/AllRegularInstallTests.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2000, 2003 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials 

- * are made available under the terms of the Common Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/cpl-v10.html

- * 

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-package org.eclipse.update.tests.regularInstall;

-

-import org.eclipse.update.tests.UpdateManagerTestCase;

-import junit.framework.*;

-

-

-public class AllRegularInstallTests extends UpdateManagerTestCase {

-public AllRegularInstallTests(String name) {

-	super(name);

-}

-public static Test suite() {

-	TestSuite suite = new TestSuite();

-	suite.setName("Regular Install Tests");

-	

-	// the following will take all teh test methods in teh class that start with 'test'

-

-	suite.addTest(new TestSuite(TestInstall.class));

-	suite.addTest(new TestSuite(TestInstallURLSIteXML.class));	

-	suite.addTest(new TestSuite(TestSpaceInInstall.class));	

-	suite.addTest(new TestSuite(TestGetFeature.class));

-	suite.addTest(new TestSuite(TestExecutableInstall.class));	

-	suite.addTest(new TestSuite(TestExecutablePackagedInstall.class));		

-	suite.addTest(new TestSuite(TestDataEntryInstall.class));

-	suite.addTest(new TestSuite(TestLocalSite.class));		

-	

-	// or you can specify the method

-	//suite.addTest(new TestGetFeature("methodThatDoesNotStartWithtest"));	

-	

-	return suite;

-}

-}

diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/regularInstall/MultipleTestLocalSite.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/regularInstall/MultipleTestLocalSite.java
deleted file mode 100644
index f0325b2..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/regularInstall/MultipleTestLocalSite.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2000, 2003 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials 

- * are made available under the terms of the Common Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/cpl-v10.html

- * 

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-package org.eclipse.update.tests.regularInstall;

-

-import org.eclipse.update.tests.UpdateManagerTestCase;

-import junit.framework.*;

-

-

-public class MultipleTestLocalSite extends UpdateManagerTestCase {

-public MultipleTestLocalSite(String name) {

-	super(name);

-}

-public static Test suite() {

-	TestSuite suite = new TestSuite();

-	suite.setName("Multiple Test Local Site");

-	

-	// the following will take all teh test methods in teh class that start with 'test'

-	

-	for(int i=0; i<50; i++){

-		suite.addTest(new TestSuite(TestLocalSite.class));

-	}

-	

-	return suite;

-}

-}

diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/regularInstall/TestDataEntryInstall.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/regularInstall/TestDataEntryInstall.java
deleted file mode 100644
index 44357af..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/regularInstall/TestDataEntryInstall.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2000, 2003 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials 

- * are made available under the terms of the Common Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/cpl-v10.html

- * 

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-package org.eclipse.update.tests.regularInstall;

-import java.io.File;

-import java.net.URL;

-

-import org.eclipse.update.core.*;

-import org.eclipse.update.internal.core.UpdateManagerUtils;

-import org.eclipse.update.tests.UpdateManagerTestCase;

-

-public class TestDataEntryInstall extends UpdateManagerTestCase {

-	/**

-	 * Constructor for Test1

-	 */

-	public TestDataEntryInstall(String arg0) {

-		super(arg0);

-	}

-

-	/**

-	 * With site.xml

-	 */

-	public void testDataEntrySite() throws Exception {

-

-		//cleanup target 

-		File target = new File(TARGET_FILE_SITE.getFile());

-		UpdateManagerUtils.removeFromFileSystem(target);

-		

-		URL newURL =new File(dataPath + "dataEntrySiteTest/site1/site.xml").toURL();

-		ISite remoteSite = SiteManager.getSite(newURL);

-		IFeatureReference[] featuresRef = remoteSite.getFeatureReferences();

-		ISite localSite = SiteManager.getSite(TARGET_FILE_SITE);

-		IFeature remoteFeature = null;

-		

-		for (int i = 0; i < featuresRef.length; i++) {

-			remoteFeature = featuresRef[i].getFeature();

-			localSite.install(remoteFeature, null,null);

-

-			// verify

-			String site = localSite.getURL().getFile();

-			INonPluginEntry[] entries = remoteFeature.getNonPluginEntries();

-			assertTrue("no data entry", (entries != null && entries.length != 0));

-			String pluginName = entries[0].getIdentifier().toString();

-			File pluginFile = new File(site, Site.DEFAULT_INSTALLED_FEATURE_PATH + remoteFeature.getVersionedIdentifier().toString()+File.separator+ pluginName);

-			assertTrue("data files not installed locally:"+pluginFile, pluginFile.exists());

-		} 

-

-		//cleanup target 

-		UpdateManagerUtils.removeFromFileSystem(target);

-

-

-	}

-	

-	

-	/**

-	 * With site.xml

-	 */

-	public void testDataEntrySitePackaged() throws Exception {

-

-		//cleanup target 

-		File target = new File(TARGET_FILE_SITE.getFile());

-		UpdateManagerUtils.removeFromFileSystem(target);

-		

-		URL newURL =new File(dataPath + "dataEntrySiteTest/site2/site.xml").toURL();

-		ISite remoteSite = SiteManager.getSite(newURL);

-		IFeatureReference[] featuresRef = remoteSite.getFeatureReferences();

-		ISite localSite = SiteManager.getSite(TARGET_FILE_SITE);

-		IFeature remoteFeature = null;

-		

-		for (int i = 0; i < featuresRef.length; i++) {

-			remoteFeature = featuresRef[i].getFeature();

-			localSite.install(remoteFeature, null,null);

-

-			// verify

-			String site = localSite.getURL().getFile();

-			INonPluginEntry[] entries = remoteFeature.getNonPluginEntries();

-			assertTrue("no data entry", (entries != null && entries.length != 0));

-			entries[0].getIdentifier().toString();

-			File pluginFile = new File(site, Site.DEFAULT_INSTALLED_FEATURE_PATH + remoteFeature.getVersionedIdentifier().toString()+File.separator+ "nondata"+File.separator+"file1.zip");

-			assertTrue("Data file inside the jar not installed locally:"+pluginFile, pluginFile.exists());

-			pluginFile = new File(site, Site.DEFAULT_INSTALLED_FEATURE_PATH + remoteFeature.getVersionedIdentifier().toString()+File.separator+ "file.zip");

-			assertTrue("Data file outside the jar not installed locally:"+pluginFile, pluginFile.exists());

-			

-		} 

-		

-

-		//cleanup target 

-		UpdateManagerUtils.removeFromFileSystem(target);

-

-

-	}	

-	

-}

diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/regularInstall/TestExecutableInstall.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/regularInstall/TestExecutableInstall.java
deleted file mode 100644
index fa865d9..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/regularInstall/TestExecutableInstall.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2000, 2003 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials 

- * are made available under the terms of the Common Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/cpl-v10.html

- * 

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-package org.eclipse.update.tests.regularInstall;

-

-import java.io.File;

-

-import org.eclipse.update.core.*;

-import org.eclipse.update.internal.core.UpdateManagerUtils;

-import org.eclipse.update.tests.UpdateManagerTestCase;

-

-

-public class TestExecutableInstall extends UpdateManagerTestCase {

-

-	/**

-	 * Constructor for Test1

-	 */

-	public TestExecutableInstall(String arg0) {

-		super(arg0);

-	}

-	

-

-

-	public void testFileSite() throws Exception{

-		

-		//cleanup target 

-		File target = new File(TARGET_FILE_SITE.getFile());

-		UpdateManagerUtils.removeFromFileSystem(target);		

-		

-		ISite remoteSite = SiteManager.getSite(SOURCE_FILE_SITE_INSTALLED);

-		IFeatureReference[] remoteFeatureReference = remoteSite.getFeatureReferences();

-		IFeature remoteFeature = remoteFeatureReference[0].getFeature();

-		ISite localSite = SiteManager.getSite(TARGET_FILE_SITE);

-		assertNotNull(remoteFeature);

-		remove(remoteFeature,localSite);		

-		localSite.install(remoteFeature,null,null);

-		

-		// verify

-		String site = localSite.getURL().getFile();

-		IPluginEntry[] entries = remoteFeature.getRawPluginEntries();

-		assertTrue("no plugins entry",(entries!=null && entries.length!=0));

-		String pluginName= entries[0].getVersionedIdentifier().toString();

-		File pluginFile = new File(site,Site.DEFAULT_PLUGIN_PATH+pluginName);

-		assertTrue("plugin files not installed locally",pluginFile.exists());

-

-		File featureFile = new File(site,Site.DEFAULT_INSTALLED_FEATURE_PATH+remoteFeature.getVersionedIdentifier().toString());

-		assertTrue("feature info not installed locally:"+featureFile,featureFile.exists());

-		assertTrue("feature is a file, not a directory:"+featureFile,featureFile.isDirectory());

-

-		

-		File featureFileXML = new File(site,Site.DEFAULT_INSTALLED_FEATURE_PATH+remoteFeature.getVersionedIdentifier().toString()+File.separator+"feature.xml");

-		assertTrue("feature info not installed locally: no feature.xml",featureFileXML.exists());

-

-		//cleanup target 

-		UpdateManagerUtils.removeFromFileSystem(target);

-		

-	}

-

-}

-

-

diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/regularInstall/TestExecutablePackagedInstall.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/regularInstall/TestExecutablePackagedInstall.java
deleted file mode 100644
index 4a73836..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/regularInstall/TestExecutablePackagedInstall.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2000, 2003 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials 

- * are made available under the terms of the Common Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/cpl-v10.html

- * 

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-package org.eclipse.update.tests.regularInstall;

-import java.io.File;

-import java.net.URL;

-

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.update.core.*;

-import org.eclipse.update.internal.core.*;

-import org.eclipse.update.tests.UpdateManagerTestCase;

-

-public class TestExecutablePackagedInstall extends UpdateManagerTestCase {

-	/**

-	 * Constructor for Test1

-	 */

-	public TestExecutablePackagedInstall(String arg0) {

-		super(arg0);

-	}

-

-	/**

-	 * With site.xml

-	 */

-	public void testFilePackageExecutableFeatureSite() throws Exception {

-

-		//cleanup target  

-		File target = new File(TARGET_FILE_SITE.getFile());

-		UpdateManagerUtils.removeFromFileSystem(target);

-		

-		URL newURL = new File(dataPath + "ExecutableFeaturePackagedSite/data2/site.xml").toURL();

-		ISite remoteSite = SiteManager.getSite(newURL);

-		IFeatureReference[] featuresRef = remoteSite.getFeatureReferences();

-		ISite localSite = SiteManager.getSite(TARGET_FILE_SITE);

-		IFeature remoteFeature = null;

-		

-		// at least one executable feature and on packaged

-		boolean execFeature = false;

-		boolean packFeature = false;

-

-		if (featuresRef.length==0) fail ("no feature found");

-	

-		for (int i = 0; i < featuresRef.length; i++) {

-			remoteFeature = featuresRef[i].getFeature();

-			remove(remoteFeature,localSite);			

-			localSite.install(remoteFeature, null,null);

-			

-			if (remoteFeature.getFeatureContentProvider() instanceof FeaturePackagedContentProvider) packFeature = true;

-			if (remoteFeature.getFeatureContentProvider() instanceof FeatureExecutableContentProvider) execFeature = true;

-

-			// verify

-			String site = localSite.getURL().getFile();

-			IPluginEntry[] entries = remoteFeature.getRawPluginEntries();

-			assertTrue("no plugins entry", (entries != null && entries.length != 0));

-			String pluginName = entries[0].getVersionedIdentifier().toString();

-			File pluginFile = new File(site, Site.DEFAULT_PLUGIN_PATH + pluginName);

-			assertTrue("plugin files not installed locally:"+pluginFile, pluginFile.exists());

-

-			File featureFile = new File(site, Site.DEFAULT_INSTALLED_FEATURE_PATH + remoteFeature.getVersionedIdentifier().toString());

-			assertTrue("feature info not installed locally:"+featureFile, featureFile.exists());

-

-			File featureFileXML = new File(site, Site.DEFAULT_INSTALLED_FEATURE_PATH + remoteFeature.getVersionedIdentifier().toString() + File.separator + "feature.xml");

-			assertTrue("feature info not installed locally: no feature.xml", featureFileXML.exists());

-		}

-

-		if (!execFeature && !packFeature){

-			fail("cannot find one executable and one package feature on teh site");

-		}

-

-		//cleanup target 

-		UpdateManagerUtils.removeFromFileSystem(target);

-

-

-	}

-	

-	

-	/**

-	 * Without site.xml

-	 */

-	public void testFileNoSiteXMLSite() throws Exception {

-

-		//cleanup target 

-		File target = new File(TARGET_FILE_SITE.getFile());

-		UpdateManagerUtils.removeFromFileSystem(target);

-		

-		URL newURL = new File(dataPath + "ExecutableFeaturePackagedSite/data/").toURL();

-		ISite remoteSite = SiteManager.getSite(newURL);

-		IFeatureReference[] featuresRef = remoteSite.getFeatureReferences();

-		ISite localSite = SiteManager.getSite(TARGET_FILE_SITE);

-		IFeature remoteFeature = null;

-		

-		// at least one executable feature and on packaged

-		boolean execFeature = false;

-		boolean packFeature = false;

-

-		if (featuresRef.length==0) fail ("no feature found");

-	

-		for (int i = 0; i < featuresRef.length; i++) {

-			try {

-				remoteFeature = featuresRef[i].getFeature();

-			} catch (CoreException e){

-				Throwable e1 = e.getStatus().getException();

-				String msg = e1.getMessage().replace(File.separatorChar,'/');

-				if (msg.indexOf("CVS/feature.xml")==-1){

-					throw e;

-				}				

-			}

-			if (remoteFeature!=null){

-				remove(remoteFeature,localSite);

-				localSite.install(remoteFeature,null, null);

-				

-				if (remoteFeature.getFeatureContentProvider() instanceof FeaturePackagedContentProvider) packFeature = true;

-				if (remoteFeature.getFeatureContentProvider() instanceof FeatureExecutableContentProvider) execFeature = true;

-	

-				// verify

-				String site = localSite.getURL().getFile();

-				IPluginEntry[] entries = remoteFeature.getRawPluginEntries();

-				assertTrue("no plugins entry", (entries != null && entries.length != 0));

-				String pluginName = entries[0].getVersionedIdentifier().toString();

-				File pluginFile = new File(site, Site.DEFAULT_PLUGIN_PATH + pluginName);

-				assertTrue("plugin files not installed locally:"+pluginFile, pluginFile.exists());

-	

-				File featureFile = new File(site, Site.DEFAULT_INSTALLED_FEATURE_PATH + remoteFeature.getVersionedIdentifier().toString());

-				assertTrue("feature info not installed locally:"+featureFile, featureFile.exists());

-	

-				File featureFileXML = new File(site, Site.DEFAULT_INSTALLED_FEATURE_PATH + remoteFeature.getVersionedIdentifier().toString() + File.separator + "feature.xml");

-				assertTrue("feature info not installed locally: no feature.xml", featureFileXML.exists());

-			}

-		}

-

-		if (!execFeature && !packFeature){

-			fail("cannot find one executable and one package feature on teh site");

-		}

-

-		//cleanup target 

-		UpdateManagerUtils.removeFromFileSystem(target);

-

-

-	}

-	

-}

diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/regularInstall/TestGetFeature.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/regularInstall/TestGetFeature.java
deleted file mode 100644
index b3d4356..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/regularInstall/TestGetFeature.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2000, 2003 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials 

- * are made available under the terms of the Common Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/cpl-v10.html

- * 

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-package org.eclipse.update.tests.regularInstall;

-

-import org.eclipse.update.core.*;

-import org.eclipse.update.tests.UpdateManagerTestCase;

-

-

-public class TestGetFeature extends UpdateManagerTestCase {

-

-	/**

-	 * Test the getFeatures()

-	 */

-	public TestGetFeature(String arg0) {

-		super(arg0);

-	}

-	

-	

-	public void testFeatureFileSite() throws Exception{

-		

-		ISite remoteSite = SiteManager.getSite(SOURCE_FILE_SITE);

-		IFeatureReference[] remoteFeatures = remoteSite.getFeatureReferences();

-		if (remoteFeatures==null || remoteFeatures.length==0) fail("No feature available for testing");

-		for (int i=0;i<remoteFeatures.length;i++){

-			System.out.println("feature:"+remoteFeatures[i].getURL().toExternalForm());

-		}

-	}

-

-

-	public void testFeatureHTTPSite() throws Exception{ 

-		

-		ISite remoteSite = SiteManager.getSite(SOURCE_HTTP_SITE);

-		IFeatureReference[] remoteFeatures = remoteSite.getFeatureReferences();

-		if (remoteFeatures==null || remoteFeatures.length==0) fail("No feature available for testing");		

-		for (int i=0;i<remoteFeatures.length;i++){

-			System.out.println("feature:"+remoteFeatures[i].getURL().toExternalForm());

-		}

-	}

-}

-

-

diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/regularInstall/TestInstall.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/regularInstall/TestInstall.java
deleted file mode 100644
index 7e367e2..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/regularInstall/TestInstall.java
+++ /dev/null
@@ -1,317 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2000, 2003 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials 

- * are made available under the terms of the Common Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/cpl-v10.html

- * 

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-package org.eclipse.update.tests.regularInstall;

-import java.io.File;

-import java.net.MalformedURLException;

-import java.net.URL;

-

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.update.core.*;

-import org.eclipse.update.configuration.*;

-import org.eclipse.update.internal.core.*;

-import org.eclipse.update.tests.UpdateManagerTestCase;

-

-public class TestInstall extends UpdateManagerTestCase {

-

-	/**

-	 * 

-	 */

-	public static final String PACKAGED_FEATURE_TYPE = "packaged"; //$NON-NLS-1$

-

-	public class Listener implements IConfiguredSiteChangedListener {

-

-		public boolean notified = false;

-

-		public void featureInstalled(IFeature feature) {

-			notified = true;

-			System.out.println("Notified DefaultFeature Installed");

-		}

-

-		public void featureRemoved(IFeature feature) {

-		}

-

-		public void featureConfigured(IFeature feature) {

-		};

-		public void featureUnconfigured(IFeature feature) {

-		};

-

-		public boolean isNotified() {

-			return notified;

-		}

-	}

-

-	/**

-	 * Constructor for Test1

-	 */

-	public TestInstall(String arg0) {

-		super(arg0);

-	}

-

-	private IFeature getFeature1(ISite site)

-		throws MalformedURLException, CoreException {

-		SiteFeatureReference ref = new SiteFeatureReference();

-		ref.setSite(site);

-		ref.setURLString("features/org.eclipse.update.core.tests.feature1_1.0.4.jar");

-		ref.setType(getDefaultInstallableFeatureType());

-		ref.resolve(site.getURL(), null);

-		return ref.getFeature();

-	}

-

-	public void testFileSite() throws Exception {

-

-		ISite remoteSite = SiteManager.getSite(SOURCE_FILE_SITE);

-		IFeature remoteFeature = getFeature1(remoteSite);

-		ISite localSite = SiteManager.getSite(TARGET_FILE_SITE);

-		localSite.install(remoteFeature, null, null);

-

-		// verify

-		String site = localSite.getURL().getFile();

-		IPluginEntry[] entries = remoteFeature.getPluginEntries();

-		assertTrue("no plugins entry", (entries != null && entries.length != 0));

-		String pluginName = entries[0].getVersionedIdentifier().toString();

-		File pluginFile = new File(site, Site.DEFAULT_PLUGIN_PATH + pluginName);

-		assertTrue("plugin files not installed locally:"+pluginFile, pluginFile.exists());

-		File pluginXMLFile =

-			new File(

-				site,

-				Site.DEFAULT_PLUGIN_PATH + pluginName + File.separator + "plugin.xml");

-		assertTrue("plugin.xml file not installed locally", pluginXMLFile.exists());

-

-		File featureFile =

-			new File(

-				site,

-				Site.DEFAULT_INSTALLED_FEATURE_PATH

-					+ remoteFeature.getVersionedIdentifier().toString());

-		assertTrue(

-			"feature info not installed locally:" + featureFile,

-			featureFile.exists());

-		//cleanup

-		UpdateManagerUtils.removeFromFileSystem(pluginFile);

-		UpdateManagerUtils.removeFromFileSystem(new File(localSite.getURL().getFile()));

-

-	}

-

-	/**

-	 * 

-	 */

-	public void testHTTPSite() throws Exception {

-

-		ISite remoteSite = SiteManager.getSite(SOURCE_HTTP_SITE);

-		IFeatureReference[] features = remoteSite.getFeatureReferences();

-		IFeature remoteFeature = null;

-

-		if (features == null || features.length == 0)

-			fail("No features on the site");

-

-		for (int i = 0; i < features.length; i++) {

-			if (features[i].getURL().toExternalForm().endsWith("features2.jar")) {

-				remoteFeature = features[i].getFeature();

-				break;

-			}

-		}

-

-		assertNotNull("Cannot find feature2.jar on site", remoteFeature);

-		ISite localSite = SiteManager.getSite(TARGET_FILE_SITE);

-		localSite.install(remoteFeature, null, null);

-

-		// feature2.jar should not be in the local site

-		IFeatureReference[] localFeatures = localSite.getFeatureReferences();

-		if (localFeatures == null || localFeatures.length == 0)

-			fail("No features on the target site");

-

-		boolean found = false;

-		for (int i = 0; i < localFeatures.length; i++) {

-			if (localFeatures[i].getURL().toExternalForm().endsWith("features2.jar")) {

-				found = true;

-				break;

-			}

-		}

-

-		assertTrue(

-			"Found feature2.jar on target site. Target site feature ref shouldnot contain JAR file",

-			!found);

-

-		// check

-		String site = localSite.getURL().getFile();

-		IPluginEntry[] entries = remoteFeature.getPluginEntries();

-		assertTrue("no plugins entry", (entries != null && entries.length != 0));

-

-		String pluginName = entries[0].getVersionedIdentifier().toString();

-		File pluginFile = new File(site, Site.DEFAULT_PLUGIN_PATH + pluginName);

-		assertTrue("plugin info not installed locally:"+pluginFile, pluginFile.exists());

-

-		File featureFile =

-			new File(

-				site,

-				Site.DEFAULT_INSTALLED_FEATURE_PATH

-					+ remoteFeature.getVersionedIdentifier().toString());

-		assertTrue("feature info not installed locally", featureFile.exists());

-

-		//localSite.save();

-

-		//cleanup

-		UpdateManagerUtils.removeFromFileSystem(pluginFile);

-		UpdateManagerUtils.removeFromFileSystem(new File(localSite.getURL().getFile()));

-	}

-

-	public void testInstall() throws Exception {

-

-		// cleanup local files...

-		URL localURL = ((SiteLocal) SiteManager.getLocalSite()).getLocationURL();

-		File localFile =

-			new File(new URL(localURL, SiteLocal.SITE_LOCAL_FILE).getFile());

-		UpdateManagerUtils.removeFromFileSystem(localFile);

-

-		URL INSTALL_SITE = null;

-		try {

-			INSTALL_SITE =

-				new URL("http", getHttpHost(), getHttpPort(), bundle.getString("HTTP_PATH_2"));

-		} catch (Exception e) {

-			fail(e.toString());

-			e.printStackTrace();

-		}

-

-		ISite remoteSite = SiteManager.getSite(INSTALL_SITE);

-		IFeatureReference[] features = remoteSite.getFeatureReferences();

-		IFeature remoteFeature = null;

-

-		if (features == null || features.length == 0)

-			fail("No features on the site");

-

-		for (int i = 0; i < features.length; i++) {

-			if (features[i].getURL().toExternalForm().endsWith("helpFeature.jar")) {

-				remoteFeature = features[i].getFeature();

-				break;

-			}

-		}

-

-		assertNotNull("Cannot find help.jar on site", remoteFeature);

-		ILocalSite localSite = SiteManager.getLocalSite();

-		IConfiguredSite site =

-			localSite.getCurrentConfiguration().getConfiguredSites()[0];

-		Listener listener = new Listener();

-		site.addConfiguredSiteChangedListener(listener);

-

-		((ConfiguredSite)site).setUpdatable(true);

-		site.install(remoteFeature, null, null);

-

-		IPluginEntry[] entries = remoteFeature.getRawPluginEntries();

-		assertTrue("no plugins entry", (entries != null && entries.length != 0));

-

-		String sitePath = site.getSite().getURL().getFile();

-		String pluginName = entries[0].getVersionedIdentifier().toString();

-		File pluginFile = new File(sitePath, Site.DEFAULT_PLUGIN_PATH + pluginName);

-		assertTrue("plugin info not installed locally", pluginFile.exists());

-

-		File featureFile =

-			new File(

-				sitePath,

-				Site.DEFAULT_INSTALLED_FEATURE_PATH

-					+ remoteFeature.getVersionedIdentifier().toString());

-		assertTrue("feature info not installed locally", featureFile.exists());

-

-		//cleanup

-		File file =

-			new File(

-				site.getSite().getURL().getFile()

-					+ File.separator

-					+ Site.DEFAULT_INSTALLED_FEATURE_PATH

-					+ remoteFeature.getVersionedIdentifier());

-		UpdateManagerUtils.removeFromFileSystem(file);

-		UpdateManagerUtils.removeFromFileSystem(pluginFile);

-		UpdateManagerUtils.removeFromFileSystem(localFile);

-		UpdateManagerUtils.removeFromFileSystem(

-			new File(

-				((InstallConfiguration) localSite.getCurrentConfiguration())

-					.getURL()

-					.getFile()));

-

-		site.removeConfiguredSiteChangedListener(listener);

-		assertTrue("Listener hasn't received notification", listener.isNotified());

-	}

-

-	public void testFileSiteWithoutSiteXML() throws Exception {

-

-		ISite remoteSite = SiteManager.getSite(SOURCE_FILE_SITE);

-		IFeature remoteFeature = getFeature1(remoteSite);

-		IConfiguredSite localSite =

-			SiteManager.getLocalSite().getCurrentConfiguration().getConfiguredSites()[0];

-		localSite.getSite().install(remoteFeature, null, null);

-

-		IFeatureReference[] features = localSite.getSite().getFeatureReferences();

-		if (features.length == 0)

-			fail("The local site does not contain feature, should not contain an XML file but features should be found anyway by parsing");

-		if (localSite.getSite().getArchives().length == 0)

-			fail("The local site does not contain archives, should not contain an XML file but archives should be found anyway by parsing");

-

-		//cleanup

-		File file =

-			new File(

-				localSite.getSite().getURL().getFile()

-					+ File.separator

-					+ Site.DEFAULT_INSTALLED_FEATURE_PATH

-					+ remoteFeature.getVersionedIdentifier());

-		UpdateManagerUtils.removeFromFileSystem(file);

-		file =

-			new File(

-				localSite.getSite().getURL().getFile()

-					+ File.separator

-					+ Site.DEFAULT_PLUGIN_PATH

-					+ "org.eclipse.update.core.tests.feature1.plugin1_3.5.6");

-		UpdateManagerUtils.removeFromFileSystem(file);

-		file =

-			new File(

-				localSite.getSite().getURL().getFile()

-					+ File.separator

-					+ Site.DEFAULT_PLUGIN_PATH

-					+ "org.eclipse.update.core.tests.feature1.plugin2_5.0.0");

-		UpdateManagerUtils.removeFromFileSystem(file);

-		File localFile =

-			new File(

-				new URL(

-					((SiteLocal) SiteManager.getLocalSite()).getLocationURL(),

-					SiteLocal.SITE_LOCAL_FILE)

-					.getFile());

-		UpdateManagerUtils.removeFromFileSystem(localFile);

-

-		try {

-			SiteManager.getSite(new URL("http://www.eclipse.org/"));

-			fail("The site contains site.xml... it should be an HTTP site without an XML file");			

-		} catch (CoreException e) {

-			// expected

-		}

-

-	}

-

-	/**

-	* 

-	*/

-	private Feature createPackagedFeature(URL url, ISite site)

-		throws CoreException {

-		String packagedFeatureType = ISite.DEFAULT_PACKAGED_FEATURE_TYPE;

-		Feature result = null;

-		if (packagedFeatureType != null) {

-			IFeatureFactory factory =

-				FeatureTypeFactory.getInstance().getFactory(packagedFeatureType);

-			result = (Feature) factory.createFeature(url, site);

-		}

-		return result;

-	}

-	/*

-	 * @see ISite#getDefaultInstallableFeatureType()

-	 */

-	public String getDefaultInstallableFeatureType() {

-		String pluginID =

-			UpdateCore.getPlugin().getDescriptor().getUniqueIdentifier() + ".";

-		return pluginID + PACKAGED_FEATURE_TYPE;

-	}

-

-}

diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/regularInstall/TestInstallURLSIteXML.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/regularInstall/TestInstallURLSIteXML.java
deleted file mode 100644
index 6a1f85b..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/regularInstall/TestInstallURLSIteXML.java
+++ /dev/null
@@ -1,330 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2000, 2003 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials 

- * are made available under the terms of the Common Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/cpl-v10.html

- * 

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-package org.eclipse.update.tests.regularInstall;

-import java.io.File;

-import java.net.MalformedURLException;

-import java.net.URL;

-

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.update.core.*;

-import org.eclipse.update.configuration.*;

-import org.eclipse.update.internal.core.*;

-import org.eclipse.update.tests.UpdateManagerTestCase;

-

-public class TestInstallURLSIteXML extends UpdateManagerTestCase {

-

-	/**

-	 * 

-	 */

-	public static final String PACKAGED_FEATURE_TYPE = "packaged"; //$NON-NLS-1$	

-

-	public class Listener implements IConfiguredSiteChangedListener {

-

-		public boolean notified = false;

-

-		public void featureInstalled(IFeature feature) {

-			notified = true;

-			System.out.println("Notified DefaultFeature Installed");

-		}

-

-		public void featureRemoved(IFeature feature) {

-		}

-

-		public void featureConfigured(IFeature feature) {

-		};

-		public void featureUnconfigured(IFeature feature) {

-		};

-

-		public boolean isNotified() {

-			return notified;

-		}

-	}

-

-	/**

-	 * Constructor for Test1

-	 */

-	public TestInstallURLSIteXML(String arg0) {

-		super(arg0);

-	}

-

-	private IFeature getFeature1(ISite site)

-		throws MalformedURLException, CoreException {

-		SiteFeatureReference ref = new SiteFeatureReference();

-		ref.setSite(site);

-		ref.setURLString("features/org.eclipse.update.core.tests.feature1_1.0.4.jar");

-		ref.setType(ISite.DEFAULT_PACKAGED_FEATURE_TYPE);

-		ref.resolve(site.getURL(), null);

-		return ref.getFeature();

-	}

-

-	public void testFileSite() throws Exception {

-

-		ISite remoteSite =

-			SiteManager.getSite(new URL(SOURCE_FILE_SITE, Site.SITE_XML));

-		IFeature remoteFeature = getFeature1(remoteSite);

-		URL url = TARGET_FILE_SITE;

-		File file = new File(TARGET_FILE_SITE.getFile());

-		if (!file.exists()) file.mkdirs();

-		ISite localSite = SiteManager.getSite(url);

-		remove(remoteFeature,localSite);

-		localSite.install(remoteFeature, null, null);

-

-		// verify

-		String site = TARGET_FILE_SITE.getFile();

-		IPluginEntry[] entries = remoteFeature.getPluginEntries();

-		assertTrue("no plugins entry", (entries != null && entries.length != 0));

-		String pluginName = entries[0].getVersionedIdentifier().toString();

-		File pluginFile = new File(site, Site.DEFAULT_PLUGIN_PATH + pluginName);

-		assertTrue("plugin files not installed locally", pluginFile.exists());

-		File pluginXMLFile =

-			new File(

-				site,

-				Site.DEFAULT_PLUGIN_PATH + pluginName + File.separator + "plugin.xml");

-		assertTrue("plugin.xml file not installed locally", pluginXMLFile.exists());

-

-		File featureFile =

-			new File(

-				site,

-				Site.DEFAULT_INSTALLED_FEATURE_PATH

-					+ remoteFeature.getVersionedIdentifier().toString());

-		assertTrue(

-			"feature info not installed locally:" + featureFile,

-			featureFile.exists());

-		//cleanup

-		UpdateManagerUtils.removeFromFileSystem(pluginFile);

-		UpdateManagerUtils.removeFromFileSystem(new File(localSite.getURL().getFile()));

-

-	}

-

-	/**

-	 * 

-	 */

-	public void testHTTPSite() throws Exception {

-

-		// clean

-		File targetFile  = new File(TARGET_FILE_SITE.getFile());

-		UpdateManagerUtils.removeFromFileSystem(targetFile);

-

-		ISite remoteSite =

-			SiteManager.getSite(new URL(SOURCE_HTTP_SITE, Site.SITE_XML));

-		IFeatureReference[] features = remoteSite.getFeatureReferences();

-		IFeature remoteFeature = null;

-

-		if (features == null || features.length == 0)

-			fail("No features on the site");

-

-		for (int i = 0; i < features.length; i++) {

-			if (features[i].getURL().toExternalForm().endsWith("features2.jar")) {

-				remoteFeature = features[i].getFeature();

-				break;

-			}

-		}

-

-		assertNotNull("Cannot find feature2.jar on site", remoteFeature);

-		URL url = TARGET_FILE_SITE;

-		File file = new File(TARGET_FILE_SITE.getFile());

-		if (!file.exists()) file.mkdirs();

-		ISite localSite = SiteManager.getSite(url);

-		localSite.install(remoteFeature, null, null);

-

-		// feature2.jar should not be in the local site

-		IFeatureReference[] localFeatures = localSite.getFeatureReferences();

-		if (localFeatures == null || localFeatures.length == 0)

-			fail("No features on the target site");

-

-		boolean found = false;

-		for (int i = 0; i < localFeatures.length; i++) {

-			if (localFeatures[i].getURL().toExternalForm().endsWith("features2.jar")) {

-				found = true;

-				break;

-			}

-		}

-

-		assertTrue(

-			"Found feature2.jar on target site. Target site feature ref shouldnot contain JAR file",

-			!found);

-

-		// check

-		String site = TARGET_FILE_SITE.getFile();

-		IPluginEntry[] entries = remoteFeature.getPluginEntries();

-		assertTrue("no plugins entry", (entries != null && entries.length != 0));

-

-		String pluginName = entries[0].getVersionedIdentifier().toString();

-		File pluginFile = new File(site, Site.DEFAULT_PLUGIN_PATH + pluginName);

-		assertTrue("plugin info not installed locally", pluginFile.exists());

-

-		File featureFile =

-			new File(

-				site,

-				Site.DEFAULT_INSTALLED_FEATURE_PATH

-					+ remoteFeature.getVersionedIdentifier().toString());

-		assertTrue("feature info not installed locally", featureFile.exists());

-

-		//localSite.save();

-

-		//cleanup

-		UpdateManagerUtils.removeFromFileSystem(pluginFile);

-		UpdateManagerUtils.removeFromFileSystem(new File(localSite.getURL().getFile()));

-	}

-

-	public void testInstall() throws Exception {

-

-		// cleanup local files...

-		SiteLocal siteLocal = ((SiteLocal) SiteManager.getLocalSite());

-		File localFile = new File(siteLocal.getLocationURL().getFile());

-		//if (!localFile.exists()) fail("LocalSite file doesn't exist ->"+localFile.getAbsolutePath()+"<-");

-		UpdateManagerUtils.removeFromFileSystem(localFile.getParentFile());		

-		/*

-		localFile = new File(localFile,SiteLocal.SITE_LOCAL_FILE);

-		if (!localFile.exists()) fail("LocalSite.xml doesn't exist:"+localFile);

-		UpdateManagerUtils.removeFromFileSystem(localFile);

-		*/

-		

-		InternalSiteManager.localSite = null;

-

-		URL INSTALL_SITE = null;

-		try {

-			INSTALL_SITE =

-				new URL("http", getHttpHost(), getHttpPort(), bundle.getString("HTTP_PATH_2"));

-		} catch (Exception e) {

-			fail(e.toString());

-			e.printStackTrace();

-		}

-

-		ISite remoteSite = SiteManager.getSite(INSTALL_SITE);

-		IFeatureReference[] features = remoteSite.getFeatureReferences();

-		IFeature remoteFeature = null;

-

-		if (features == null || features.length == 0)

-			fail("No features on the site");

-

-		for (int i = 0; i < features.length; i++) {

-			if (features[i].getURL().toExternalForm().endsWith("helpFeature.jar")) {

-				remoteFeature = features[i].getFeature();

-				break;

-			}

-		}

-

-		assertNotNull("Cannot find help.jar on site", remoteFeature);

-		ILocalSite localSite = SiteManager.getLocalSite();

-		IConfiguredSite site = localSite.getCurrentConfiguration().getConfiguredSites()[0];

-		Listener listener = new Listener();

-		site.addConfiguredSiteChangedListener(listener);

-

-		((ConfiguredSite)site).setUpdatable(true);

-		site.install(remoteFeature, null, null);

-

-		IPluginEntry[] entries = remoteFeature.getRawPluginEntries();

-		assertTrue("no plugins entry", (entries != null && entries.length != 0));

-

-		String sitePath = site.getSite().getURL().getFile();

-		String pluginName = entries[0].getVersionedIdentifier().toString();

-		File pluginFile = new File(sitePath, Site.DEFAULT_PLUGIN_PATH + pluginName);

-		assertTrue("plugin info not installed locally:"+pluginFile, pluginFile.exists());

-

-		File featureFile =

-			new File(

-				sitePath,

-				Site.DEFAULT_INSTALLED_FEATURE_PATH

-					+ remoteFeature.getVersionedIdentifier().toString());

-		assertTrue("feature info not installed locally", featureFile.exists());

-

-		//cleanup

-		File file =

-			new File(

-				site.getSite().getURL().getFile()

-					+ File.separator

-					+ Site.DEFAULT_INSTALLED_FEATURE_PATH

-					+ remoteFeature.getVersionedIdentifier());

-		UpdateManagerUtils.removeFromFileSystem(file);

-		UpdateManagerUtils.removeFromFileSystem(pluginFile);

-		UpdateManagerUtils.removeFromFileSystem(localFile);

-		UpdateManagerUtils.removeFromFileSystem(

-			new File(

-				((InstallConfiguration) localSite.getCurrentConfiguration())

-					.getURL()

-					.getFile()));

-

-		site.removeConfiguredSiteChangedListener(listener);

-		assertTrue("Listener hasn't received notification", listener.isNotified());

-	}

-

-	public void testFileSiteWithoutSiteXML() throws Exception {

-

-		ISite remoteSite =

-			SiteManager.getSite(new URL(SOURCE_FILE_SITE, Site.SITE_XML));

-		IFeature remoteFeature = getFeature1(remoteSite);

-		IConfiguredSite localSite =

-			SiteManager.getLocalSite().getCurrentConfiguration().getConfiguredSites()[0];

-		localSite.getSite().install(remoteFeature, null, null);

-

-		IFeatureReference[] features = localSite.getSite().getFeatureReferences();

-		if (features.length == 0)

-			fail("The local site does not contain feature, should not contain an XML file but features should be found anyway by parsing");

-		if (localSite.getSite().getArchives().length == 0)

-			fail("The local site does not contain archives, should not contain an XML file but archives should be found anyway by parsing");

-

-		//cleanup

-		File file =

-			new File(

-				localSite.getSite().getURL().getFile()

-					+ File.separator

-					+ Site.DEFAULT_INSTALLED_FEATURE_PATH

-					+ remoteFeature.getVersionedIdentifier());

-		UpdateManagerUtils.removeFromFileSystem(file);

-		file =

-			new File(

-				localSite.getSite().getURL().getFile()

-					+ File.separator

-					+ Site.DEFAULT_PLUGIN_PATH

-					+ "org.eclipse.update.core.tests.feature1.plugin1_3.5.6");

-		UpdateManagerUtils.removeFromFileSystem(file);

-		file =

-			new File(

-				localSite.getSite().getURL().getFile()

-					+ File.separator

-					+ Site.DEFAULT_PLUGIN_PATH

-					+ "org.eclipse.update.core.tests.feature1.plugin2_5.0.0");

-		UpdateManagerUtils.removeFromFileSystem(file);

-		File localFile =

-			new File(

-				new URL(

-					((SiteLocal) SiteManager.getLocalSite()).getLocationURL(),

-					SiteLocal.SITE_LOCAL_FILE)

-					.getFile());

-		UpdateManagerUtils.removeFromFileSystem(localFile);

-

-	}

-

-	/**

-	* 

-	*/

-	private Feature createPackagedFeature(URL url, ISite site)

-		throws CoreException {

-		String packagedFeatureType = ISite.DEFAULT_PACKAGED_FEATURE_TYPE;

-		Feature result = null;

-		if (packagedFeatureType != null) {

-			IFeatureFactory factory =

-				FeatureTypeFactory.getInstance().getFactory(packagedFeatureType);

-			result = (Feature) factory.createFeature(url, site);

-		}

-		return result;

-	}

-	/*

-	 * @see ISite#getDefaultInstallableFeatureType()

-	 */

-	public String getDefaultInstallableFeatureType() {

-		String pluginID =

-			UpdateCore.getPlugin().getDescriptor().getUniqueIdentifier() + ".";

-		return pluginID + PACKAGED_FEATURE_TYPE;

-	}

-

-}

diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/regularInstall/TestLocalSite.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/regularInstall/TestLocalSite.java
deleted file mode 100644
index 8c9e2c2..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/regularInstall/TestLocalSite.java
+++ /dev/null
@@ -1,448 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2000, 2003 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials 

- * are made available under the terms of the Common Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/cpl-v10.html

- * 

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-package org.eclipse.update.tests.regularInstall;

-import java.io.File;

-import java.net.URL;

-

-import org.eclipse.core.boot.IPlatformConfiguration;

-import org.eclipse.update.configuration.*;

-import org.eclipse.update.core.*;

-import org.eclipse.update.internal.core.*;

-import org.eclipse.update.internal.model.ConfigurationPolicyModel;

-import org.eclipse.update.tests.UpdateManagerTestCase;

-

-public class TestLocalSite extends UpdateManagerTestCase {

-	

-	/**

-	 * Test the getFeatures()

-	 */

-	public TestLocalSite(String arg0) {

-		super(arg0);

-	}

-	

-	public void testCreationConfigFile() throws Exception {

-

-		//clean up

-		SiteLocal siteLocal = (SiteLocal)SiteManager.getLocalSite();

-		URL newURL = new URL(siteLocal.getLocationURL(),SiteLocal.SITE_LOCAL_FILE);

-		File localFile = new File(newURL.getFile());

-		UpdateManagerUtils.removeFromFileSystem(localFile);

-		UpdateManagerUtils.removeFromFileSystem(new File(((InstallConfiguration)siteLocal.getCurrentConfiguration()).getURL().getFile()));	

-		InternalSiteManager.localSite=null;	

-

-

-		ILocalSite site = SiteManager.getLocalSite();

-		site.save();

-		URL location = ((SiteLocal)site).getLocationURL();

-		String fileName = UpdateManagerUtils.getLocalRandomIdentifier(SiteLocal.DEFAULT_CONFIG_FILE, site.getCurrentConfiguration().getCreationDate());

-		String filePath = new URL(location,fileName).getFile();

-		File file = new File(filePath);

-		assertTrue("config file hasn't been saved in :"+filePath, file.exists());

-		assertTrue("Local site hasn't been saved in :"+localFile.getAbsolutePath(),localFile.exists());

-		

-		// cleanup

-		UpdateManagerUtils.removeFromFileSystem(file);

-		UpdateManagerUtils.removeFromFileSystem(localFile);		

-		

-

-	}

-	

-	public void testDefaultConfigFile() throws Exception {

-

-		//clean up

-		SiteLocal siteLocal = (SiteLocal)SiteManager.getLocalSite();

-		URL newURL = new URL(siteLocal.getLocationURL(),SiteLocal.SITE_LOCAL_FILE);

-		File localFile = new File(newURL.getFile());

-		UpdateManagerUtils.removeFromFileSystem(localFile);

-		UpdateManagerUtils.removeFromFileSystem(new File(((InstallConfiguration)siteLocal.getCurrentConfiguration()).getURL().getFile()));	

-		InternalSiteManager.localSite=null;

-

-		ILocalSite site = SiteManager.getLocalSite();

-		assertTrue("The local site does not contain an history of install configuration",site.getConfigurationHistory().length!=0);

-		assertTrue("The local site does not contain an current install configuration",site.getCurrentConfiguration()!=null);

-		assertTrue("The local site does not contain a default configuration site for the current install config",site.getCurrentConfiguration().getConfiguredSites().length!=0);

-		

-		System.out.println("Default Config Site is :"+site.getCurrentConfiguration().getConfiguredSites()[0].getSite().getURL().toExternalForm());

-		

-		// cleanup

-		URL location = ((SiteLocal)site).getLocationURL();		

-		String filePath = new URL(location,SiteLocal.DEFAULT_CONFIG_FILE).getFile();

-		File file = new File(filePath);

-		UpdateManagerUtils.removeFromFileSystem(file);		

-		UpdateManagerUtils.removeFromFileSystem(localFile);		

-		

-

-	}

-	

-/*	public void testInstallFeatureSaveConfig() throws Exception {

-

-		//clean up

-		SiteLocal siteLocal = (SiteLocal)SiteManager.getLocalSite();

-		URL newURL = new URL(siteLocal.getLocationURL(),SiteLocal.SITE_LOCAL_FILE);

-		File localFile = new File(newURL.getFile());

-		UpdateManagerUtils.removeFromFileSystem(localFile);

-		UpdateManagerUtils.removeFromFileSystem(new File(((InstallConfiguration)siteLocal.getCurrentConfiguration()).getURL().getFile()));	

-		InternalSiteManager.localSite=null;		

-

-		ILocalSite site = SiteManager.getLocalSite();

-		ISite remoteSite = SiteManager.getSite(SOURCE_FILE_SITE_INSTALLED);

-		IFeature feature = remoteSite.getFeatureReferences()[0].getFeature();

-		int oldNumber = site.getCurrentConfiguration().getConfiguredSites().length;

-		

-		// we are not checking if this is read only

-		IInstallConfiguration newConfig = site.cloneCurrentConfiguration();

-		newConfig.setLabel("new Label");		

-		//IInstallConfiguration newConfig = site.getCurrentConfiguration();

-		IConfiguredSite configSite = newConfig.getConfiguredSites()[0];

-		ConfigurationPolicyModel configPolicy = new BaseSiteLocalFactory().createConfigurationPolicyModel();

-		configPolicy.setPolicy(IPlatformConfiguration.ISitePolicy.USER_INCLUDE);

-		((ConfiguredSite)configSite).setConfigurationPolicy((ConfigurationPolicy)configPolicy);

-		int oldNumberOfhistory = site.getConfigurationHistory().length;		

-		site.addConfiguration(newConfig);	

-		assertNotNull(feature);	

-

-		((ConfiguredSite)configSite).isUpdatable(true);

-		remove(feature,configSite);				

-		configSite.install(feature,null,null);

-				

-		// teh current one points to a real fature

-		// does not throw error.

-		IConfiguredSite configSite2 = site.getCurrentConfiguration().getConfiguredSites()[0];

-		assertTrue("No Configured features found",configSite.getConfiguredFeatures().length>0);

-		IFeatureReference ref = configSite2.getConfiguredFeatures()[0];

-		IFeature feature2 = ref.getFeature();

-		//String configuredFeature = feature2.getLabel();

-

-		assertEquals(feature2.getVersionedIdentifier().toString(),"org.eclipse.update.core.tests.feature3_1.0.0");

-		assertTrue("Wrong id  version of feature",feature2.getVersionedIdentifier().toString().equalsIgnoreCase("org.eclipse.update.core.tests.feature3_1.0.0"));

-		

-		// only one feature configured

-		assertTrue("too many features configured",configSite2.getConfiguredFeatures().length==1);

-		

-		// no feature unconfigured

-		assertTrue("too many unconfigured features",((ConfiguredSite)configSite2).getConfigurationPolicy().getUnconfiguredFeatures().length==0);

-		

-		// test only 2 install config in local site

-		//assertEquals("wrong number of history in Local site:",oldNumberOfhistory+1,site.getConfigurationHistory().length);

-		

-		// test same # of sites in current config

-		assertTrue("Wrong number of config sites in current config",site.getCurrentConfiguration().getConfiguredSites().length==oldNumber);

-		

-		//test only one feature for the site

-		assertTrue("wrong number of configured features for config site",site.getCurrentConfiguration().getConfiguredSites()[0].getConfiguredFeatures().length==1);

-		

-		// test only 2 activities

-		assertTrue("Wrong number of activities for install config",site.getCurrentConfiguration().getActivities().length==2);

-

-		site.save();		

-

-		// check

-		// there are 2 configuration

-		String time = ""+site.getCurrentConfiguration().getCreationDate().getTime();

-		URL location = ((SiteLocal)site).getLocationURL();

-		File file = new File(new URL(location,"Config"+time+".xml").getFile());

-		assertTrue("new configuration does not exist", file.exists());

-		

-		// cleanup

-		localFile = new File(new URL(location,SiteLocal.SITE_LOCAL_FILE).getFile());

-		UpdateManagerUtils.removeFromFileSystem(localFile);		

-		localFile = new File(new URL(location,SiteLocal.DEFAULT_CONFIG_FILE).getFile());

-		UpdateManagerUtils.removeFromFileSystem(localFile);	

-		localFile = new File(new URL(location,Site.DEFAULT_FEATURE_PATH+File.separator+feature.getVersionedIdentifier().toString()).getFile());		

-		UpdateManagerUtils.removeFromFileSystem(localFile);	

-		localFile = new File(new URL(location,Site.DEFAULT_FEATURE_PATH+File.separator+feature2.getVersionedIdentifier().toString()).getFile());		

-		UpdateManagerUtils.removeFromFileSystem(localFile);	

-		UpdateManagerUtils.removeFromFileSystem(file);		

-		localFile = new File(feature2.getURL().getFile());

-		UpdateManagerUtils.removeFromFileSystem(localFile);

-	}

-*/

-	

-	public void testRetriveConfig() throws Exception {

-

-		//clean up

-		SiteLocal siteLocal = (SiteLocal)SiteManager.getLocalSite();

-		URL newURL = new URL(siteLocal.getLocationURL(),SiteLocal.SITE_LOCAL_FILE);

-		File localFile = new File(newURL.getFile());

-		UpdateManagerUtils.removeFromFileSystem(localFile);

-		UpdateManagerUtils.removeFromFileSystem(new File(((InstallConfiguration)siteLocal.getCurrentConfiguration()).getURL().getFile()));	

-		InternalSiteManager.localSite=null;		

-

-		ILocalSite site = SiteManager.getLocalSite();

-		ISite remoteSite = SiteManager.getSite(SOURCE_FILE_SITE_INSTALLED);

-		IFeature feature = remoteSite.getFeatureReferences()[0].getFeature();

-		int oldNumber = site.getCurrentConfiguration().getConfiguredSites().length;		

-		

-		// we are not checking if this is read only

-		IInstallConfiguration newConfig = site.cloneCurrentConfiguration();

-		newConfig.setLabel("new Label");		

-		IConfiguredSite configSite = newConfig.getConfiguredSites()[0];

-		ConfigurationPolicyModel configPolicy = new BaseSiteLocalFactory().createConfigurationPolicyModel();

-		configPolicy.setPolicy(IPlatformConfiguration.ISitePolicy.USER_INCLUDE);

-		((ConfiguredSite)configSite).setConfigurationPolicyModel((ConfigurationPolicyModel)configPolicy);	

-		int oldNumberOfhistory = site.getConfigurationHistory().length;			

-		site.addConfiguration(newConfig);

-		assertNotNull(feature);			

-		

-		((ConfiguredSite)configSite).setUpdatable(true);

-		remove(feature,configSite);			

-		configSite.install(feature,null,null);

-		site.save();

-		

-		// we created the second xml file

-

-		//do not cleanup, we want to reuse previously created local site

-		// but force re-read of xml File

-		InternalSiteManager.localSite=null;

-		site = SiteManager.getLocalSite();

-		

-		// check

-		// there are 2 configuration

-		String time = ""+site.getCurrentConfiguration().getCreationDate().getTime();

-		URL location = ((SiteLocal)site).getLocationURL();		

-		File file = new File(new URL(location,SiteLocal.DEFAULT_CONFIG_PREFIX+time+".xml").getFile());

-		assertTrue("new configuration does not exist", file.exists());

-		

-		// teh current one points to a real fature

-		// does not throw error.

-		IConfiguredSite configSite2 = site.getCurrentConfiguration().getConfiguredSites()[0];

-		IFeatureReference[] refs = configSite2.getConfiguredFeatures();

-		IFeature feature2 = null;

-		for (int i = 0; i < refs.length; i++) {

-			IFeature feature3 = refs[i].getFeature();			

-			if ("org.eclipse.update.core.tests.feature3_1.0.0".equals(feature3.getVersionedIdentifier().toString())){

-				feature2 = feature3;

-			}		

-		}

-		assertNotNull("Feature 2 is Null",feature2);

-		assertTrue("Wrong id  version of feature",feature2.getVersionedIdentifier().toString().equalsIgnoreCase("org.eclipse.update.core.tests.feature3_1.0.0"));

-		

-		// test only 2 install config in local site

-		assertEquals("wrong number of history in Local site:",oldNumberOfhistory+1,site.getConfigurationHistory().length);

-		

-		// test # of sites in current config

-		assertTrue("Wrong number of config sites in current config",site.getCurrentConfiguration().getConfiguredSites().length==oldNumber);

-		

-		//test only one feature for the site

-		assertTrue("wrong number of configured features for config site",site.getCurrentConfiguration().getConfiguredSites()[0].getConfiguredFeatures().length==1);

-		

-		// test only 2 activities

-		assertTrue("Wrong number of activities for install config",site.getCurrentConfiguration().getActivities().length==2);

-		

-		

-		// cleanup

-		localFile = new File(new URL(location,SiteLocal.SITE_LOCAL_FILE).getFile());

-		UpdateManagerUtils.removeFromFileSystem(localFile);		

-		localFile = new File(new URL(location,SiteLocal.DEFAULT_CONFIG_FILE).getFile());

-		UpdateManagerUtils.removeFromFileSystem(localFile);			

-		localFile = new File(new URL(location,Site.DEFAULT_FEATURE_PATH+File.separator+feature.getVersionedIdentifier().toString()).getFile());		

-		UpdateManagerUtils.removeFromFileSystem(localFile);	

-		UpdateManagerUtils.removeFromFileSystem(new File(((InstallConfiguration)site.getCurrentConfiguration()).getURL().getFile()));				

-		UpdateManagerUtils.removeFromFileSystem(file);		

-	}

-

-	public void testRetriveConfigHTTPInstall() throws Exception {

-

-		//clean up

-		SiteLocal siteLocal = (SiteLocal)SiteManager.getLocalSite();

-		URL newURL = new URL(siteLocal.getLocationURL(),SiteLocal.SITE_LOCAL_FILE);

-		File localFile = new File(newURL.getFile());

-		UpdateManagerUtils.removeFromFileSystem(localFile);

-		UpdateManagerUtils.removeFromFileSystem(new File(((InstallConfiguration)siteLocal.getCurrentConfiguration()).getURL().getFile()));	

-		InternalSiteManager.localSite=null;		

-

-		ILocalSite site = SiteManager.getLocalSite();

-		ISite remoteSite = SiteManager.getSite(SOURCE_HTTP_SITE);

-		IFeature feature = remoteSite.getFeatureReferences()[0].getFeature();

-		

-		// we are not checking if this is read only

-		IInstallConfiguration newConfig = site.cloneCurrentConfiguration();

-		newConfig.setLabel("new Label");		

-		IConfiguredSite configSite = newConfig.getConfiguredSites()[0];

-		ConfigurationPolicyModel configPolicy = new BaseSiteLocalFactory().createConfigurationPolicyModel();

-		configPolicy.setPolicy(IPlatformConfiguration.ISitePolicy.USER_INCLUDE);

-		((ConfiguredSite)configSite).setConfigurationPolicyModel((ConfigurationPolicyModel)configPolicy);	

-		int oldNumberOfhistory = site.getConfigurationHistory().length;			

-		site.addConfiguration(newConfig);

-		

-	

-		((ConfiguredSite)configSite).setUpdatable(true);				

-		configSite.install(feature,null,null);

-		site.save();

-

-		//do not cleanup, we want to reuse previously created local site

-		// but force re-read of xml File

-		InternalSiteManager.localSite=null;

-		site = SiteManager.getLocalSite();

-		feature = remoteSite.getFeatureReferences()[0].getFeature();

-		int oldNumber = site.getCurrentConfiguration().getConfiguredSites().length;		

-		

-		// check

-		// there are 2 configuration

-		String time = ""+site.getCurrentConfiguration().getCreationDate().getTime();

-		URL location = ((SiteLocal)site).getLocationURL();		

-		File file = new File(new URL(location,SiteLocal.DEFAULT_CONFIG_PREFIX+time+".xml").getFile());

-		assertTrue("new configuration does not exist", file.exists());

-		

-		// teh current one points to a real fature

-		// does not throw error.

-		IConfiguredSite configSite2 = site.getCurrentConfiguration().getConfiguredSites()[0];

-		

-		IFeatureReference[] refs = configSite2.getConfiguredFeatures();

-		boolean found = false;

-		IFeature feature2 = null;

-		for (int i = 0; i < refs.length; i++) {

-			IFeature feature3 = refs[i].getFeature();			

-			if ("org.test1.ident1_1.0.0".equals(feature3.getVersionedIdentifier().toString())){

-				feature2 = feature3;

-				found = true;

-			}		

-		}

-

-		//String configuredFeature = feature2.getLabel();

-		assertTrue("cannot find feature org.test1.ident1_1.0.0 in configured Site",found);

-		assertTrue("Wrong id  version of feature",feature2.getVersionedIdentifier().toString().equalsIgnoreCase("org.test1.ident1_1.0.0"));

-		

-		// test only 2 install config in local site

-		assertEquals("wrong number of history in Local site:",oldNumberOfhistory+1,site.getConfigurationHistory().length);

-		

-		// test same number of sites in current config

-		assertTrue("Wrong number of config sites in current config",site.getCurrentConfiguration().getConfiguredSites().length==oldNumber);

-		

-		//test only one feature for the site

-		assertTrue("wrong number of configured features for config site",site.getCurrentConfiguration().getConfiguredSites()[0].getConfiguredFeatures().length==1);

-		

-		// test only 2 activities

-		assertTrue("Wrong number of activities for install config",site.getCurrentConfiguration().getActivities().length==2);

-		

-		

-		// cleanup

-		localFile = new File(new URL(location,SiteLocal.SITE_LOCAL_FILE).getFile());

-		UpdateManagerUtils.removeFromFileSystem(localFile);		

-		localFile = new File(new URL(location,SiteLocal.DEFAULT_CONFIG_FILE).getFile());

-		UpdateManagerUtils.removeFromFileSystem(localFile);	

-		localFile = new File(new URL(location,Site.DEFAULT_FEATURE_PATH+File.separator+feature.getVersionedIdentifier().toString()).getFile());		

-		UpdateManagerUtils.removeFromFileSystem(localFile);	

-		UpdateManagerUtils.removeFromFileSystem(new File(((InstallConfiguration)site.getCurrentConfiguration()).getURL().getFile()));						

-		UpdateManagerUtils.removeFromFileSystem(file);		

-		localFile = new File(feature2.getURL().getFile());

-		UpdateManagerUtils.removeFromFileSystem(localFile);

-	}

-	

-public void testRetriveConfigHTTPInstallNotEnable() throws Exception {

-

-	//clean up

-	SiteLocal siteLocal = (SiteLocal)SiteManager.getLocalSite();

-	URL newURL = new URL(siteLocal.getLocationURL(),SiteLocal.SITE_LOCAL_FILE);

-	File localFile = new File(newURL.getFile());

-	UpdateManagerUtils.removeFromFileSystem(localFile);

-	UpdateManagerUtils.removeFromFileSystem(new File(((InstallConfiguration)siteLocal.getCurrentConfiguration()).getURL().getFile()));	

-	InternalSiteManager.localSite=null;		

-

-	ILocalSite site = SiteManager.getLocalSite();

-	ISite remoteSite = SiteManager.getSite(SOURCE_HTTP_SITE);

-	IFeature feature = remoteSite.getFeatureReferences()[0].getFeature();

-		

-	// we are not checking if this is read only

-	IInstallConfiguration newConfig = site.cloneCurrentConfiguration();

-	newConfig.setLabel("new Label");		

-	IConfiguredSite configSite = newConfig.getConfiguredSites()[0];

-	ConfigurationPolicyModel configPolicy = new BaseSiteLocalFactory().createConfigurationPolicyModel();

-	configPolicy.setPolicy(IPlatformConfiguration.ISitePolicy.USER_INCLUDE);

-	((ConfiguredSite)configSite).setConfigurationPolicyModel((ConfigurationPolicyModel)configPolicy);	

-	int oldNumberOfhistory = site.getConfigurationHistory().length;			

-	site.addConfiguration(newConfig);

-		

-	

-	((ConfiguredSite)configSite).setUpdatable(true);

-	configSite.install(feature,null,null);

-	((ConfiguredSite)configSite).setEnabled(false);	

-	site.save();

-

-	//do not cleanup, we want to reuse previously created local site

-	// but force re-read of xml File

-	InternalSiteManager.localSite=null;

-	site = SiteManager.getLocalSite();

-	feature = remoteSite.getFeatureReferences()[0].getFeature();

-	int oldNumber = site.getCurrentConfiguration().getConfiguredSites().length;		

-		

-	// check

-	// there are 2 configuration

-	String time = ""+site.getCurrentConfiguration().getCreationDate().getTime();

-	URL location = ((SiteLocal)site).getLocationURL();		

-	File file = new File(new URL(location,SiteLocal.DEFAULT_CONFIG_PREFIX+time+".xml").getFile());

-	assertTrue("new configuration does not exist", file.exists());

-		

-	// teh current one points to a real fature

-	// does not throw error.

-	IConfiguredSite configSite2 = site.getCurrentConfiguration().getConfiguredSites()[0];

-		

-	IFeatureReference[] refs = configSite2.getConfiguredFeatures();

-	boolean found = false;

-	IFeature feature2 = null;

-	for (int i = 0; i < refs.length; i++) {

-		IFeature feature3 = refs[i].getFeature();			

-		if ("org.test1.ident1_1.0.0".equals(feature3.getVersionedIdentifier().toString())){

-			feature2 = feature3;

-			found = true;

-		}		

-	}

-

-	//String configuredFeature = feature2.getLabel();

-	assertTrue("found feature org.test1.ident1_1.0.0 in disabled configured Site",!found);

-		

-	//test no configured features

-	assertTrue("wrong number of configured features for config site",site.getCurrentConfiguration().getConfiguredSites()[0].getConfiguredFeatures().length==0);

-	

-	

-	configSite2.setEnabled(true);

-	refs = configSite2.getConfiguredFeatures();	

-	for (int i = 0; i < refs.length; i++) {

-		IFeature feature3 = refs[i].getFeature();			

-		if ("org.test1.ident1_1.0.0".equals(feature3.getVersionedIdentifier().toString())){

-			feature2 = feature3;

-			found = true;

-		}		

-	}

-

-	//String configuredFeature = feature2.getLabel();

-	assertTrue("cannot find feature org.test1.ident1_1.0.0 in configured Site",found);

-	assertTrue("Wrong id  version of feature",feature2.getVersionedIdentifier().toString().equalsIgnoreCase("org.test1.ident1_1.0.0"));

-		

-	// test only 2 install config in local site

-	assertEquals("wrong number of history in Local site:",oldNumberOfhistory+1,site.getConfigurationHistory().length);

-		

-	// test same number of sites in current config

-	assertTrue("Wrong number of config sites in current config",site.getCurrentConfiguration().getConfiguredSites().length==oldNumber);

-		

-	//test only one feature for the site

-	assertTrue("wrong number of configured features for config site",site.getCurrentConfiguration().getConfiguredSites()[0].getConfiguredFeatures().length==1);

-		

-	// test only 2 activities

-	assertTrue("Wrong number of activities for install config",site.getCurrentConfiguration().getActivities().length==2);

-		

-		

-	// cleanup

-	localFile = new File(new URL(location,SiteLocal.SITE_LOCAL_FILE).getFile());

-	UpdateManagerUtils.removeFromFileSystem(localFile);		

-	localFile = new File(new URL(location,SiteLocal.DEFAULT_CONFIG_FILE).getFile());

-	UpdateManagerUtils.removeFromFileSystem(localFile);	

-	localFile = new File(new URL(location,Site.DEFAULT_FEATURE_PATH+File.separator+feature.getVersionedIdentifier().toString()).getFile());		

-	UpdateManagerUtils.removeFromFileSystem(localFile);	

-	UpdateManagerUtils.removeFromFileSystem(new File(((InstallConfiguration)site.getCurrentConfiguration()).getURL().getFile()));						

-	UpdateManagerUtils.removeFromFileSystem(file);		

-	localFile = new File(feature2.getURL().getFile());

-	UpdateManagerUtils.removeFromFileSystem(localFile);

-}

-

-

-}

-

diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/regularInstall/TestSpaceInInstall.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/regularInstall/TestSpaceInInstall.java
deleted file mode 100644
index 4f2e196..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/regularInstall/TestSpaceInInstall.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2000, 2003 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials 

- * are made available under the terms of the Common Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/cpl-v10.html

- * 

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-package org.eclipse.update.tests.regularInstall;

-import java.io.File;

-import java.net.URL;

-

-import org.eclipse.update.core.*;

-import org.eclipse.update.internal.core.*;

-import org.eclipse.update.tests.UpdateManagerTestCase;

-

-public class TestSpaceInInstall extends UpdateManagerTestCase {

-	/**

-	 * Constructor for Test1

-	 */

-	public TestSpaceInInstall(String arg0) {

-		super(arg0);

-	}

-

-	/**

-	 *

-	 */

-	public void testSpaceInURL() throws Exception {

-

-		//cleanup target 

-		URL testURL = new URL(TARGET_FILE_SITE,"test site space/"); 

-		String testPath = testURL.getFile();

-		File target = new File(testPath);

-		UpdateManagerUtils.removeFromFileSystem(target);

-		

-		URL newURL = new File(dataPath + "Site with space/site.xml").toURL();

-		ISite remoteSite = SiteManager.getSite(newURL);

-		IFeatureReference[] featuresRef = remoteSite.getFeatureReferences();

-		File file = new File(testURL.getFile());

-		if (!file.exists()) file.mkdirs();

-		ISite localSite = SiteManager.getSite(testURL);

-		IFeature remoteFeature = null;

-		

-		// at least one executable feature and on packaged

-		boolean execFeature = false;

-		boolean packFeature = false;

-

-		if (featuresRef.length==0) fail ("no feature found");

-	

-		for (int i = 0; i < featuresRef.length; i++) {

-			remoteFeature = featuresRef[i].getFeature();

-			remove(remoteFeature,localSite); 

-			localSite.install(remoteFeature, null,null);

-			

-			if (remoteFeature.getFeatureContentProvider() instanceof FeaturePackagedContentProvider) packFeature = true;

-			if (remoteFeature.getFeatureContentProvider() instanceof FeatureExecutableContentProvider) execFeature = true;

-

-			// verify

-			String site = testURL.getFile();

-			IPluginEntry[] entries = remoteFeature.getRawPluginEntries();

-			assertTrue("no plugins entry", (entries != null && entries.length != 0));

-			String pluginName = entries[0].getVersionedIdentifier().toString();

-			File pluginFile = new File(site, Site.DEFAULT_PLUGIN_PATH + pluginName);

-			assertTrue("plugin files not installed locally", pluginFile.exists());

-

-			File featureFile = new File(site, Site.DEFAULT_INSTALLED_FEATURE_PATH + remoteFeature.getVersionedIdentifier().toString());

-			assertTrue("feature info not installed locally:"+featureFile, featureFile.exists());

-

-			File featureFileXML = new File(site, Site.DEFAULT_INSTALLED_FEATURE_PATH + remoteFeature.getVersionedIdentifier().toString() + File.separator + "feature.xml");

-			assertTrue("feature info not installed locally: no feature.xml", featureFileXML.exists());

-		}

-

-		if (!execFeature && !packFeature){

-			fail("cannot find one executable and one package feature on teh site");

-		}

-

-		//cleanup target 

-		UpdateManagerUtils.removeFromFileSystem(target);

-

-

-	}

-	

-	

-	/**

-	 *

-	 */

-	public void testSpaceInHTTPURL() throws Exception {

-

-		//cleanup target  

-		File target = new File(TARGET_FILE_SITE.getFile());

-		UpdateManagerUtils.removeFromFileSystem(target);

-		

-		String path = bundle.getString("HTTP_PATH_3");

-		ISite remoteSite = SiteManager.getSite(new URL("http",getHttpHost(),getHttpPort(),path));		

-		IFeatureReference[] featuresRef = remoteSite.getFeatureReferences();

-		ISite localSite = SiteManager.getSite(TARGET_FILE_SITE);

-		IFeature remoteFeature = null;

-		

-		// at least one executable feature and on packaged

-		boolean execFeature = false;

-		boolean packFeature = false;

-

-		if (featuresRef.length==0) fail ("no feature found");

-	

-		for (int i = 0; i < featuresRef.length; i++) {

-			remoteFeature = featuresRef[i].getFeature();

-			localSite.install(remoteFeature, null,null);

-			

-			if (remoteFeature.getFeatureContentProvider() instanceof FeaturePackagedContentProvider) packFeature = true;

-			if (remoteFeature.getFeatureContentProvider() instanceof FeatureExecutableContentProvider) execFeature = true;

-

-			// verify

-			String site = TARGET_FILE_SITE.getFile();			

-			IPluginEntry[] entries = remoteFeature.getRawPluginEntries();

-			assertTrue("no plugins entry", (entries != null && entries.length != 0));

-			String pluginName = entries[0].getVersionedIdentifier().toString();

-			File pluginFile = new File(site, Site.DEFAULT_PLUGIN_PATH + pluginName);

-			assertTrue("plugin files not installed locally", pluginFile.exists());

-

-			File featureFile = new File(site, Site.DEFAULT_INSTALLED_FEATURE_PATH + remoteFeature.getVersionedIdentifier().toString());

-			assertTrue("feature info not installed locally:"+featureFile, featureFile.exists());

-

-			File featureFileXML = new File(site, Site.DEFAULT_INSTALLED_FEATURE_PATH + remoteFeature.getVersionedIdentifier().toString() + File.separator + "feature.xml");

-			assertTrue("feature info not installed locally: no feature.xml", featureFileXML.exists());

-		}

-

-		if (!execFeature && !packFeature){

-			fail("cannot find one executable and one package feature on teh site");

-		}

-

-		//cleanup target 

-		UpdateManagerUtils.removeFromFileSystem(target);

-

-

-	}

-		

-		

-}

diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/regularRemove/AllRegularRemoveTests.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/regularRemove/AllRegularRemoveTests.java
deleted file mode 100644
index 937ec75..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/regularRemove/AllRegularRemoveTests.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2000, 2003 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials 

- * are made available under the terms of the Common Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/cpl-v10.html

- * 

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-package org.eclipse.update.tests.regularRemove;

-

-import org.eclipse.update.tests.UpdateManagerTestCase;

-import junit.framework.*;

-

-

-public class AllRegularRemoveTests extends UpdateManagerTestCase {

-public AllRegularRemoveTests(String name) {

-	super(name);

-}

-public static Test suite() {

-	TestSuite suite = new TestSuite();

-	suite.setName("Regular Remove Tests");

-	

-	suite.addTest(new TestSuite(TestRemove.class));

-	

-	return suite;

-}

-}

diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/regularRemove/TestRemove.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/regularRemove/TestRemove.java
deleted file mode 100644
index c7d1e69..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/regularRemove/TestRemove.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2000, 2003 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials 

- * are made available under the terms of the Common Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/cpl-v10.html

- * 

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-package org.eclipse.update.tests.regularRemove;

-import java.io.File;

-import java.net.MalformedURLException;

-

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.update.configuration.IConfiguredSiteChangedListener;

-import org.eclipse.update.core.*;

-import org.eclipse.update.tests.UpdateManagerTestCase;

-

-public class TestRemove extends UpdateManagerTestCase {

-

-	public class Listener implements IConfiguredSiteChangedListener {

-

-		public boolean notified = false;

-

-		public void featureInstalled(IFeature feature) {

-			notified = true;

-			System.out.println("Notified DefaultFeature Installed");

-		}

-

-		public void featureRemoved(IFeature feature) {

-		}

-		public void featureConfigured(IFeature feature) {

-		};

-		public void featureUnconfigured(IFeature feature) {

-		};

-

-		public boolean isNotified() {

-			return notified;

-		}

-	}

-

-	/**

-	 * Constructor for Test1

-	 */

-	public TestRemove(String arg0) {

-		super(arg0);

-	}

-

-	private IFeature getFeature1(ISite site)

-		throws MalformedURLException, CoreException {

-		//URL url = UpdateManagerUtils.getURL(site.getURL(), "features/org.eclipse.update.core.tests.feature1_1.0.4.jar", null);

-		SiteFeatureReference ref = new SiteFeatureReference();

-		ref.setSite(site);

-		ref.setURLString("features/org.eclipse.update.core.tests.feature1_1.0.4.jar");

-		ref.setType(ISite.DEFAULT_PACKAGED_FEATURE_TYPE);

-		ref.resolve(site.getURL(), null);

-		return ref.getFeature();

-	}

-

-	public void testRemoveFeature() throws Exception {

-

-		// install feature

-		ISite remoteSite = SiteManager.getSite(SOURCE_FILE_SITE);

-		IFeature remoteFeature = getFeature1(remoteSite);

-		ISite localSite = SiteManager.getSite(TARGET_FILE_SITE);

-		IFeatureReference ref = localSite.install(remoteFeature, null, null);

-

-		// then remove it

-		assertNotNull("Feature is null",ref.getFeature());

-		String featureRef = ref.getFeature().getVersionedIdentifier().toString();

-		localSite.remove(ref.getFeature(), null);

-

-		// verify

-		String site = TARGET_FILE_SITE.getFile();

-		IPluginEntry[] entries = remoteFeature.getPluginEntries();

-		assertTrue("no plugins entry", (entries != null && entries.length != 0));

-		String pluginName = entries[0].getVersionedIdentifier().toString();

-

-		File pluginFile = new File(site, Site.DEFAULT_PLUGIN_PATH + pluginName);

-		assertTrue("plugin files installed locally", !pluginFile.exists());

-

-		File featureFile =

-			new File(site, Site.DEFAULT_INSTALLED_FEATURE_PATH + featureRef);

-		assertTrue(

-			"feature info installed locally:" + featureFile,

-			!featureFile.exists());

-

-	}

-

-}

diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/sitevalidation/AllSiteValidationTests.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/sitevalidation/AllSiteValidationTests.java
deleted file mode 100644
index 7d063a9..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/sitevalidation/AllSiteValidationTests.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.update.tests.sitevalidation;
-
-import org.eclipse.update.tests.UpdateManagerTestCase;
-import junit.framework.*;
-
-public class AllSiteValidationTests extends UpdateManagerTestCase {
-	public AllSiteValidationTests(String name) {
-		super(name);
-	}
-	public static Test suite() {
-		TestSuite suite = new TestSuite();
-		suite.setName("Site Validation Tests");
-
-		// the following will take all teh test methods in teh class that start with 'test'
-
-		suite.addTest(new TestSuite(TestSiteValidation.class));
-
-		return suite;
-	}
-}
diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/sitevalidation/TestSiteValidation.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/sitevalidation/TestSiteValidation.java
deleted file mode 100644
index c184ef2..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/sitevalidation/TestSiteValidation.java
+++ /dev/null
@@ -1,161 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.update.tests.sitevalidation;
-import java.io.File;
-import java.net.URL;
-
-import org.eclipse.core.boot.BootLoader;
-import org.eclipse.core.boot.IPlatformConfiguration.ISiteEntry;
-import org.eclipse.core.internal.boot.PlatformConfiguration;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.update.configuration.*;
-import org.eclipse.update.core.SiteManager;
-import org.eclipse.update.internal.core.UpdateManagerUtils;
-import org.eclipse.update.tests.UpdateManagerTestCase;
-
-public class TestSiteValidation extends UpdateManagerTestCase {
-
-
-	/**
-	 * Constructor 
-	 */
-	public TestSiteValidation(String arg0) {
-		super(arg0);
-	}
-
-	private void removeConfigSite(URL url) throws Exception {
-		// get new config object
-		PlatformConfiguration cfig = (PlatformConfiguration)BootLoader.getCurrentPlatformConfiguration();
-		ISiteEntry s1 = cfig.findConfiguredSite(url);
-		assertNotNull("Unable to find site entry:"+url,s1);
-		cfig.unconfigureSite(s1);
-	}
-
-	public void testSite1() throws Exception {
-
-		URL remoteUrl = new URL(TARGET_FILE_SITE + "validation/site1");
-		File file = new File(remoteUrl.getFile());
-		ILocalSite local = SiteManager.getLocalSite();
-		IInstallConfiguration currentConfig = local.getCurrentConfiguration();
-		file.mkdirs();
-		IConfiguredSite configuredSite = currentConfig.createConfiguredSite(file);
-		IStatus status = configuredSite.verifyUpdatableStatus();
-
-		String msg = "The site "+file+" should be updatable.";
-		if (!status.isOK()){
-			fail(msg+status.getMessage());
-		}
-		currentConfig.removeConfiguredSite(configuredSite);
-		removeConfigSite(configuredSite.getSite().getURL());
-	}
-	
-	public void testSite2() throws Exception {
-
-		URL remoteUrl = new URL(SOURCE_FILE_SITE + "validation/site2/");
-		File file = new File(remoteUrl.getFile());
-		ILocalSite local = SiteManager.getLocalSite();
-		IInstallConfiguration currentConfig = local.getCurrentConfiguration();
-		IConfiguredSite configuredSite = currentConfig.createConfiguredSite(file);
-		IStatus status = configuredSite.verifyUpdatableStatus();
-
-		UpdateManagerUtils.removeFromFileSystem(new File(file,".eclipseUM"));
-
-		String msg = "The site "+file+" should not be updatable.";
-		if (status.isOK()){
-			fail(msg+status.getMessage());
-		}
-		if (status.getMessage().indexOf("This site is contained in another site:")==-1){
-			fail("Wrong validation:"+status.getMessage());
-		}
-	}	
-
-	public void testSite3() throws Exception {
-
-		URL remoteUrl = new URL(SOURCE_FILE_SITE + "validation/site3");
-		File file = new File(remoteUrl.getFile());
-		ILocalSite local = SiteManager.getLocalSite();
-		IInstallConfiguration currentConfig = local.getCurrentConfiguration();
-		IConfiguredSite configuredSite = currentConfig.createConfiguredSite(file);
-		IStatus status = configuredSite.verifyUpdatableStatus();
-
-		UpdateManagerUtils.removeFromFileSystem(new File(file,".eclipseUM"));
-
-		String msg = "The site "+file+" should not be updatable.";
-		if (status.isOK()){
-			fail(msg+status.getMessage());
-		}
-		if (status.getMessage().indexOf("This site is contained in another site:")==-1){
-			fail("Wrong validation:"+status.getMessage());
-		}
-	}	
-
-	public void testSite4() throws Exception {
-
-		URL remoteUrl = new URL(SOURCE_FILE_SITE + "validation/site4");
-		File file = new File(remoteUrl.getFile());
-		ILocalSite local = SiteManager.getLocalSite();
-		IInstallConfiguration currentConfig = local.getCurrentConfiguration();
-		IConfiguredSite configuredSite = currentConfig.createConfiguredSite(file);
-		IStatus status = configuredSite.verifyUpdatableStatus();
-
-		String msg = "The site "+file+" should not be updatable.";
-		if (status.isOK()){
-			fail(msg+status.getMessage());
-		}
-		if (status.getMessage().indexOf("The site cannot be modified by this product. It is already associated with product:")==-1){
-			fail("Wrong validation:"+status.getMessage());
-		}
-	}	
-
-	public void testSite5() throws Exception {
-
-		URL remoteUrl = new URL(SOURCE_FILE_SITE + "validation/site5/");
-		File file = new File(remoteUrl.getFile());
-		ILocalSite local = SiteManager.getLocalSite();
-		IInstallConfiguration currentConfig = local.getCurrentConfiguration();
-		IConfiguredSite configuredSite = currentConfig.createConfiguredSite(file);
-		IStatus status = configuredSite.verifyUpdatableStatus();
-
-		String msg = "The site "+file+" should be updatable.";
-		if (!status.isOK()){
-			fail(msg+status.getMessage());
-		}
-		
-			// get new config object
-		URL url = configuredSite.getSite().getURL();
-		PlatformConfiguration cfig = (PlatformConfiguration)BootLoader.getCurrentPlatformConfiguration();
-		ISiteEntry s1 = cfig.findConfiguredSite(url);
-		assertNotNull("Site entry not found:"+url,s1);
-		cfig.unconfigureSite(s1);
-		cfig.save();
-	}
-	
-	public void testSite6() throws Exception {
-
-		URL remoteUrl = new URL(SOURCE_FILE_SITE + "validation/site6/children/children");
-		File file = new File(remoteUrl.getFile());
-		if (!file.exists()) file.mkdirs();
-		ILocalSite local = SiteManager.getLocalSite();
-		IInstallConfiguration currentConfig = local.getCurrentConfiguration();
-		IConfiguredSite configuredSite = currentConfig.createConfiguredSite(file);
-		IStatus status = configuredSite.verifyUpdatableStatus();
-
-		UpdateManagerUtils.removeFromFileSystem(new File(file,".eclipseUM"));
-
-		String msg = "The site "+file+" should not be updatable.";
-		if (status.isOK()){
-			fail(msg+status.getMessage());
-		}
-		if (status.getMessage().indexOf("This site is contained in another site:")==-1){
-			fail("Wrong validation:"+status.getMessage());
-		}
-	}	
-}
diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/types/AllTypesTests.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/types/AllTypesTests.java
deleted file mode 100644
index 970648d..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/types/AllTypesTests.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2000, 2003 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials 

- * are made available under the terms of the Common Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/cpl-v10.html

- * 

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-package org.eclipse.update.tests.types;

-

-import org.eclipse.update.tests.UpdateManagerTestCase;

-import junit.framework.*;

-

-

-public class AllTypesTests extends UpdateManagerTestCase {

-public AllTypesTests(String name) {

-	super(name);

-}

-public static Test suite() {

-	TestSuite suite = new TestSuite();

-	suite.setName("Regular Install Tests");

-	

-	// the following will take all teh test methods in teh class that start with 'test'

-	suite.addTest(new TestSuite(TestFeatureType.class));

-	suite.addTest(new TestSuite(TestSiteType.class));	

-	

-	// or you can specify the method

-	//suite.addTest(new TestGetFeature("methodThatDoesNotStartWithtest"));	

-	

-	return suite;

-}

-}

diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/types/TestFeatureType.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/types/TestFeatureType.java
deleted file mode 100644
index 5613b19..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/types/TestFeatureType.java
+++ /dev/null
@@ -1,155 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2000, 2003 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials 

- * are made available under the terms of the Common Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/cpl-v10.html

- * 

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-package org.eclipse.update.tests.types;

-

-import java.io.File;

-import java.net.URL;

-

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.update.core.*;

-import org.eclipse.update.internal.core.*;

-import org.eclipse.update.tests.UpdateManagerTestCase;

-

-

-public class TestFeatureType extends UpdateManagerTestCase {

-

-

-	private static final String PACKAGED_FEATURE_TYPE = "packaged"; //$NON-NLS-1$

-	private static final String INSTALLED_FEATURE_TYPE = "installed"; //$NON-NLS-1$	

-	

-	/**

-	 * Test the getFeatures()

-	 */

-	public TestFeatureType(String arg0) {

-		super(arg0);

-	}

-	

-	

-	public String getDefaultInstallableFeatureType() {

-		String pluginID = UpdateCore.getPlugin().getDescriptor().getUniqueIdentifier() + "."; //$NON-NLS-1$

-		return pluginID + PACKAGED_FEATURE_TYPE;

-	}

-	

-	public String getDefaultExecutableFeatureType() {

-		String pluginID = UpdateCore.getPlugin().getDescriptor().getUniqueIdentifier() + "."; //$NON-NLS-1$

-		return pluginID + INSTALLED_FEATURE_TYPE;

-	}		

-	

-	/**

-	 * @throws Exception

-	 */

-	public void testSimplePackagedFeatureType() throws Exception{ 

-		FeatureTypeFactory factories = FeatureTypeFactory.getInstance();

-		IFeatureFactory factory = factories.getFactory(getDefaultInstallableFeatureType());

-		

-		ISite site = SiteManager.getSite(SOURCE_FILE_SITE);

-		URL featureURL = new URL(SOURCE_FILE_SITE,"features/features2.jar ");

-		

-		IFeature anotherFeature = factory.createFeature(featureURL,site);

-		

-		assertTrue("Factory doesn't create same feature",anotherFeature.getVersionedIdentifier().equals(anotherFeature.getVersionedIdentifier()));

-	}	

-	

-		/**

-	 * @throws Exception

-	 */

-	public void testSimpleExecutableFeatureType() throws Exception{ 

-		FeatureTypeFactory factories = FeatureTypeFactory.getInstance();

-		IFeatureFactory factory = factories.getFactory(getDefaultExecutableFeatureType());

-		

-		ISite site = SiteManager.getSite(SOURCE_FILE_SITE);

-		URL featureURL = new URL(SOURCE_FILE_SITE,"testAPI/"+Site.DEFAULT_INSTALLED_FEATURE_PATH+"feature3/");

-		

-		IFeature anotherFeature = factory.createFeature(featureURL,site);

-		

-		assertTrue("Factory doesn't create same feature",anotherFeature.getVersionedIdentifier().equals(anotherFeature.getVersionedIdentifier()));

-	}	

-	

-	/**

-	 * @throws Exception

-	 */

-	public void testFeatureType() throws Exception{ 

-		FeatureTypeFactory factories = FeatureTypeFactory.getInstance();

-		IFeatureFactory factory = factories.getFactory(getDefaultInstallableFeatureType());

-		

-		ISite site = SiteManager.getSite(SOURCE_HTTP_SITE);

-		IFeature feature = site.getFeatureReferences()[0].getFeature();

-		

-		IFeature anotherFeature = factory.createFeature(feature.getURL(),site);

-		

-		assertTrue("Factory doesn't create same feature",feature.getVersionedIdentifier().equals(anotherFeature.getVersionedIdentifier()));

-	}

-	

-	

-	/**

-	 * @throws Exception

-	 */

-	public void testFeatureNewType() throws Exception{ 

-		FeatureTypeFactory factories = FeatureTypeFactory.getInstance();

-		IFeatureFactory factory = factories.getFactory(getDefaultExecutableFeatureType());

-		

-		String featurePath = dataPath+"FeatureTypeExamples/site1/site.xml";

-		ISite site = SiteManager.getSite(new File(featurePath).toURL());

-		IFeatureReference ref = site.getFeatureReferences()[0];

-		IFeature feature = ref.getFeature();

-		

-		IFeature anotherFeature = factory.createFeature(feature.getURL(),site);

-

-		assertTrue(feature.getFeatureContentProvider() instanceof FeatureExecutableContentProvider);		

-		assertTrue(((FeatureReference)ref).getType().equals("org.eclipse.update.tests.core.feature1"));		

-		assertTrue("Factory doesn't create same feature",feature.getVersionedIdentifier().equals(anotherFeature.getVersionedIdentifier()));

-

-

-	}

-	

-	

-		/**

-	 * @throws Exception

-	 */

-	public void testFeatureAnotherType() throws Exception{ 

-		FeatureTypeFactory factories = FeatureTypeFactory.getInstance();

-		IFeatureFactory factory = factories.getFactory(getDefaultInstallableFeatureType());

-		

-		String featurePath = dataPath+"FeatureTypeExamples/site2/site.xml";

-		ISite site = SiteManager.getSite(new File(featurePath).toURL());

-		IFeatureReference ref = site.getFeatureReferences()[0];		

-		IFeature feature = ref.getFeature();

-		

-		IFeature anotherFeature = factory.createFeature(feature.getURL(),site);

-		

-		assertTrue("Factory doesn't create same feature",feature.getVersionedIdentifier().equals(anotherFeature.getVersionedIdentifier()));

-		assertTrue(feature.getFeatureContentProvider() instanceof FeaturePackagedContentProvider);

-		assertTrue(((FeatureReference)ref).getType().equals("org.eclipse.update.core.packaged"));

-		

-	}

-		

-		

-	/**

-	 * @throws Exception

-	 */

-	public void testFeatureUnknownType() throws Exception{ 

-		String featurePath = dataPath+"FeatureTypeExamples/site3/site.xml";

-		ISite site = SiteManager.getSite(new File(featurePath).toURL());

-		IFeatureReference ref = site.getFeatureReferences()[0];		

-		try {

-			ref.getFeature();

-			assertTrue("id found, should not be found",false);

-		} catch (CoreException e){

-			if (e.getMessage().indexOf("org.eclipse.update.core.unknowntype.jar")==-1){

-				throw e;

-			}

-		}

-		

-	}		

-		

-}

-

-

diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/types/TestSiteType.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/types/TestSiteType.java
deleted file mode 100644
index 50da435..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/types/TestSiteType.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2000, 2003 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials 

- * are made available under the terms of the Common Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/cpl-v10.html

- * 

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-package org.eclipse.update.tests.types;

-

-import java.io.File;

-import java.net.URL;

-

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.update.core.*;

-import org.eclipse.update.internal.core.FeaturePackagedContentProvider;

-import org.eclipse.update.internal.core.SiteURLContentProvider;

-import org.eclipse.update.tests.UpdateManagerTestCase;

-import org.eclipse.update.tests.implementation.SiteFTPFactory;

-

-public class TestSiteType extends UpdateManagerTestCase {

-

-	/**

-	 * Test the getFeatures()

-	 */

-	public TestSiteType(String arg0) {

-		super(arg0);

-	}

-

-	/**

-	 * @throws Exception

-	 */

-	public void testSiteType() throws Exception {

-

-		String featurePath = dataPath + "SiteTypeExamples/site1/site.xml";

-		ISite site = SiteManager.getSite(new File(featurePath).toURL());

-		IFeatureReference ref = site.getFeatureReferences()[0];

-		IFeature feature = ref.getFeature();

-

-		assertTrue(site.getSiteContentProvider() instanceof SiteURLContentProvider);

-		assertTrue(((Site) site).getType().equals("org.eclipse.update.core.http"));

-		assertTrue(feature.getFeatureContentProvider() instanceof FeaturePackagedContentProvider);

-

-	}

-

-	/**

-		 * @throws Exception

-		 */

-	public void testFTPSiteType() throws Exception {

-

-		ISite site = SiteManager.getSite(new URL(SOURCE_FILE_SITE + "FTPLikeSite/"));

-

-		// should not find the mapping

-		// but then should attempt to read the XML file

-		// found a new type

-		// call the new type

-		assertTrue(

-			"Wrong site type",

-			site.getType().equals("org.eclipse.update.tests.ftp"));

-		assertTrue(

-			"Wrong file",

-			site.getURL().getFile().equals("/" + SiteFTPFactory.FILE));

-

-	}

-

-	public void testParseValid1() throws Exception {

-		try {

-			URL remoteURL = new URL(SOURCE_FILE_SITE + "parsertests/siteftp.xml");

-			ISite site = SiteManager.getSite(remoteURL);

-			site.getArchives();

-		} catch (CoreException e) {

-			if (e.getMessage().indexOf("</feature>") == -1) {

-				throw e;

-			}

-		}

-	}

-

-}

diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/uivalues/AllCoreUITests.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/uivalues/AllCoreUITests.java
deleted file mode 100644
index a18ab16..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/uivalues/AllCoreUITests.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2000, 2003 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials 

- * are made available under the terms of the Common Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/cpl-v10.html

- * 

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-package org.eclipse.update.tests.uivalues;

-

-import org.eclipse.update.tests.UpdateManagerTestCase;

-import junit.framework.*;

-

-

-public class AllCoreUITests extends UpdateManagerTestCase {

-public AllCoreUITests(String name) {

-	super(name);

-}

-public static Test suite() {

-	TestSuite suite = new TestSuite();

-	suite.setName("Regular Install Tests");

-	

-	// the following will take all teh test methods in teh class that start with 'test'

-	suite.addTest(new TestSuite(TestUILabel.class));

-	

-	// or you can specify the method

-	//suite.addTest(new TestGetFeature("methodThatDoesNotStartWithtest"));	

-	

-	return suite;

-}

-}

diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/uivalues/TestUILabel.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/uivalues/TestUILabel.java
deleted file mode 100644
index 54dc0d8..0000000
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/uivalues/TestUILabel.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2000, 2003 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials 

- * are made available under the terms of the Common Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/cpl-v10.html

- * 

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-package org.eclipse.update.tests.uivalues;

-

-import java.io.File;

-import java.net.URL;

-

-import org.eclipse.update.core.*;

-import org.eclipse.update.tests.UpdateManagerTestCase;

-

-

-public class TestUILabel extends UpdateManagerTestCase {

-

-	/**

-	 * Test the getFeatures()

-	 */

-	public TestUILabel(String arg0) {

-		super(arg0);

-	}

-	

-	

-	/**

-	 * Method testHTTPSite.

-	 * @throws Exception

-	 */

-	public void testUpdateManagerSite() throws Exception{ 

-		

-		ISite remoteSite = SiteManager.getSite(new URL("http",getHttpHost(),getHttpPort(),bundle.getString("HTTP_PATH_2")));

-		ICategory[] categories = remoteSite.getCategories();

-		for (int i =0; i<categories.length; i++){

-			System.out.println("Category ->"+categories[i].getLabel()+":"+categories[i].getName());

-		}

-		System.out.println(remoteSite.getDescription().getURL().toExternalForm());

-		IFeatureReference[] remoteFeatures = remoteSite.getFeatureReferences();

-		if (remoteFeatures==null || remoteFeatures.length==0) fail("No feature available for testing");		

-		for (int i=0;i<remoteFeatures.length;i++){

-			IFeature feature = remoteFeatures[i].getFeature();

-			System.out.println("feature:"+feature.getVersionedIdentifier()+"->"+feature.getLabel());

-			print(feature.getLicense(),"License");

-			print(feature.getCopyright(),"Copyright");			

-			print(feature.getDescription(),"Description");				

-			

-			// check that it downloads the feature.jar under the cover

-			// and unpack it

-			

-			URL url = feature.getLicense().getURL();

-			if (url!=null){

-				assertTrue((new File(url.getFile())).exists());

-			}

-

-			url = feature.getCopyright().getURL();

-			if (url!=null){

-				assertTrue((new File(url.getFile())).exists());

-			}

-			

-			url = feature.getDescription().getURL();

-			if (url!=null){

-				assertTrue((new File(url.getFile())).exists());

-			}

-			

-		}

-	}

-	

-	

-	/**

-	 * Method print.

-	 * @param info

-	 * @param text

-	 */

-	private void print(IURLEntry info, String text){

-		System.out.print("->"+text+":");

-		if (info.getURL()!=null) 

-			System.out.println("<"+info.getURL().toExternalForm()+">");

-		else 

-			System.out.println(info.getAnnotation());

-	}

-} 

-

-

diff --git a/update/org.eclipse.update.tests.core/test.xml b/update/org.eclipse.update.tests.core/test.xml
deleted file mode 100644
index f188855..0000000
--- a/update/org.eclipse.update.tests.core/test.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0"?>

-<project name="testsuite" default="run" basedir="."> 

-  

-  <!-- The property ${eclipse-home} should be passed into this script -->

-  <!-- Set a meaningful default value for when it is not. -->

-  <property name="eclipse-home" value="${basedir}/../.."/>

-  

-  <!-- sets the properties eclipse-home, and library-file -->

-  <property name="plugin-name" value="org.eclipse.update.tests.core"/>

-  <property name="library-file" value="${eclipse-home}/plugins/org.eclipse.test/library.xml"/>

-  <property name="class-name" value="org.eclipse.update.tests.AllTests" />

-  

-  <!-- This target holds all initialization code that needs to be done for -->

-  <!-- all tests that are to be run. Initialization for individual tests -->

-  <!-- should be done within the body of the suite target. -->

-  <target name="init">

-    <tstamp/>

-    <delete>

-      <fileset dir="${eclipse-home}" includes="org*.xml"/>

-    </delete>

-  </target>

-  

-  <!-- This target defines the tests that need to be run. -->

-  <target name="suite">

-    <property name="sniff-folder" value="${eclipse-home}/update_core_sniff_folder"/>

-    <delete dir="${sniff-folder}" quiet="true"/>

-    

-    <ant target="core-test" antfile="${library-file}" dir="${eclipse-home}">

-      <property name="data-dir" value="${sniff-folder}"/>

-      <property name="plugin-name" value="${plugin-name}"/>

-      <property name="classname" value="${class-name}"/>

-    </ant>

-  </target>

-  

-  <!-- This target holds code to cleanup the testing environment after -->

-  <!-- after all of the tests have been run. You can use this target to -->

-  <!-- delete temporary files that have been created. -->

-  <target name="cleanup">

-  </target>

-  

-  <!-- This target runs the test suite. Any actions that need to happen -->

-  <!-- after all the tests have been run should go here. -->

-   <target name="run" depends="init,suite,cleanup">

-    <ant target="collect" antfile="${library-file}" dir="${eclipse-home}">

-      <property name="includes" value="org*.xml"/>

-      <property name="output-file" value="${plugin-name}.xml"/>

-    </ant>

-  </target>

-</project>
\ No newline at end of file
diff --git a/update/org.eclipse.update.tests.core/test_with_mail.xml b/update/org.eclipse.update.tests.core/test_with_mail.xml
deleted file mode 100644
index 9f1d408..0000000
--- a/update/org.eclipse.update.tests.core/test_with_mail.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0"?>
-<project name="testsuite" default="run" basedir="."> 
-  
-  <!-- The property ${eclipse-home} should be passed into this script -->
-  <!-- Set a meaningful default value for when it is not. -->
-  <property name="eclipse-home" value="${basedir}/../.."/>
-  
-  <!-- sets the properties eclipse-home, and library-file -->
-  <property name="plugin-name" value="org.eclipse.update.tests.core"/>
-  <property name="library-file" value="${eclipse-home}/plugins/org.eclipse.test/library.xml"/>
-  <property name="class-name" value="org.eclipse.update.tests.AllTests" />
-  
-  <!-- This target holds all initialization code that needs to be done for -->
-  <!-- all tests that are to be run. Initialization for individual tests -->
-  <!-- should be done within the body of the suite target. -->
-  <target name="init">
-    <tstamp/>
-    <delete>
-      <fileset dir="${eclipse-home}" includes="org*.xml"/>
-    </delete>
-  </target>
-  
-  <!-- This target defines the tests that need to be run. -->
-  <target name="suite">
-    <property name="sniff-folder" value="${eclipse-home}/update_core_sniff_folder"/>
-    <delete dir="${sniff-folder}" quiet="true"/>
-    
-    <ant target="core-test" antfile="${library-file}" dir="${eclipse-home}">
-      <property name="data-dir" value="${sniff-folder}"/>
-      <property name="plugin-name" value="${plugin-name}"/>
-      <property name="classname" value="${class-name}"/>
-    </ant>
-  </target>
-  
-  <!-- This target holds code to cleanup the testing environment after -->
-  <!-- after all of the tests have been run. You can use this target to -->
-  <!-- delete temporary files that have been created. -->
-  <target name="cleanup">
-  </target>
-  
-  <!-- This target runs the test suite. Any actions that need to happen -->
-  <!-- after all the tests have been run should go here. -->
-   <target name="run" depends="init,suite,cleanup">
-
-    <property name="email-from" value="Eclipse_Automated_Test@oti.com"/>
-    <property name="email-subject" value="Install/Update: Nightly Build Report"/>
-    <property name="email-subject-log" value="Install/Update: Nightly .log"/>
-    <property name="email-server" value="d25ml04.torolab.ibm.com"/>
-    <property name="infile" value="${eclipse-home}/${plugin-name}.xml"/>
-    <property name="infile-log" value="${eclipse-home}/workspace/.metadata/.log"/>
-      
-    <ant target="collect" antfile="${library-file}" dir="${eclipse-home}">
-      <property name="includes" value="org*.xml"/>
-      <property name="output-file" value="${plugin-name}.xml"/>
-    </ant>
-    
-    <touch file="${infile-log}"/>
-
-    <mail from="${email-from}" tolist="celek@ca.ibm.com"
-          subject="${email-subject}" files="${infile}"
-          mailhost="${email-server}"/>
-
-    <mail from="${email-from}" tolist="celek@ca.ibm.com"
-          subject="${email-subject-log}" files="${infile-log}"
-          mailhost="${email-server}"/>
-
-    <mail from="${email-from}" tolist="celek@rogers.com"
-          subject="${email-subject-log}" files="${infile-log}"
-          mailhost="${email-server}"/>
-
-    <mail from="${email-from}" tolist="celek@rogers.com"
-          subject="${email-subject}" files="${infile}"
-          mailhost="${email-server}"/>
-
-  </target>
-</project>
\ No newline at end of file
diff --git a/update/org.eclipse.update.tests.core/webserver/Site with space/features space/helpFeature.jar b/update/org.eclipse.update.tests.core/webserver/Site with space/features space/helpFeature.jar
deleted file mode 100644
index 6369149..0000000
--- a/update/org.eclipse.update.tests.core/webserver/Site with space/features space/helpFeature.jar
+++ /dev/null
Binary files differ
diff --git a/update/org.eclipse.update.tests.core/webserver/Site with space/features space/space feature.jar b/update/org.eclipse.update.tests.core/webserver/Site with space/features space/space feature.jar
deleted file mode 100644
index 27e81eb..0000000
--- a/update/org.eclipse.update.tests.core/webserver/Site with space/features space/space feature.jar
+++ /dev/null
Binary files differ
diff --git a/update/org.eclipse.update.tests.core/webserver/Site with space/info/img/top_titlsm.gif b/update/org.eclipse.update.tests.core/webserver/Site with space/info/img/top_titlsm.gif
deleted file mode 100644
index 3917bb6..0000000
--- a/update/org.eclipse.update.tests.core/webserver/Site with space/info/img/top_titlsm.gif
+++ /dev/null
Binary files differ
diff --git a/update/org.eclipse.update.tests.core/webserver/Site with space/info/img/wel_ml.jpg b/update/org.eclipse.update.tests.core/webserver/Site with space/info/img/wel_ml.jpg
deleted file mode 100644
index 01e33df..0000000
--- a/update/org.eclipse.update.tests.core/webserver/Site with space/info/img/wel_ml.jpg
+++ /dev/null
Binary files differ
diff --git a/update/org.eclipse.update.tests.core/webserver/Site with space/info/siteInfo.html b/update/org.eclipse.update.tests.core/webserver/Site with space/info/siteInfo.html
deleted file mode 100644
index b065aa3..0000000
--- a/update/org.eclipse.update.tests.core/webserver/Site with space/info/siteInfo.html
+++ /dev/null
@@ -1,63 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">

-<html>

-<head>

-</head>

-  <body>

-<img src="img/top_titlsm.gif" alt="" width="460" height="50">

-<br>

-<br>

-     It started with Smalltalk<br>

-    OTI has been building tools for platform-independent OO development since

-  1988. Our ENVY&reg; technology first brought collaborative software development,

-  version management and shared repositories to Smalltalk. IBM is one of

-many   companies to license ENVY, which continues to be the foundation of

-VisualAge&reg;   Smalltalk.<br>

-<br>

-<br>

-<br>

-      Next came Java&#8482;<br>

-    Because of our expertise in OO technology, IBM turned to OTI for a next-generation

-  development environment for Java. The result is VisualAge for Java, which

-  continues to win awards for its innovative IDE and team support. InfoWorld

-  has chosen VisualAge for Java as development tool of the year - year after

-  year after year!<br>

-<br>

-<br>

-<br>

-      Then pervasive computing<br>

-    OTI continues its development of IBM's VisualAge Micro Edition, a state-of-the-art

-  platform for collaborative development of embedded applications and systems

-  that are very lean. As the steady stream of press releases attests, VisualAge

-  Micro Edition is already licensed to the leading microchip manufacturers,

-  microkernel developers, and producers of handheld and consumer devices.<br>

-<br>

-<br>

-<br>

-      Now it's Eclipse<br>

-    OTI has built the next generation IBM application development tools platform.

-  Eclipse is a kind of universal tool platform - an open extensible IDE for

-  anything and nothing in particular. The real value comes from tool plug-ins

-  that "teach" Eclipse how to work with things - java files, web content,

-graphics,  video - almost anything you can imagine. Eclipse allows you to

-independently  develop tools that integrate with other people's tools so

-seamlessly you won't know where one tool ends and another starts. The IBM

-supported version of this technology, WebSphere Studio Workbench, will be

-the core of the next  generation of IBM and IBM Business Partner e-business

-tools optimized for  the WebSphere software platform.<br>

-<br>

-<br>

-<br>

-      So what's next?<br>

-    OTI continues to deliver object-oriented technology that scales across

- platforms,  across teams and across project size. From a mainframe to a

-watch  - we're  closing in on that vision.<br>

-<br>

-<img src="img/wel_ml.jpg" width="460" height="460" alt="">

-<br>

-<br>

-<br>

-<br>

-<br>

-<br>

-</body>

-</html>

diff --git a/update/org.eclipse.update.tests.core/webserver/Site with space/install/features space/feature3/feature.xml b/update/org.eclipse.update.tests.core/webserver/Site with space/install/features space/feature3/feature.xml
deleted file mode 100644
index 67741d9..0000000
--- a/update/org.eclipse.update.tests.core/webserver/Site with space/install/features space/feature3/feature.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<feature id="org.eclipse.update.core.tests.feature3" image="feature1.gif" label="Third Feature" provider-name="Smart Company" version="1.0.0" >

-  <description>Description</description>

-  <copyright>copyright</copyright>

-  <license>license</license>

-  <url>

-    <update label="URL to update the feature" url="http://www.eclipse.org/path/feature1/"/>

-    <discovery label="Discovery 1" url="http://www.eclipse.org"/>

-    <discovery label="Discovery 2" url="http://www.eclipse.org"/>

-  </url>

-</feature>
\ No newline at end of file
diff --git a/update/org.eclipse.update.tests.core/webserver/Site with space/plugins space/Pde_core.jar b/update/org.eclipse.update.tests.core/webserver/Site with space/plugins space/Pde_core.jar
deleted file mode 100644
index f107217..0000000
--- a/update/org.eclipse.update.tests.core/webserver/Site with space/plugins space/Pde_core.jar
+++ /dev/null
Binary files differ
diff --git a/update/org.eclipse.update.tests.core/webserver/Site with space/plugins space/help.jar b/update/org.eclipse.update.tests.core/webserver/Site with space/plugins space/help.jar
deleted file mode 100644
index 7584f66..0000000
--- a/update/org.eclipse.update.tests.core/webserver/Site with space/plugins space/help.jar
+++ /dev/null
Binary files differ
diff --git a/update/org.eclipse.update.tests.core/webserver/Site with space/plugins space/junit_3.7.jar b/update/org.eclipse.update.tests.core/webserver/Site with space/plugins space/junit_3.7.jar
deleted file mode 100644
index 67587b2..0000000
--- a/update/org.eclipse.update.tests.core/webserver/Site with space/plugins space/junit_3.7.jar
+++ /dev/null
Binary files differ
diff --git a/update/org.eclipse.update.tests.core/webserver/Site with space/site.xml b/update/org.eclipse.update.tests.core/webserver/Site with space/site.xml
deleted file mode 100644
index b5d4bbf..0000000
--- a/update/org.eclipse.update.tests.core/webserver/Site with space/site.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<site>

-<description url="info/siteInfo.html"/>

-  <feature url="features space/helpFeature.jar">

-    <category name="eclipse/UML"/>

-  </feature>

-  <feature url="features space/space feature.jar">

-    <category name="eclipse/J2EE"/>

-  </feature>

-

-  <archive path="plugins/org.eclipse.help_1.0.0.jar" url="plugins space/help.jar"/>

-  <archive path="plugins/org.eclipse.pde.core_1.0.0.jar" url="plugins space/Pde_core.jar"/>

-  <archive path="plugins/org.junit_3.5.0.jar" url="plugins space/junit_3.7.jar"/>

-  <archive path="plugins/org.eclipse.update.plugin1_1.1.1" url="plugins space/org.eclipse.update.plugin1_1.1.1"/>  

-  <category-def label="IBM WSAD Tools" name="eclipse"/>

-  <category-def label="J2EE tools" name="eclipse/J2EE"/>

-  <category-def label="EJB Tools" name="eclipse/J2EE/EJB"/>

-  <category-def label="UML tools" name="eclipse/UML"/>

-  <category-def label="Messaging Tools" name="B2B"/>  

-</site>
\ No newline at end of file
diff --git a/update/org.eclipse.update.tests.core/webserver/UpdateManager/features/helpFeature.jar b/update/org.eclipse.update.tests.core/webserver/UpdateManager/features/helpFeature.jar
deleted file mode 100644
index aec67d4..0000000
--- a/update/org.eclipse.update.tests.core/webserver/UpdateManager/features/helpFeature.jar
+++ /dev/null
Binary files differ
diff --git a/update/org.eclipse.update.tests.core/webserver/UpdateManager/features/org.eclipse.pde.feature_1.0.0.jar b/update/org.eclipse.update.tests.core/webserver/UpdateManager/features/org.eclipse.pde.feature_1.0.0.jar
deleted file mode 100644
index 870b40a..0000000
--- a/update/org.eclipse.update.tests.core/webserver/UpdateManager/features/org.eclipse.pde.feature_1.0.0.jar
+++ /dev/null
Binary files differ
diff --git a/update/org.eclipse.update.tests.core/webserver/UpdateManager/info/img/top_titlsm.gif b/update/org.eclipse.update.tests.core/webserver/UpdateManager/info/img/top_titlsm.gif
deleted file mode 100644
index 3917bb6..0000000
--- a/update/org.eclipse.update.tests.core/webserver/UpdateManager/info/img/top_titlsm.gif
+++ /dev/null
Binary files differ
diff --git a/update/org.eclipse.update.tests.core/webserver/UpdateManager/info/img/wel_ml.jpg b/update/org.eclipse.update.tests.core/webserver/UpdateManager/info/img/wel_ml.jpg
deleted file mode 100644
index 01e33df..0000000
--- a/update/org.eclipse.update.tests.core/webserver/UpdateManager/info/img/wel_ml.jpg
+++ /dev/null
Binary files differ
diff --git a/update/org.eclipse.update.tests.core/webserver/UpdateManager/info/siteInfo.html b/update/org.eclipse.update.tests.core/webserver/UpdateManager/info/siteInfo.html
deleted file mode 100644
index b065aa3..0000000
--- a/update/org.eclipse.update.tests.core/webserver/UpdateManager/info/siteInfo.html
+++ /dev/null
@@ -1,63 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">

-<html>

-<head>

-</head>

-  <body>

-<img src="img/top_titlsm.gif" alt="" width="460" height="50">

-<br>

-<br>

-     It started with Smalltalk<br>

-    OTI has been building tools for platform-independent OO development since

-  1988. Our ENVY&reg; technology first brought collaborative software development,

-  version management and shared repositories to Smalltalk. IBM is one of

-many   companies to license ENVY, which continues to be the foundation of

-VisualAge&reg;   Smalltalk.<br>

-<br>

-<br>

-<br>

-      Next came Java&#8482;<br>

-    Because of our expertise in OO technology, IBM turned to OTI for a next-generation

-  development environment for Java. The result is VisualAge for Java, which

-  continues to win awards for its innovative IDE and team support. InfoWorld

-  has chosen VisualAge for Java as development tool of the year - year after

-  year after year!<br>

-<br>

-<br>

-<br>

-      Then pervasive computing<br>

-    OTI continues its development of IBM's VisualAge Micro Edition, a state-of-the-art

-  platform for collaborative development of embedded applications and systems

-  that are very lean. As the steady stream of press releases attests, VisualAge

-  Micro Edition is already licensed to the leading microchip manufacturers,

-  microkernel developers, and producers of handheld and consumer devices.<br>

-<br>

-<br>

-<br>

-      Now it's Eclipse<br>

-    OTI has built the next generation IBM application development tools platform.

-  Eclipse is a kind of universal tool platform - an open extensible IDE for

-  anything and nothing in particular. The real value comes from tool plug-ins

-  that "teach" Eclipse how to work with things - java files, web content,

-graphics,  video - almost anything you can imagine. Eclipse allows you to

-independently  develop tools that integrate with other people's tools so

-seamlessly you won't know where one tool ends and another starts. The IBM

-supported version of this technology, WebSphere Studio Workbench, will be

-the core of the next  generation of IBM and IBM Business Partner e-business

-tools optimized for  the WebSphere software platform.<br>

-<br>

-<br>

-<br>

-      So what's next?<br>

-    OTI continues to deliver object-oriented technology that scales across

- platforms,  across teams and across project size. From a mainframe to a

-watch  - we're  closing in on that vision.<br>

-<br>

-<img src="img/wel_ml.jpg" width="460" height="460" alt="">

-<br>

-<br>

-<br>

-<br>

-<br>

-<br>

-</body>

-</html>

diff --git a/update/org.eclipse.update.tests.core/webserver/UpdateManager/plugins/Pde_core.jar b/update/org.eclipse.update.tests.core/webserver/UpdateManager/plugins/Pde_core.jar
deleted file mode 100644
index f107217..0000000
--- a/update/org.eclipse.update.tests.core/webserver/UpdateManager/plugins/Pde_core.jar
+++ /dev/null
Binary files differ
diff --git a/update/org.eclipse.update.tests.core/webserver/UpdateManager/plugins/help.jar b/update/org.eclipse.update.tests.core/webserver/UpdateManager/plugins/help.jar
deleted file mode 100644
index 7584f66..0000000
--- a/update/org.eclipse.update.tests.core/webserver/UpdateManager/plugins/help.jar
+++ /dev/null
Binary files differ
diff --git a/update/org.eclipse.update.tests.core/webserver/UpdateManager/plugins/junit_3.7.jar b/update/org.eclipse.update.tests.core/webserver/UpdateManager/plugins/junit_3.7.jar
deleted file mode 100644
index 67587b2..0000000
--- a/update/org.eclipse.update.tests.core/webserver/UpdateManager/plugins/junit_3.7.jar
+++ /dev/null
Binary files differ
diff --git a/update/org.eclipse.update.tests.core/webserver/UpdateManager/site.xml b/update/org.eclipse.update.tests.core/webserver/UpdateManager/site.xml
deleted file mode 100644
index 5e5fda7..0000000
--- a/update/org.eclipse.update.tests.core/webserver/UpdateManager/site.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<site >

-<description url="info/siteInfo.html"/>

-  <feature url="features/helpFeature.jar">

-    <category name="eclipse/UML"/>

-  </feature>

-  <feature url="features/org.eclipse.pde.feature_1.0.0.jar">

-    <category name="eclipse/J2EE"/>

-  </feature>

-  <archive path="plugins/org.eclipse.help_1.0.0.jar" url="plugins/help.jar"/>

-  <archive path="plugins/org.eclipse.pde.core_1.0.0.jar" url="plugins/Pde_core.jar"/>

-  <archive path="plugins/org.junit_3.5.0.jar" url="plugins/junit_3.7.jar"/>

-  <category-def label="IBM WSAD Tools" name="eclipse"/>

-  <category-def label="J2EE tools" name="eclipse/J2EE"/>

-  <category-def label="EJB Tools" name="eclipse/J2EE/EJB"/>

-  <category-def label="UML tools" name="eclipse/UML"/>

-  <category-def label="Messaging Tools" name="B2B"/>  

-</site>
\ No newline at end of file
diff --git a/update/org.eclipse.update.tests.core/webserver/UpdateManager2/features/features2.jar b/update/org.eclipse.update.tests.core/webserver/UpdateManager2/features/features2.jar
deleted file mode 100644
index 81df72c..0000000
--- a/update/org.eclipse.update.tests.core/webserver/UpdateManager2/features/features2.jar
+++ /dev/null
Binary files differ
diff --git a/update/org.eclipse.update.tests.core/webserver/UpdateManager2/features/org.eclipse.test.feature_1.0.0.jar b/update/org.eclipse.update.tests.core/webserver/UpdateManager2/features/org.eclipse.test.feature_1.0.0.jar
deleted file mode 100644
index d1aee3f..0000000
--- a/update/org.eclipse.update.tests.core/webserver/UpdateManager2/features/org.eclipse.test.feature_1.0.0.jar
+++ /dev/null
Binary files differ
diff --git a/update/org.eclipse.update.tests.core/webserver/UpdateManager2/features/org.eclipse.update.core.tests.feature1_1.0.4.jar b/update/org.eclipse.update.tests.core/webserver/UpdateManager2/features/org.eclipse.update.core.tests.feature1_1.0.4.jar
deleted file mode 100644
index f515ff4..0000000
--- a/update/org.eclipse.update.tests.core/webserver/UpdateManager2/features/org.eclipse.update.core.tests.feature1_1.0.4.jar
+++ /dev/null
Binary files differ
diff --git a/update/org.eclipse.update.tests.core/webserver/UpdateManager2/features/org.eclipse_test_feature.jar b/update/org.eclipse.update.tests.core/webserver/UpdateManager2/features/org.eclipse_test_feature.jar
deleted file mode 100644
index 2be38d3..0000000
--- a/update/org.eclipse.update.tests.core/webserver/UpdateManager2/features/org.eclipse_test_feature.jar
+++ /dev/null
Binary files differ
diff --git a/update/org.eclipse.update.tests.core/webserver/UpdateManager2/nestedFeatureSiteTest/features/org.eclipse.update.core.tests.childrenfeature_2.0.0.jar b/update/org.eclipse.update.tests.core/webserver/UpdateManager2/nestedFeatureSiteTest/features/org.eclipse.update.core.tests.childrenfeature_2.0.0.jar
deleted file mode 100644
index 022665c..0000000
--- a/update/org.eclipse.update.tests.core/webserver/UpdateManager2/nestedFeatureSiteTest/features/org.eclipse.update.core.tests.childrenfeature_2.0.0.jar
+++ /dev/null
Binary files differ
diff --git a/update/org.eclipse.update.tests.core/webserver/UpdateManager2/nestedFeatureSiteTest/features/rootfeature.jar b/update/org.eclipse.update.tests.core/webserver/UpdateManager2/nestedFeatureSiteTest/features/rootfeature.jar
deleted file mode 100644
index b519803..0000000
--- a/update/org.eclipse.update.tests.core/webserver/UpdateManager2/nestedFeatureSiteTest/features/rootfeature.jar
+++ /dev/null
Binary files differ
diff --git a/update/org.eclipse.update.tests.core/webserver/UpdateManager2/nestedFeatureSiteTest/plugins/org.eclipse.update.core.tests.feature1.plugin1_3.5.6.jar b/update/org.eclipse.update.tests.core/webserver/UpdateManager2/nestedFeatureSiteTest/plugins/org.eclipse.update.core.tests.feature1.plugin1_3.5.6.jar
deleted file mode 100644
index 5d9f5bc..0000000
--- a/update/org.eclipse.update.tests.core/webserver/UpdateManager2/nestedFeatureSiteTest/plugins/org.eclipse.update.core.tests.feature1.plugin1_3.5.6.jar
+++ /dev/null
Binary files differ
diff --git a/update/org.eclipse.update.tests.core/webserver/UpdateManager2/nestedFeatureSiteTest/plugins/org.eclipse.update.core.tests.feature1.plugin2_5.0.0.jar b/update/org.eclipse.update.tests.core/webserver/UpdateManager2/nestedFeatureSiteTest/plugins/org.eclipse.update.core.tests.feature1.plugin2_5.0.0.jar
deleted file mode 100644
index 8b4b04a..0000000
--- a/update/org.eclipse.update.tests.core/webserver/UpdateManager2/nestedFeatureSiteTest/plugins/org.eclipse.update.core.tests.feature1.plugin2_5.0.0.jar
+++ /dev/null
Binary files differ
diff --git a/update/org.eclipse.update.tests.core/webserver/UpdateManager2/nestedFeatureSiteTest/plugins/org.eclipse.update.core.tests.feature1.plugin2_5.0.1.jar b/update/org.eclipse.update.tests.core/webserver/UpdateManager2/nestedFeatureSiteTest/plugins/org.eclipse.update.core.tests.feature1.plugin2_5.0.1.jar
deleted file mode 100644
index 52208fe..0000000
--- a/update/org.eclipse.update.tests.core/webserver/UpdateManager2/nestedFeatureSiteTest/plugins/org.eclipse.update.core.tests.feature1.plugin2_5.0.1.jar
+++ /dev/null
Binary files differ
diff --git a/update/org.eclipse.update.tests.core/webserver/UpdateManager2/nestedFeatureSiteTest/site.xml b/update/org.eclipse.update.tests.core/webserver/UpdateManager2/nestedFeatureSiteTest/site.xml
deleted file mode 100644
index 7b09c86..0000000
--- a/update/org.eclipse.update.tests.core/webserver/UpdateManager2/nestedFeatureSiteTest/site.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<site>
-  <feature url="features/rootfeature.jar" os="*"/>
-</site>
\ No newline at end of file
diff --git a/update/org.eclipse.update.tests.core/webserver/UpdateManager2/org.eclipse.update.core.feature2_1.0.0/org.eclipse.update.core.feature2_2.2.2.jar b/update/org.eclipse.update.tests.core/webserver/UpdateManager2/org.eclipse.update.core.feature2_1.0.0/org.eclipse.update.core.feature2_2.2.2.jar
deleted file mode 100644
index b00d882..0000000
--- a/update/org.eclipse.update.tests.core/webserver/UpdateManager2/org.eclipse.update.core.feature2_1.0.0/org.eclipse.update.core.feature2_2.2.2.jar
+++ /dev/null
Binary files differ
diff --git a/update/org.eclipse.update.tests.core/webserver/UpdateManager2/plugins/org.eclipse.update.core.feature1.plugin1_1.1.1.jar b/update/org.eclipse.update.tests.core/webserver/UpdateManager2/plugins/org.eclipse.update.core.feature1.plugin1_1.1.1.jar
deleted file mode 100644
index 0c995d5..0000000
--- a/update/org.eclipse.update.tests.core/webserver/UpdateManager2/plugins/org.eclipse.update.core.feature1.plugin1_1.1.1.jar
+++ /dev/null
Binary files differ
diff --git a/update/org.eclipse.update.tests.core/webserver/UpdateManager2/plugins/org.eclipse.update.core.feature2.plugin2_2.2.2.jar b/update/org.eclipse.update.tests.core/webserver/UpdateManager2/plugins/org.eclipse.update.core.feature2.plugin2_2.2.2.jar
deleted file mode 100644
index 0c995d5..0000000
--- a/update/org.eclipse.update.tests.core/webserver/UpdateManager2/plugins/org.eclipse.update.core.feature2.plugin2_2.2.2.jar
+++ /dev/null
Binary files differ
diff --git a/update/org.eclipse.update.tests.core/webserver/UpdateManager2/plugins/org.eclipse.update.core.tests.dummy_7.9.8.jar b/update/org.eclipse.update.tests.core/webserver/UpdateManager2/plugins/org.eclipse.update.core.tests.dummy_7.9.8.jar
deleted file mode 100644
index d6737f6..0000000
--- a/update/org.eclipse.update.tests.core/webserver/UpdateManager2/plugins/org.eclipse.update.core.tests.dummy_7.9.8.jar
+++ /dev/null
Binary files differ
diff --git a/update/org.eclipse.update.tests.core/webserver/UpdateManager2/plugins/org.eclipse.update.core.tests.feature1.plugin1_3.5.6.jar b/update/org.eclipse.update.tests.core/webserver/UpdateManager2/plugins/org.eclipse.update.core.tests.feature1.plugin1_3.5.6.jar
deleted file mode 100644
index eb8690f..0000000
--- a/update/org.eclipse.update.tests.core/webserver/UpdateManager2/plugins/org.eclipse.update.core.tests.feature1.plugin1_3.5.6.jar
+++ /dev/null
Binary files differ
diff --git a/update/org.eclipse.update.tests.core/webserver/UpdateManager2/plugins/org.eclipse.update.core.tests.feature1.plugin2_5.0.0.jar b/update/org.eclipse.update.tests.core/webserver/UpdateManager2/plugins/org.eclipse.update.core.tests.feature1.plugin2_5.0.0.jar
deleted file mode 100644
index 90a612f..0000000
--- a/update/org.eclipse.update.tests.core/webserver/UpdateManager2/plugins/org.eclipse.update.core.tests.feature1.plugin2_5.0.0.jar
+++ /dev/null
Binary files differ
diff --git a/update/org.eclipse.update.tests.core/webserver/UpdateManager2/site.properties b/update/org.eclipse.update.tests.core/webserver/UpdateManager2/site.properties
deleted file mode 100644
index 8e1ced4..0000000
--- a/update/org.eclipse.update.tests.core/webserver/UpdateManager2/site.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-###############################################################################

-# Copyright (c) 2000, 2003 IBM Corporation and others.

-# All rights reserved. This program and the accompanying materials 

-# are made available under the terms of the Common Public License v1.0

-# which accompanies this distribution, and is available at

-# http://www.eclipse.org/legal/cpl-v10.html

-# 

-# Contributors:

-#     IBM Corporation - initial API and implementation

-###############################################################################

-drivers=Required Drivers

-security=Security Fixes
\ No newline at end of file
diff --git a/update/org.eclipse.update.tests.core/webserver/UpdateManager2/site.xml b/update/org.eclipse.update.tests.core/webserver/UpdateManager2/site.xml
deleted file mode 100644
index 657d9b2..0000000
--- a/update/org.eclipse.update.tests.core/webserver/UpdateManager2/site.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<site id="org.eclipse.update.core.tests" name="Tests" version="0.0.1">

-  <feature url="features/org.eclipse.test.feature_1.0.0.jar">

-    <category name="category1"/>

-  </feature>

-  <feature url="features/features2.jar">

-    <category name="category1/subcat1"/>

-    <category name="category2"/>

-  </feature>

-  <feature url="features/org.eclipse.update.core.tests.feature1_1.0.4.jar">

-    <category name="category1"/>

-    <category name="category2"/>

-  </feature>

-  <feature url="features/org.eclipse_test_feature.jar"/>

-  <feature url="org.eclipse.update.core.feature2_1.0.0/org.eclipse.update.core.feature2_2.2.2.jar">

-    <category name="category1"/>

-  </feature>

-  <feature url="org.eclipse.update.core.feature2_1.0.0/org.eclipse.update.core.feature2_2.2.2.jar">

-  </feature>

-

-  <category-def name="category1/subcat1" label="Special Fix"/>

-  <category-def name="category1" label="%drivers"/>

-  <category-def name="category2" label="%security"/>

-</site>
\ No newline at end of file
diff --git a/update/org.eclipse.update.tests.core/webserver/WEB-INF/web.xml b/update/org.eclipse.update.tests.core/webserver/WEB-INF/web.xml
deleted file mode 100644
index 1a6d904..0000000
--- a/update/org.eclipse.update.tests.core/webserver/WEB-INF/web.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>

-

-

-<!DOCTYPE web-app

-    PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.2//EN"

-    "http://java.sun.com/j2ee/dtds/web-app_2.2.dtd">

-

-<web-app>

-    

-</web-app>

diff --git a/update/org.eclipse.update.ui.forms/.classpath b/update/org.eclipse.update.ui.forms/.classpath
deleted file mode 100644
index 6088d79..0000000
--- a/update/org.eclipse.update.ui.forms/.classpath
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<classpath>

-    <classpathentry kind="src" path="src/"/>

-    <classpathentry kind="src" path="/org.eclipse.core.runtime"/>

-    <classpathentry kind="src" path="/org.eclipse.ui"/>

-    <classpathentry kind="src" path="/org.apache.xerces"/>

-    <classpathentry kind="src" path="/org.eclipse.core.boot"/>

-    <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>

-    <classpathentry kind="output" path="bin"/>

-</classpath>

diff --git a/update/org.eclipse.update.ui.forms/.cvsignore b/update/org.eclipse.update.ui.forms/.cvsignore
deleted file mode 100644
index c5e82d7..0000000
--- a/update/org.eclipse.update.ui.forms/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
\ No newline at end of file
diff --git a/update/org.eclipse.update.ui.forms/.project b/update/org.eclipse.update.ui.forms/.project
deleted file mode 100644
index d64baa0..0000000
--- a/update/org.eclipse.update.ui.forms/.project
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.update.ui.forms</name>

-	<comment></comment>

-	<projects>

-		<project>org.apache.xerces</project>

-		<project>org.eclipse.core.boot</project>

-		<project>org.eclipse.core.runtime</project>

-		<project>org.eclipse.ui</project>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-		<nature>org.eclipse.pde.PluginNature</nature>

-	</natures>

-</projectDescription>

diff --git a/update/org.eclipse.update.ui.forms/about.html b/update/org.eclipse.update.ui.forms/about.html
deleted file mode 100644
index 9db411a..0000000
--- a/update/org.eclipse.update.ui.forms/about.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>20th June, 2002</p>	
-<h3>License</h3>
-<p>Eclipse.org makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Common Public License Version 1.0 (&quot;CPL&quot;).  A copy of the CPL is available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>.
-For purposes of the CPL, &quot;Program&quot; will mean the Content.</p>
-
-<h3>Contributions</h3>
-
-<p>If this Content is licensed to you under the terms and conditions of the CPL, any Contributions, as defined in the CPL, uploaded, submitted, or otherwise
-made available to Eclipse.org, members of Eclipse.org and/or the host of Eclipse.org web site, by you that relate to such
-Content are provided under the terms and conditions of the CPL and can be made available to others under the terms of the CPL.</p>
-
-<p>If this Content is licensed to you under license terms and conditions other than the CPL (&quot;Other License&quot;), any modifications, enhancements and/or
-other code and/or documentation (&quot;Modifications&quot;) uploaded, submitted, or otherwise made available to Eclipse.org, members of Eclipse.org and/or the
-host of Eclipse.org, by you that relate to such Content are provided under terms and conditions of the Other License and can be made available
-to others under the terms of the Other License.  In addition, with regard to Modifications for which you are the copyright holder, you are also
-providing the Modifications under the terms and conditions of the CPL and such Modifications can be made available to others under the terms of
-the CPL.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/update/org.eclipse.update.ui.forms/build.properties b/update/org.eclipse.update.ui.forms/build.properties
deleted file mode 100644
index 763b81a..0000000
--- a/update/org.eclipse.update.ui.forms/build.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-###############################################################################

-# Copyright (c) 2000, 2003 IBM Corporation and others.

-# All rights reserved. This program and the accompanying materials 

-# are made available under the terms of the Common Public License v1.0

-# which accompanies this distribution, and is available at

-# http://www.eclipse.org/legal/cpl-v10.html

-# 

-# Contributors:

-#     IBM Corporation - initial API and implementation

-###############################################################################

-source.forms.jar = src/

-src.includes=about.html

-bin.includes = plugin.properties,\

-               *.jar,\

-               plugin.xml,\

-               about.html

diff --git a/update/org.eclipse.update.ui.forms/plugin.properties b/update/org.eclipse.update.ui.forms/plugin.properties
deleted file mode 100644
index 2699472..0000000
--- a/update/org.eclipse.update.ui.forms/plugin.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-###############################################################################

-# Copyright (c) 2000, 2003 IBM Corporation and others.

-# All rights reserved. This program and the accompanying materials 

-# are made available under the terms of the Common Public License v1.0

-# which accompanies this distribution, and is available at

-# http://www.eclipse.org/legal/cpl-v10.html

-# 

-# Contributors:

-#     IBM Corporation - initial API and implementation

-###############################################################################

-#

-# plugin.xml properties

-#

-

-name = Install/Update Forms

-provider-name = Eclipse.org

-

diff --git a/update/org.eclipse.update.ui.forms/plugin.xml b/update/org.eclipse.update.ui.forms/plugin.xml
deleted file mode 100644
index 678d82b..0000000
--- a/update/org.eclipse.update.ui.forms/plugin.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<plugin

-   id="org.eclipse.update.ui.forms"

-   name="%name"

-   version="2.1.0"

-   provider-name="%provider-name"

-   class="org.eclipse.update.ui.forms.internal.FormsPlugin">

-

-   <runtime>

-      <library name="forms.jar">

-         <export name="*"/>

-         <packages prefixes="org.eclipse.update.ui.forms.internal"/>

-      </library>

-   </runtime>

-   <requires>

-      <import plugin="org.eclipse.core.runtime"/>

-      <import plugin="org.eclipse.ui"/>

-      <import plugin="org.apache.xerces"/>

-   </requires>

-

-

-</plugin>

diff --git a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/AbstractForm.java b/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/AbstractForm.java
deleted file mode 100644
index ff34966..0000000
--- a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/AbstractForm.java
+++ /dev/null
@@ -1,233 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2000, 2003 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials 

- * are made available under the terms of the Common Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/cpl-v10.html

- * 

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-package org.eclipse.update.ui.forms.internal;

-import org.eclipse.swt.graphics.*;

-import org.eclipse.swt.widgets.*;

-import org.eclipse.jface.preference.*;

-import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.jface.resource.*;

-import org.eclipse.jface.util.*;

-import org.eclipse.ui.*;

-

-/**

- * This class implements IForm interface and

- * provides some common services to its subclasses.

- * It handles some common properties like heading

- * text, image and colors, as well as

- * font change processing.

- */

-

-public abstract class AbstractForm implements IForm, IPropertyChangeListener {

-	protected FormWidgetFactory factory;

-	protected Color headingBackground;

-	protected Color headingForeground;

-	protected boolean headingVisible = true;

-	protected Image headingImage;

-	protected String headingText;

-	protected Font titleFont;

-	private IPropertyChangeListener hyperlinkColorListener;

-

-	public AbstractForm() {

-		factory = new FormWidgetFactory();

-		titleFont = JFaceResources.getHeaderFont();

-		JFaceResources.getFontRegistry().addListener(this);

-		IPreferenceStore pstore = JFacePreferences.getPreferenceStore();

-		hyperlinkColorListener = new IPropertyChangeListener() {

-			public void propertyChange(PropertyChangeEvent e) {

-				if (e.getProperty().equals(JFacePreferences.HYPERLINK_COLOR)

-					|| e.getProperty().equals(

-						JFacePreferences.ACTIVE_HYPERLINK_COLOR)) {

-					updateHyperlinkColors();

-				}

-			}

-		};

-		pstore.addPropertyChangeListener(hyperlinkColorListener);

-	}

-	

-	protected void updateHyperlinkColors() {

-		factory.updateHyperlinkColors();

-	}

-

-	/**

-	 * @see IForm#commitChanges(boolean)

-	 */

-	public void commitChanges(boolean onSave) {

-	}

-

-	/**

-	 * @see IForm#createControl(Composite)

-	 */

-	public abstract Control createControl(Composite parent);

-

-	/**

-	 * @see IForm#dispose()

-	 */

-	public void dispose() {

-		factory.dispose();

-		JFaceResources.getFontRegistry().removeListener(this);

-		IPreferenceStore pstore = JFacePreferences.getPreferenceStore();

-		pstore.removePropertyChangeListener(this);

-		pstore.removePropertyChangeListener(hyperlinkColorListener);

-	}

-

-	/**

-	 * @see IForm#doGlobalAction(String)

-	 */

-	public boolean doGlobalAction(String actionId) {

-		return false;

-	}

-

-	/**

-	 * @see IForm#expandTo(Object)

-	 */

-	public void expandTo(Object object) {

-	}

-

-	/**

-	 * @see IForm#getControl()

-	 */

-	public abstract Control getControl();

-

-	/**

-	 * @see IForm#getFactory()

-	 */

-	public FormWidgetFactory getFactory() {

-		return factory;

-	}

-

-	/**

-	 * @see IForm#getHeadingBackground()

-	 */

-	public Color getHeadingBackground() {

-		return headingBackground;

-	}

-

-	/**

-	 * @see IForm#getHeadingForeground()

-	 */

-	public Color getHeadingForeground() {

-		return headingForeground;

-	}

-

-	/**

-	 * @see IForm#getHeadingImage()

-	 */

-	public Image getHeadingImage() {

-		return headingImage;

-	}

-

-	/**

-	 * @see IForm#getHeading()

-	 */

-	public String getHeadingText() {

-		if (headingText == null)

-			return "";

-		return headingText;

-	}

-

-	/**

-	 * @see IForm#initialize(Object)

-	 */

-	public void initialize(Object model) {

-	}

-

-	/**

-	 * @see IForm#isHeadingVisible()

-	 */

-	public boolean isHeadingVisible() {

-		return headingVisible;

-	}

-

-	/**

-	 * @see IForm#registerSection(FormSection)

-	 */

-	public void registerSection(FormSection section) {

-	}

-

-	/**

-	 * @see IForm#setFocus()

-	 */

-	public void setFocus() {

-	}

-

-	/**

-	 * @see IForm#setHeadingBackground(Color)

-	 */

-	public void setHeadingBackground(Color newHeadingBackground) {

-		this.headingBackground = newHeadingBackground;

-	}

-

-	/**

-	 * @see IForm#setHeadingForeground(Color)

-	 */

-	public void setHeadingForeground(Color newHeadingForeground) {

-		this.headingForeground = newHeadingForeground;

-	}

-

-	/**

-	 * @see IForm#setHeadingImage(Image)

-	 */

-	public void setHeadingImage(Image headingImage) {

-		this.headingImage = headingImage;

-	}

-

-	/**

-	 * @see IForm#setHeadingVisible(boolean)

-	 */

-	public void setHeadingVisible(boolean newHeadingVisible) {

-		this.headingVisible = newHeadingVisible;

-	}

-

-	/**

-	 * @see IForm#setHeading(String)

-	 */

-	public void setHeadingText(String headingText) {

-		this.headingText = headingText;

-	}

-

-	/**

-	 * @see IForm#update()

-	 */

-	public void update() {

-	}

-

-	protected boolean canPerformDirectly(String id, Control control) {

-		if (control instanceof Text) {

-			Text text = (Text) control;

-			if (id.equals(IWorkbenchActionConstants.CUT)) {

-				text.cut();

-				return true;

-			}

-			if (id.equals(IWorkbenchActionConstants.COPY)) {

-				text.copy();

-				return true;

-			}

-			if (id.equals(IWorkbenchActionConstants.PASTE)) {

-				text.paste();

-				return true;

-			}

-			if (id.equals(IWorkbenchActionConstants.SELECT_ALL)) {

-				text.selectAll();

-				return true;

-			}

-			if (id.equals(IWorkbenchActionConstants.DELETE)) {

-				int count = text.getSelectionCount();

-				if (count == 0) {

-					int caretPos = text.getCaretPosition();

-					text.setSelection(caretPos, caretPos + 1);

-				}

-				text.insert("");

-				return true;

-			}

-		}

-		return false;

-	}

-}

diff --git a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/AbstractSectionForm.java b/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/AbstractSectionForm.java
deleted file mode 100644
index c72e732..0000000
--- a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/AbstractSectionForm.java
+++ /dev/null
@@ -1,215 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2000, 2003 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials 

- * are made available under the terms of the Common Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/cpl-v10.html

- * 

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-package org.eclipse.update.ui.forms.internal;

-import java.util.*;

-import org.eclipse.swt.widgets.*;

-import org.eclipse.swt.dnd.Clipboard;

-import org.eclipse.swt.custom.ScrolledComposite;

-import org.eclipse.swt.graphics.*;

-

-/**

- * This form class understands form sections.

- * It assumes that they are part of the form

- * and it offers life cycle handling of sections

- * once they are registered.

- */

-

-public abstract class AbstractSectionForm extends AbstractForm {

-	public static final int H_SCROLL_INCREMENT = 5;

-	public static final int V_SCROLL_INCREMENT = 64;

-	protected Vector sections = null;

-

-	public void registerSection(FormSection section) {

-		if (sections == null)

-			sections = new Vector();

-		if (!sections.contains(section))

-			sections.add(section);

-	}

-

-	public void unregisterSection(FormSection section) {

-		if (sections != null && sections.contains(section))

-			sections.remove(section);

-	}

-

-	public void initialize(Object model) {

-		if (sections != null) {

-			for (Iterator iter = sections.iterator(); iter.hasNext();) {

-				FormSection section = (FormSection) iter.next();

-				section.initialize(model);

-			}

-		}

-	}

-

-	public void setFocus() {

-		if (sections != null && sections.size() > 0) {

-			FormSection firstSection = (FormSection) sections.firstElement();

-			firstSection.setFocus();

-		}

-	}

-

-	public void update() {

-		if (sections != null) {

-			for (Iterator iter = sections.iterator(); iter.hasNext();) {

-				FormSection section = (FormSection) iter.next();

-				section.update();

-			}

-		}

-	}

-

-	public void commitChanges(boolean onSave) {

-		if (sections != null) {

-			for (Iterator iter = sections.iterator(); iter.hasNext();) {

-				FormSection section = (FormSection) iter.next();

-				if (section.isDirty())

-					section.commitChanges(onSave);

-			}

-		}

-	}

-

-	public boolean doGlobalAction(String actionId) {

-		Control focusControl = getFocusControl();

-		if (focusControl == null)

-			return false;

-

-		if (canPerformDirectly(actionId, focusControl))

-			return true;

-		Composite parent = focusControl.getParent();

-		FormSection targetSection = null;

-		while (parent != null) {

-			Object data = parent.getData();

-			if (data != null && data instanceof FormSection) {

-				targetSection = (FormSection) data;

-				break;

-			}

-			parent = parent.getParent();

-		}

-		if (targetSection != null) {

-			return targetSection.doGlobalAction(actionId);

-		}

-		return false;

-	}

-

-	protected Control getFocusControl() {

-		Control control = getControl();

-		if (control == null || control.isDisposed())

-			return null;

-		Display display = control.getDisplay();

-		Control focusControl = display.getFocusControl();

-		if (focusControl == null || focusControl.isDisposed())

-			return null;

-		return focusControl;

-	}

-

-	public boolean canPaste(Clipboard clipboard) {

-		Control focusControl = getFocusControl();

-		if (focusControl == null)

-			return false;

-		Composite parent = focusControl.getParent();

-		FormSection targetSection = null;

-		while (parent != null) {

-			Object data = parent.getData();

-			if (data != null && data instanceof FormSection) {

-				targetSection = (FormSection) data;

-				break;

-			}

-			parent = parent.getParent();

-		}

-		if (targetSection != null) {

-			return targetSection.canPaste(clipboard);

-		}

-		return false;

-	}

-

-	public void dispose() {

-		if (sections != null) {

-			for (Iterator iter = sections.iterator(); iter.hasNext();) {

-				FormSection section = (FormSection) iter.next();

-				section.dispose();

-			}

-		}

-		super.dispose();

-	}

-

-	public static void ensureVisible(ScrolledComposite scomp, Control control) {

-		Point controlSize = control.getSize();

-		Point controlOrigin = getControlLocation(scomp, control);

-		ensureVisible(scomp, controlOrigin, controlSize);

-	}

-

-	public static void ensureVisible(ScrolledComposite scomp, Point controlOrigin, Point controlSize) {

-		Rectangle area = scomp.getClientArea();

-		Point scompOrigin = scomp.getOrigin();

-

-		int x = scompOrigin.x;

-		int y = scompOrigin.y;

-

-		if (controlOrigin.x < scompOrigin.x ) {

-			x = controlOrigin.x;

-		} else if (controlOrigin.x + controlSize.x > scompOrigin.x + area.width) {

-			x = controlOrigin.x + controlSize.x - area.width;

-		}

-

-		if (controlOrigin.y < scompOrigin.y) {

-			y = controlOrigin.y;

-		} else if (controlOrigin.y + controlSize.y > scompOrigin.y + area.height) {

-			y = controlOrigin.y + controlSize.y - area.height;

-		}

-		scomp.setOrigin(x, y);

-	}

-	

-	public static Point getControlLocation(ScrolledComposite scomp, Control control) {

-		int x = 0;

-		int y = 0;

-		Control currentControl = control;

-		for (;;) {

-			if (currentControl == scomp)

-				break;

-			if (currentControl.getLocation().x > 0)

-				x += currentControl.getLocation().x;

-			if (currentControl.getLocation().y > 0)

-				y += currentControl.getLocation().y;

-			currentControl = currentControl.getParent();

-		}

-		return new Point(x, y);

-	}

-	

-	public static void scrollVertical(ScrolledComposite scomp, boolean up) {

-		scroll(scomp, 0, up ? -V_SCROLL_INCREMENT : V_SCROLL_INCREMENT);

-	}

-	public static void scrollHorizontal(ScrolledComposite scomp, boolean left) {

-		scroll(scomp, left ? -H_SCROLL_INCREMENT : H_SCROLL_INCREMENT, 0);

-	}

-	public static void scrollPage(ScrolledComposite scomp, boolean up) {

-		Rectangle clientArea = scomp.getClientArea();

-		int increment = up ? -clientArea.height : clientArea.height;

-		scroll(scomp, 0, increment);

-	}

-	private static void scroll(ScrolledComposite scomp, int xoffset, int yoffset) {

-		Point origin = scomp.getOrigin();

-		Point contentSize = scomp.getContent().getSize();

-		int xorigin = origin.x + xoffset;

-		int yorigin = origin.y + yoffset;

-		xorigin = Math.max(xorigin, 0);

-		xorigin = Math.min(xorigin, contentSize.x - 1);

-		yorigin = Math.max(yorigin, 0);

-		yorigin = Math.min(yorigin, contentSize.y - 1);

-		scomp.setOrigin(xorigin, yorigin);

-	}

-

-	public static void updatePageIncrement(ScrolledComposite scomp) {

-		ScrollBar vbar = scomp.getVerticalBar();

-		if (vbar != null) {

-			Rectangle clientArea = scomp.getClientArea();

-			int increment = clientArea.height - 5;

-			vbar.setPageIncrement(increment);

-		}

-	}

-}

diff --git a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/CustomWorkbook.java b/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/CustomWorkbook.java
deleted file mode 100644
index f88ebcc..0000000
--- a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/CustomWorkbook.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2000, 2003 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials 

- * are made available under the terms of the Common Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/cpl-v10.html

- * 

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-package org.eclipse.update.ui.forms.internal;

-

-import org.eclipse.swt.events.*;

-import org.eclipse.swt.graphics.*;

-import java.util.*;

-import org.eclipse.swt.widgets.*;

-import org.eclipse.swt.*;

-import org.eclipse.swt.custom.*;

-

-

-public class CustomWorkbook implements IFormWorkbook {

-	private Hashtable pages;

-	private boolean firstPageSelected=true;

-	private CTabFolder tabFolder;

-	private Vector listeners=new Vector();

-	private IFormPage currentPage;

-

-public CustomWorkbook() {

-	pages = new Hashtable();

-}

-public void addFormSelectionListener(IFormSelectionListener listener) {

-	listeners.addElement(listener);

-}

-public void addPage(IFormPage page) {

-	CTabItem item = new CTabItem(tabFolder, SWT.NULL);

-	item.setText(page.getLabel());

-	item.setToolTipText(page.getTitle());

-	item.setData(page);

-	pages.put(page, item);

-	

-	if (firstPageSelected && currentPage == null)

-		selectPage(page, true);

-}

-public void createControl(Composite parent) {

-	tabFolder = new CTabFolder(parent, SWT.BOTTOM);

-	tabFolder.addSelectionListener(new SelectionAdapter() {

-		public void widgetSelected(SelectionEvent e) {

-			CTabItem item = (CTabItem) e.item;

-			IFormPage page = (IFormPage) item.getData();

-			if (page != null)

-				selectPage(page, true);

-		}

-	});

-	// listener to resize visible components

-	tabFolder.addListener(SWT.Resize, new Listener() {

-		public void handleEvent(Event e) {

-			if (currentPage != null)

-				setControlSize(currentPage.getControl());

-		}

-	});

-}

-private void fireSelectionChanged(IFormPage page, boolean setFocus) {

-	for (Iterator iter = listeners.iterator(); iter.hasNext();) {

-		IFormSelectionListener listener = (IFormSelectionListener) iter.next();

-		listener.formSelected(page, setFocus);

-	}

-}

-public Control getControl() {

-	return tabFolder;

-}

-public IFormPage getCurrentPage() {

-	return currentPage;

-}

-public boolean isFirstPageSelected() {

-	return firstPageSelected;

-}

-public void removeFormSelectionListener(IFormSelectionListener listener) {

-	listeners.removeElement(listener);

-}

-public void removePage(IFormPage page) {

-	CTabItem item = (CTabItem) pages.get(page);

-	if (item != null)

-		item.dispose();

-}

-private void reselectPage(final IFormPage page) {

-	tabFolder.getDisplay().asyncExec(new Runnable() {

-		public void run() {

-		selectPage(page, true);

-		}

-	});

-}

-public void selectPage(final IFormPage page, final boolean setFocus) {

-	final IFormPage oldPage = currentPage;

-	currentPage = page;

-

-	// It may take a while

-	BusyIndicator.showWhile(tabFolder.getDisplay(), new Runnable() {

-		public void run() {

-			switchPages(oldPage, page, setFocus);

-		}

-	});

-}

-private void setControlSize(Control control) {

-	Rectangle bounds = tabFolder.getBounds();

-	Rectangle offset = tabFolder.getClientArea();

-	bounds.x += offset.x;

-	bounds.y += offset.y;

-	bounds.width = offset.width;

-	bounds.height = offset.height;

-	control.setBounds(bounds);

-	control.moveAbove(tabFolder);

-}

-private void setControlVisible(Control control) {

-	if (control == null)

-		return;

-	setControlSize(control);

-	control.setVisible(true);

-}

-public void setFirstPageSelected(boolean newFirstPageSelected) {

-	firstPageSelected = newFirstPageSelected;

-}

-private void switchPages(IFormPage oldPage, IFormPage newPage, boolean setFocus) {

-	if (oldPage != null && oldPage!=newPage) {

-		boolean okToSwitch = oldPage.becomesInvisible(newPage);

-		if (!okToSwitch) {

-			// We must try to go back to the source page

-			reselectPage(oldPage);

-			return;

-		}

-	}

-	if (newPage.getControl() == null)

-		newPage.createControl(tabFolder);

-	tabFolder.setSelection((CTabItem) pages.get(newPage));

-	if (oldPage != null && oldPage != newPage) {

-		Control oldControl = oldPage.getControl();

-		if (oldControl!=null) oldControl.setVisible(false);

-	}

-	Control newControl = newPage.getControl();

-	newPage.becomesVisible(oldPage);

-	setControlVisible(newControl);

-	fireSelectionChanged(newPage, setFocus);

-}

-}

diff --git a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/ExpandableGroup.java b/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/ExpandableGroup.java
deleted file mode 100644
index edb5f8a..0000000
--- a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/ExpandableGroup.java
+++ /dev/null
@@ -1,211 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2000, 2003 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials 

- * are made available under the terms of the Common Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/cpl-v10.html

- * 

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-package org.eclipse.update.ui.forms.internal;

-import org.eclipse.swt.graphics.*;

-import org.eclipse.swt.widgets.*;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.events.*;

-

-public abstract class ExpandableGroup {

-	private String text;

-	private boolean expanded;

-	private Composite expansion;

-	protected SelectableFormLabel textLabel;

-	private Composite control;

-	private boolean expandable=true;

-	

-class ExpandableLayout extends Layout {

-	protected void layout(Composite parent, boolean changed) {

-		Rectangle clientArea = parent.getClientArea();

-		Point size = textLabel.computeSize(SWT.DEFAULT, SWT.DEFAULT, changed);

-		int x = 0;

-		int y = 1;

-		

-		if (expandable) {

-			x = 8 + 8;

-		}

-		textLabel.setBounds(x, y, size.x, size.y);

-	

-		if (expandable)

-		   y = Math.max(size.y, 8) + 2 + 2;

-		else

-		   y = size.y + 2;

-		if (expanded) {

-			int areaWidth = clientArea.width - x;

-			size = expansion.computeSize(areaWidth, SWT.DEFAULT, changed);

-			expansion.setBounds(x, y, size.x, size.y);

-		}

-	}

-

-	protected Point computeSize(Composite parent, int wHint, int hHint, boolean changed) {

-		int width = 0, height = 0;

-		Point size = textLabel.computeSize(SWT.DEFAULT, SWT.DEFAULT, changed);

-		width = size.x;

-		height = size.y + 2 + 2;

-		if (expanded) {

-			size = expansion.computeSize(wHint, SWT.DEFAULT, changed);

-			width = Math.max(width, size.x);

-			height += size.y;

-		}

-		if (expandable) {

-			height = Math.max(height, 8);

-			width += 8 + 8;

-		}

-		return new Point(width, height);

-	}

-}

-

-	public ExpandableGroup() {

-	}

-	

-	public ExpandableGroup(int style) {

-		//this.style = style;

-	}

-	

-	public Control getControl() {

-		return control;

-	}

-	

-	public void createControl(Composite parent, final FormWidgetFactory factory) {

-		final Canvas container = new Canvas(parent, SWT.NULL);

-		container.setBackground(factory.getBackgroundColor());

-		container.setLayout(new ExpandableLayout());

-		container.addPaintListener(new PaintListener() {

-			public void paintControl(PaintEvent e) {

-				if (expandable) repaint(e);

-			}

-		});

-		container.addMouseListener(new MouseAdapter() {

-			public void mouseUp(MouseEvent e) {

-				Rectangle box = getBoxBounds(null);

-				if (box.contains(e.x, e.y)) {

-					container.setCursor(factory.getBusyCursor());

-					setExpanded(!isExpanded());

-					container.setCursor(null);

-				}

-			}

-		});

-		textLabel = createTextLabel(container, factory);

-		getHyperlinkHandler(factory).registerHyperlink(textLabel, new HyperlinkAdapter () {

-			public void linkActivated(Control link) {

-				ExpandableGroup.this.linkActivated();

-				if (expandable) setExpanded(!isExpanded());

-			}

-		});

-		textLabel.addFocusListener(factory.visibilityHandler);

-		textLabel.addKeyListener(factory.keyboardHandler);		

-		if (text!=null) textLabel.setText(text);

-		expansion = factory.createComposite(container);

-		fillExpansion(expansion, factory);

-		this.control = container;

-	}

-	

-	protected SelectableFormLabel createTextLabel(Composite parent, FormWidgetFactory factory) {

-		SelectableFormLabel text = new SelectableFormLabel(parent, SWT.WRAP);

-		text.setBackground(factory.getBackgroundColor());

-		return text;

-	}

-	

-	protected HyperlinkHandler getHyperlinkHandler(FormWidgetFactory factory) {

-		return factory.getHyperlinkHandler();

-	}

-	

-	public abstract void fillExpansion(Composite expansion, FormWidgetFactory factory);

-	

-	public void setText(String text) {

-		this.text = text;

-		if (textLabel!=null)

-		   textLabel.setText(text);

-	}

-	

-	public String getText() {

-		return text;

-	}

-	

-	public boolean isExpanded() {

-		return expanded;

-	}

-	

-	public void setExpandable(boolean expandable) {

-		this.expandable = expandable;

-	}

-	

-	public boolean isExpandable() {

-		return expandable;

-	}

-	

-	public void setExpanded(boolean expanded) {

-		if (this.expanded != expanded) {

-			if (expanded) {

-				aboutToExpand();

-			}

-			else {

-				aboutToCollapse();

-			}

-			this.expanded = expanded;

-			expansion.setVisible(expanded);

-			control.layout();

-			if (expanded) {

-				this.expanded();

-			}

-			else {

-				collapsed();

-			}

-		}

-	}

-	

-	private void repaint(PaintEvent e) {

-		GC gc = e.gc;

-		Rectangle box = getBoxBounds(gc);

-		gc.setForeground(control.getDisplay().getSystemColor(SWT.COLOR_WIDGET_NORMAL_SHADOW));

-		gc.drawRectangle(box);

-		gc.setForeground(control.getDisplay().getSystemColor(SWT.COLOR_LIST_FOREGROUND));

-		gc.drawLine(box.x+2, box.y+4, box.x+6, box.y+4);

-		if (!isExpanded()) {

-			gc.drawLine(box.x+4, box.y+2, box.x+4, box.y+6);

-		}

-	}

-	

-	private Rectangle getBoxBounds(GC gc) {

-		int x = 0;

-		int y = 0;

-		boolean noGC = false;

-	

-		if (gc==null) {

-			gc = new GC(control);

-			noGC = true;

-		}

-		gc.setFont(textLabel.getFont());

-		int height = gc.getFontMetrics().getHeight();

-		y = height/2 - 4 +1;

-		y = Math.max(y, 0);

-		if (noGC) gc.dispose();

-		return new Rectangle(x, y, 8, 8);

-	}

-	

-	protected void updateLayout() {

-		control.layout();

-	}

-	

-	protected void aboutToExpand() {

-	}

-	

-	protected void aboutToCollapse() {

-	}

-	

-	protected void expanded() {

-	}

-	protected void collapsed() {

-	}

-	protected void linkActivated() {

-	}

-}

diff --git a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/FormButton.java b/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/FormButton.java
deleted file mode 100644
index c307edf..0000000
--- a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/FormButton.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2000, 2003 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials 

- * are made available under the terms of the Common Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/cpl-v10.html

- * 

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-package org.eclipse.update.ui.forms.internal;

-

-import org.eclipse.swt.events.*;

-import org.eclipse.swt.widgets.*;

-import org.eclipse.swt.graphics.*;

-

-public class FormButton {

-	private Button button;

-	private Image image;

-	private FormWidgetFactory factory;

-	private Image hoverImage;

-	private boolean inside;

-	private Image disabledImage;

-

-public FormButton(Button button, FormWidgetFactory factory) {

-	this.button = button;

-	this.factory = factory;

-	button.addMouseTrackListener(new MouseTrackAdapter() {

-		public void mouseEnter(MouseEvent e) {

-			inside=true;

-			updateImage();

-		}

-		public void mouseExit(MouseEvent e) {

-			inside=false;

-			updateImage();

-		}

-	});

-}

-public Button getButton() {

-	return button;

-}

-public Image getDisabledImage() {

-	return disabledImage;

-}

-public Image getHoverImage() {

-	return hoverImage;

-}

-public Image getImage() {

-	return image;

-}

-public void setDisabledImage(Image newDisabledImage) {

-	disabledImage = newDisabledImage;

-}

-public void setEnabled(boolean enabled) {

-	button.setEnabled(enabled);

-	updateImage();

-}

-public void setHoverImage(Image newHoverImage) {

-	hoverImage = newHoverImage;

-}

-public void setImage(Image newImage) {

-	image = newImage;

-	if (hoverImage==null) hoverImage = image;

-	if (disabledImage==null) disabledImage = image;

-	updateImage();

-}

-public void updateImage() {

-	boolean enabled = button.isEnabled();

-	if (enabled == false) {

-		button.setImage(disabledImage);

-	} else {

-		if (inside) {

-			button.setCursor(factory.getHyperlinkCursor());

-			button.setImage(hoverImage);

-		} else {

-			button.setCursor(null);

-			button.setImage(image);

-		}

-	}

-}

-}

diff --git a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/FormEntry.java b/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/FormEntry.java
deleted file mode 100644
index a5e7e14..0000000
--- a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/FormEntry.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2000, 2003 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials 

- * are made available under the terms of the Common Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/cpl-v10.html

- * 

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-package org.eclipse.update.ui.forms.internal;

-

-import org.eclipse.swt.events.*;

-import org.eclipse.swt.widgets.*;

-import java.util.*;

-

-public class FormEntry {

-	private Text text;

-	private String value;

-	private boolean dirty;

-	private Vector listeners=new Vector();

-	boolean ignoreModify=false;

-

-public FormEntry(Text text) {

-	this.text = text;

-	this.value = text.getText();

-	addListeners();

-}

-public void addFormTextListener(IFormTextListener listener) {

-	listeners.addElement(listener);

-}

-private void addListeners() {

-	text.addKeyListener(new KeyAdapter() {

-		public void keyReleased(KeyEvent e) {

-			keyReleaseOccured(e);

-		}

-	});

-	text.addModifyListener(new ModifyListener() {

-		public void modifyText(ModifyEvent e) {

-			editOccured(e);

-		}

-	});

-	text.addFocusListener (new FocusAdapter() {

-		public void focusLost(FocusEvent e) {

-			if (dirty) commit();

-		}

-	});

-}

-public void commit() {

-	if (dirty) {

-		value = text.getText();

-		//notify

-		for (Iterator iter = listeners.iterator(); iter.hasNext();) {

-			((IFormTextListener) iter.next()).textValueChanged(this);

-		}

-	}

-	dirty = false;

-}

-protected void editOccured(ModifyEvent e) {

-	if (ignoreModify) return;

-	dirty = true;

-	for (Iterator iter = listeners.iterator(); iter.hasNext();) {

-		((IFormTextListener) iter.next()).textDirty(this);

-	}

-}

-

-public Text getControl() {

-	return text;

-}

-public java.lang.String getValue() {

-	return value;

-}

-public boolean isDirty() {

-	return dirty;

-}

-protected void keyReleaseOccured(KeyEvent e) {

-	if (e.character == '\r') {

-		// commit value

-		if (dirty) commit();

-	}

-	else if (e.character == '\u001b') { // Escape character

-		text.setText(value!=null?value:""); // restore old

-		dirty= false;

-	}

-}

-public void removeFormTextListener(IFormTextListener listener) {

-	listeners.removeElement(listener);

-}

-public void setDirty(boolean newDirty) {

-	dirty = newDirty;

-}

-public void setValue(String value) {

-	if (text!=null) text.setText(value!=null?value:"");

-	this.value = value;

-}

-

-public void setValue(String value, boolean blockNotification) {

-	ignoreModify = blockNotification;

-	setValue(value);

-	ignoreModify = false;

-}

-

-}

diff --git a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/FormLabel.java b/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/FormLabel.java
deleted file mode 100644
index 6f490f8..0000000
--- a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/FormLabel.java
+++ /dev/null
@@ -1,237 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2000, 2003 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials 

- * are made available under the terms of the Common Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/cpl-v10.html

- * 

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-package org.eclipse.update.ui.forms.internal;

-

-import java.text.BreakIterator;

-

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.accessibility.*;

-import org.eclipse.swt.events.*;

-import org.eclipse.swt.graphics.*;

-import org.eclipse.swt.widgets.*;

-

-/**

- * FormText is a windowless control that

- * draws text in the provided context.

- */

-public class FormLabel extends Canvas {

-	private String text = "";

-	int textMarginWidth = 5;

-	int textMarginHeight = 5;

-	private boolean underlined;

-

-	public FormLabel(Composite parent, int style) {

-		super(parent, style);

-		addPaintListener(new PaintListener() {

-			public void paintControl(PaintEvent e) {

-				paint(e);

-			}

-		});

-		initAccessible();

-	}

-	public String getText() {

-		return text;

-	}

-	public void setText(String text) {

-		if (text != null)

-			this.text = text;

-		else

-			text = "";

-	}

-

-	protected void initAccessible() {

-		Accessible accessible = getAccessible();

-		accessible.addAccessibleListener(new AccessibleAdapter() {

-			public void getName(AccessibleEvent e) {

-				e.result = getText();

-			}

-

-			public void getHelp(AccessibleEvent e) {

-				e.result = getToolTipText();

-			}

-		});

-

-		accessible

-			.addAccessibleControlListener(new AccessibleControlAdapter() {

-			public void getChildAtPoint(AccessibleControlEvent e) {

-				Point pt = toControl(new Point(e.x, e.y));

-				e.childID =

-					(getBounds().contains(pt))

-						? ACC.CHILDID_SELF

-						: ACC.CHILDID_NONE;

-			}

-

-			public void getLocation(AccessibleControlEvent e) {

-				Rectangle location = getBounds();

-				Point pt = toDisplay(new Point(location.x, location.y));

-				e.x = pt.x;

-				e.y = pt.y;

-				e.width = location.width;

-				e.height = location.height;

-			}

-

-			public void getChildCount(AccessibleControlEvent e) {

-				e.detail = 0;

-			}

-

-			public void getRole(AccessibleControlEvent e) {

-				e.detail = ACC.ROLE_LABEL;

-			}

-

-			public void getState(AccessibleControlEvent e) {

-				e.detail = ACC.STATE_READONLY;

-			}

-		});

-	}

-

-	public void setUnderlined(boolean underlined) {

-		this.underlined = underlined;

-	}

-

-	public boolean isUnderlined() {

-		return underlined;

-	}

-

-	public Point computeSize(int wHint, int hHint, boolean changed) {

-		int innerWidth = wHint;

-		if (innerWidth != SWT.DEFAULT)

-			innerWidth -= textMarginWidth * 2;

-		Point textSize = computeTextSize(innerWidth, hHint);

-		int textWidth = textSize.x + 2 * textMarginWidth;

-		int textHeight = textSize.y + 2 * textMarginHeight;

-		return new Point(textWidth, textHeight);

-	}

-

-	public static int computeWrapHeight(GC gc, String text, int width) {

-		BreakIterator wb = BreakIterator.getWordInstance();

-		wb.setText(text);

-		FontMetrics fm = gc.getFontMetrics();

-		int lineHeight = fm.getHeight();

-

-		int saved = 0;

-		int last = 0;

-		int height = lineHeight;

-

-		for (int loc = wb.first();

-			loc != BreakIterator.DONE;

-			loc = wb.next()) {

-			String word = text.substring(saved, loc);

-			Point extent = gc.textExtent(word);

-			if (extent.x > width) {

-				// overflow

-				saved = last;

-				height += extent.y;

-			}

-			last = loc;

-		}

-		return height;

-	}

-

-	private Point computeTextSize(int wHint, int hHint) {

-		Point extent;

-		GC gc = new GC(this);

-

-		gc.setFont(getFont());

-		if ((getStyle() & SWT.WRAP) != 0 && wHint != SWT.DEFAULT) {

-			int height = computeWrapHeight(gc, text, wHint);

-			extent = new Point(wHint, height);

-		} else {

-			extent = gc.textExtent(getText());

-		}

-		gc.dispose();

-		return extent;

-	}

-

-	public static void paintWrapText(

-		GC gc,

-		Point size,

-		String text,

-		int marginWidth,

-		int marginHeight) {

-		paintWrapText(gc, size, text, marginWidth, marginHeight, false);

-	}

-

-	public static void paintWrapText(

-		GC gc,

-		Point size,

-		String text,

-		int marginWidth,

-		int marginHeight,

-		boolean underline) {

-		BreakIterator wb = BreakIterator.getWordInstance();

-		wb.setText(text);

-		FontMetrics fm = gc.getFontMetrics();

-		int lineHeight = fm.getHeight();

-		int descent = fm.getDescent();

-

-		int saved = 0;

-		int last = 0;

-		int y = marginHeight;

-		int width = size.x - marginWidth * 2;

-

-		for (int loc = wb.first();

-			loc != BreakIterator.DONE;

-			loc = wb.next()) {

-			String line = text.substring(saved, loc);

-			Point extent = gc.textExtent(line);

-			if (extent.x > width) {

-				// overflow

-				String prevLine = text.substring(saved, last);

-				gc.drawString(prevLine, marginWidth, y, true);

-				if (underline) {

-					Point prevExtent = gc.textExtent(prevLine);

-					int lineY = y + lineHeight - descent + 1;

-					gc.drawLine(marginWidth, lineY, prevExtent.x, lineY);

-				}

-

-				saved = last;

-				y += lineHeight;

-			}

-			last = loc;

-		}

-		// paint the last line

-		String lastLine = text.substring(saved, last);

-		gc.drawString(lastLine, marginWidth, y, true);

-		if (underline) {

-			int lineY = y + lineHeight - descent + 1;

-			Point lastExtent = gc.textExtent(lastLine);

-			gc.drawLine(marginWidth, lineY, marginWidth + lastExtent.x, lineY);

-		}

-	}

-

-	protected void paint(PaintEvent e) {

-		GC gc = e.gc;

-		Point size = getSize();

-		gc.setFont(getFont());

-		gc.setForeground(getForeground());

-		if ((getStyle() & SWT.WRAP) != 0) {

-			paintWrapText(

-				gc,

-				size,

-				text,

-				textMarginWidth,

-				textMarginHeight,

-				underlined);

-		} else {

-			gc.drawText(getText(), textMarginWidth, textMarginHeight, true);

-			if (underlined) {

-				FontMetrics fm = gc.getFontMetrics();

-				int descent = fm.getDescent();

-				int lineY = size.y - textMarginHeight - descent + 1;

-				gc.drawLine(

-					textMarginWidth,

-					lineY,

-					size.x - textMarginWidth,

-					lineY);

-			}

-		}

-	}

-}

diff --git a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/FormSection.java b/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/FormSection.java
deleted file mode 100644
index 738ff8b..0000000
--- a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/FormSection.java
+++ /dev/null
@@ -1,498 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2000, 2003 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials 

- * are made available under the terms of the Common Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/cpl-v10.html

- * 

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-package org.eclipse.update.ui.forms.internal;

-

-import org.eclipse.swt.graphics.*;

-import org.eclipse.swt.graphics.Point;

-import org.eclipse.swt.layout.*;

-import org.eclipse.swt.widgets.*;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.*;

-import org.eclipse.jface.util.*;

-import org.eclipse.jface.resource.*;

-import org.eclipse.swt.events.*;

-import org.eclipse.swt.dnd.Clipboard;

-

-public abstract class FormSection implements IPropertyChangeListener {

-	public static final int SELECTION = 1;

-	private String headerColorKey = FormWidgetFactory.DEFAULT_HEADER_COLOR;

-	private String headerText;

-	private Control client;

-	protected Label header;

-	protected Control separator;

-	private SectionChangeManager sectionManager;

-	private String description;

-	private boolean dirty;

-	protected Label descriptionLabel;

-	private ToggleControl toggle;

-	private boolean readOnly;

-	private boolean addSeparator = true;

-	private boolean descriptionPainted = true;

-	private boolean headerPainted = true;

-	private boolean collapsable = false;

-	private boolean collapsed = false;

-	private int widthHint = SWT.DEFAULT;

-	private int heightHint = SWT.DEFAULT;

-	private Composite control;

-

-	/*

-	 * This is a special layout for the section. Both the

-	 * header and the description labels will wrap and

-	 * they will use client's size to calculate needed

-	 * height. This kind of behaviour is not possible

-	 * with stock grid layout.

-	 */

-	class SectionLayout extends Layout implements ILayoutExtension {

-		int vspacing = 3;

-		int sepHeight = 2;

-

-		public int getMinimumWidth(Composite parent, boolean flush) {

-			return 30;

-		}

-

-		public int getMaximumWidth(Composite parent, boolean flush) {

-			int maxWidth = 0;

-			if (client != null) {

-				Point csize =

-					client.computeSize(SWT.DEFAULT, SWT.DEFAULT, flush);

-				maxWidth = csize.x;

-			}

-			if (headerPainted && header != null) {

-				Point hsize =

-					header.computeSize(SWT.DEFAULT, SWT.DEFAULT, flush);

-				maxWidth = Math.max(maxWidth, hsize.x);

-			}

-			if (descriptionPainted && descriptionLabel != null) {

-				Point dsize =

-					descriptionLabel.computeSize(

-						SWT.DEFAULT,

-						SWT.DEFAULT,

-						flush);

-				maxWidth = Math.max(maxWidth, dsize.x);

-			}

-			return maxWidth;

-		}

-

-		protected Point computeSize(

-			Composite parent,

-			int wHint,

-			int hHint,

-			boolean flush) {

-			int width = 0;

-			int height = 0;

-			int cwidth = 0;

-			int collapsedHeight = 0;

-

-			if (wHint != SWT.DEFAULT)

-				width = wHint;

-			if (hHint != SWT.DEFAULT)

-				height = hHint;

-

-			cwidth = width;

-

-			if (client != null && !client.isDisposed()) {

-				//Point csize = client.computeSize(SWT.DEFAULT, SWT.DEFAULT, flush);

-				Point csize = client.computeSize(wHint, SWT.DEFAULT);

-				if (width == 0) {

-					width = csize.x;

-					cwidth = width;

-				}

-				if (height == 0)

-					height = csize.y;

-			}

-

-			Point toggleSize = null;

-

-			if (collapsable && toggle != null)

-				toggleSize =

-					toggle.computeSize(SWT.DEFAULT, SWT.DEFAULT, flush);

-

-			if (hHint == SWT.DEFAULT && headerPainted && header != null) {

-				int hwidth = cwidth;

-				if (toggleSize != null)

-					hwidth = cwidth - toggleSize.x - 5;

-				Point hsize = header.computeSize(hwidth, SWT.DEFAULT, flush);

-				height += hsize.y;

-				collapsedHeight = hsize.y;

-				height += vspacing;

-			}

-

-			if (hHint == SWT.DEFAULT && addSeparator) {

-				height += sepHeight;

-				height += vspacing;

-				collapsedHeight += vspacing + sepHeight;

-			}

-			if (hHint == SWT.DEFAULT

-				&& descriptionPainted

-				&& descriptionLabel != null) {

-				Point dsize =

-					descriptionLabel.computeSize(cwidth, SWT.DEFAULT, flush);

-				height += dsize.y;

-				height += vspacing;

-			}

-			if (toggle != null && toggle.getSelection()) {

-				// collapsed state

-				height = collapsedHeight;

-			}

-			return new Point(width, height);

-		}

-		protected void layout(Composite parent, boolean flush) {

-			int width = parent.getClientArea().width;

-			int height = parent.getClientArea().height;

-			int y = 0;

-			Point toggleSize = null;

-

-			if (collapsable) {

-				toggleSize =

-					toggle.computeSize(SWT.DEFAULT, SWT.DEFAULT, flush);

-			}

-			if (headerPainted && header != null) {

-				Point hsize;

-

-				int availableWidth = width;

-				if (toggleSize != null)

-					availableWidth = width - toggleSize.x - 5;

-				hsize = header.computeSize(availableWidth, SWT.DEFAULT, flush);

-				int hx = 0;

-				if (toggle != null) {

-					int ty = y + hsize.y - toggleSize.y;

-					toggle.setBounds(0, ty, toggleSize.x, toggleSize.y);

-					hx = toggleSize.x; // + 5;

-				}

-				header.setBounds(hx, y, availableWidth, hsize.y);

-

-				y += hsize.y + vspacing;

-			}

-			if (addSeparator && separator != null) {

-				separator.setBounds(0, y, width, 2);

-				y += sepHeight + vspacing;

-			}

-			if (toggle != null && toggle.getSelection()) {

-				return;

-			}

-			if (descriptionPainted && descriptionLabel != null) {

-				Point dsize =

-					descriptionLabel.computeSize(width, SWT.DEFAULT, flush);

-				descriptionLabel.setBounds(0, y, width, dsize.y);

-				y += dsize.y + vspacing;

-			}

-			if (client != null) {

-				client.setBounds(0, y, width, height - y);

-			}

-		}

-	}

-

-	public FormSection() {

-		/*

-		// Description causes problems re word wrapping

-		// and causes bad layout in schema and

-		// feature editors when in Motif - turning off

-		if (SWT.getPlatform().equals("motif")) {

-			descriptionPainted = false;

-		}

-		*/

-		JFaceResources.getFontRegistry().addListener(this);

-	}

-	public void commitChanges(boolean onSave) {

-	}

-	public abstract Composite createClient(

-		Composite parent,

-		FormWidgetFactory factory);

-	public final Control createControl(

-		Composite parent,

-		final FormWidgetFactory factory) {

-		Composite section = factory.createComposite(parent);

-		SectionLayout slayout = new SectionLayout();

-		section.setLayout(slayout);

-		section.setData(this);

-

-		if (headerPainted) {

-			Color headerColor = factory.getColor(getHeaderColorKey());

-			header =

-				factory.createHeadingLabel(

-					section,

-					getHeaderText(),

-					headerColor,

-					SWT.WRAP);

-			if (collapsable) {

-				toggle = new ToggleControl(section, SWT.NULL);

-				toggle.setSelection(collapsed);

-				toggle.setBackground(factory.getBackgroundColor());

-				toggle.setActiveDecorationColor(factory.getHyperlinkColor());

-				toggle.setDecorationColor(

-					factory.getColor(

-						FormWidgetFactory.COLOR_COMPOSITE_SEPARATOR));

-				toggle.setActiveCursor(factory.getHyperlinkCursor());

-				toggle.addFocusListener(factory.visibilityHandler);

-				toggle.addKeyListener(factory.keyboardHandler);

-				toggle.addSelectionListener(new SelectionAdapter() {

-					public void widgetSelected(SelectionEvent e) {

-						doToggle();

-					}

-				});

-				header.addMouseListener(new MouseAdapter() {

-					public void mouseDown(MouseEvent e) {

-						toggle.setSelection(!toggle.getSelection());

-						toggle.redraw();

-						doToggle();

-					}

-				});

-				header.addMouseTrackListener(new MouseTrackAdapter() {

-					public void mouseEnter(MouseEvent e) {

-						header.setCursor(factory.getHyperlinkCursor());

-					}

-					public void mouseExit(MouseEvent e) {

-						header.setCursor(null);

-					}

-				});

-			}

-		}

-

-		if (addSeparator) {

-			//separator = factory.createSeparator(section, SWT.HORIZONTAL);

-			separator = factory.createCompositeSeparator(section);

-		}

-

-		if (descriptionPainted && description != null) {

-			descriptionLabel =

-				factory.createLabel(section, description, SWT.WRAP);

-		}

-		client = createClient(section, factory);

-		section.setData(this);

-		control = section;

-		return section;

-	}

-

-	private void doToggle() {

-		boolean collapsed = toggle.getSelection();

-		reflow();

-		if (descriptionLabel != null)

-			descriptionLabel.setVisible(!collapsed);

-		if (client != null)

-			client.setVisible(!collapsed);

-	}

-

-	protected void reflow() {

-		control.setRedraw(false);

-		control.getParent().setRedraw(false);

-		control.layout(true);

-		control.getParent().layout(true);

-		control.setRedraw(true);

-		control.getParent().setRedraw(true);

-	}

-

-	protected Text createText(

-		Composite parent,

-		String label,

-		FormWidgetFactory factory) {

-		return createText(parent, label, factory, 1);

-	}

-	protected Text createText(

-		Composite parent,

-		String label,

-		FormWidgetFactory factory,

-		int span) {

-		factory.createLabel(parent, label);

-		Text text = factory.createText(parent, "");

-		int hfill =

-			span == 1

-				? GridData.FILL_HORIZONTAL

-				: GridData.HORIZONTAL_ALIGN_FILL;

-		GridData gd = new GridData(hfill | GridData.VERTICAL_ALIGN_CENTER);

-		gd.horizontalSpan = span;

-		text.setLayoutData(gd);

-		return text;

-	}

-	protected Text createText(

-		Composite parent,

-		String label,

-		FormWidgetFactory factory,

-		int span,

-		int style) {

-		Label l = factory.createLabel(parent, label);

-		if ((style & SWT.MULTI) != 0) {

-			GridData gd = new GridData(GridData.VERTICAL_ALIGN_BEGINNING);

-			l.setLayoutData(gd);

-		}

-		Text text = factory.createText(parent, "", style);

-		int hfill =

-			span == 1

-				? GridData.FILL_HORIZONTAL

-				: GridData.HORIZONTAL_ALIGN_FILL;

-		GridData gd = new GridData(hfill | GridData.VERTICAL_ALIGN_CENTER);

-		gd.horizontalSpan = span;

-		text.setLayoutData(gd);

-		return text;

-	}

-	protected Text createText(

-		Composite parent,

-		FormWidgetFactory factory,

-		int span) {

-		Text text = factory.createText(parent, "");

-		int hfill =

-			span == 1

-				? GridData.FILL_HORIZONTAL

-				: GridData.HORIZONTAL_ALIGN_FILL;

-		GridData gd = new GridData(hfill | GridData.VERTICAL_ALIGN_CENTER);

-		//gd.grabExcessHorizontalSpace = true;

-		gd.horizontalSpan = span;

-		text.setLayoutData(gd);

-		return text;

-	}

-	public void dispose() {

-		JFaceResources.getFontRegistry().removeListener(this);

-	}

-	public boolean doGlobalAction(String actionId) {

-		return false;

-	}

-	public void expandTo(Object object) {

-	}

-	public final void fireChangeNotification(

-		int changeType,

-		Object changeObject) {

-		if (sectionManager == null)

-			return;

-		sectionManager.dispatchNotification(this, changeType, changeObject);

-	}

-	public final void fireSelectionNotification(Object changeObject) {

-		fireChangeNotification(SELECTION, changeObject);

-	}

-	public java.lang.String getDescription() {

-		return description;

-	}

-	public java.lang.String getHeaderColorKey() {

-		return headerColorKey;

-	}

-	public java.lang.String getHeaderText() {

-		return headerText;

-	}

-	public int getHeightHint() {

-		return heightHint;

-	}

-	public int getWidthHint() {

-		return widthHint;

-	}

-	public void initialize(Object input) {

-	}

-	public boolean isAddSeparator() {

-		return addSeparator;

-	}

-	public boolean isDescriptionPainted() {

-		return descriptionPainted;

-	}

-	public boolean isDirty() {

-		return dirty;

-	}

-	public boolean isHeaderPainted() {

-		return headerPainted;

-	}

-	public boolean isReadOnly() {

-		return readOnly;

-	}

-	public void sectionChanged(

-		FormSection source,

-		int changeType,

-		Object changeObject) {

-	}

-	public void setAddSeparator(boolean newAddSeparator) {

-		addSeparator = newAddSeparator;

-	}

-

-	private String trimNewLines(String text) {

-		StringBuffer buff = new StringBuffer();

-		for (int i = 0; i < text.length(); i++) {

-			char c = text.charAt(i);

-			if (c == '\n')

-				buff.append(' ');

-			else

-				buff.append(c);

-		}

-		return buff.toString();

-	}

-

-	public void setDescription(java.lang.String newDescription) {

-		// we will trim the new lines so that we can

-		// use layout-based word wrapping instead

-		// of hard-coded one

-		description = trimNewLines(newDescription);

-		//description = newDescription;

-		if (descriptionLabel != null)

-			descriptionLabel.setText(newDescription);

-	}

-	public void setDescriptionPainted(boolean newDescriptionPainted) {

-		descriptionPainted = newDescriptionPainted;

-	}

-	public void setDirty(boolean newDirty) {

-		dirty = newDirty;

-	}

-	public void setFocus() {

-		if (toggle != null)

-			toggle.setFocus();

-	}

-	public void setHeaderColorKey(java.lang.String newHeaderColorKey) {

-		headerColorKey = newHeaderColorKey;

-	}

-	public void setHeaderPainted(boolean newHeaderPainted) {

-		headerPainted = newHeaderPainted;

-	}

-	public void setHeaderText(java.lang.String newHeaderText) {

-		headerText = newHeaderText;

-		if (header != null)

-			header.setText(headerText);

-	}

-	public void setHeightHint(int newHeightHint) {

-		heightHint = newHeightHint;

-	}

-	void setManager(SectionChangeManager manager) {

-		this.sectionManager = manager;

-	}

-	public void setReadOnly(boolean newReadOnly) {

-		readOnly = newReadOnly;

-	}

-

-	public void setWidthHint(int newWidthHint) {

-		widthHint = newWidthHint;

-	}

-

-	public void update() {

-	}

-

-	public void propertyChange(PropertyChangeEvent arg0) {

-		if (control != null && header != null) {

-			header.setFont(JFaceResources.getBannerFont());

-			control.layout(true);

-		}

-	}

-

-	/**

-	 * Gets the collapsable.

-	 * @return Returns a boolean

-	 */

-	public boolean getCollapsable() {

-		return collapsable;

-	}

-

-	/**

-	 * Sets the collapsable.

-	 * @param collapsable The collapsable to set

-	 */

-	public void setCollapsable(boolean collapsable) {

-		this.collapsable = collapsable;

-	}

-

-	public void setCollapsed(boolean collapsed) {

-		this.collapsed = collapsed;

-	}

-

-	public boolean canPaste(Clipboard clipboard) {

-		return false;

-	}

-}

diff --git a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/FormWidgetFactory.java b/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/FormWidgetFactory.java
deleted file mode 100644
index 913e012..0000000
--- a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/FormWidgetFactory.java
+++ /dev/null
@@ -1,426 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2000, 2003 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials 

- * are made available under the terms of the Common Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/cpl-v10.html

- * 

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-package org.eclipse.update.ui.forms.internal;

-

-import org.eclipse.swt.graphics.*;

-import java.util.*;

-import org.eclipse.swt.*;

-import org.eclipse.swt.widgets.*;

-import org.eclipse.jface.resource.*;

-import org.eclipse.swt.events.*;

-import org.eclipse.swt.custom.*;

-import org.eclipse.ui.IWorkbenchActionConstants;

-import org.eclipse.update.ui.forms.internal.engine.FormEngine;

-

-public class FormWidgetFactory {

-	public static final String KEY_DRAW_BORDER = "FormWidgetFactory.drawBorder";

-	public static final String TREE_BORDER = "treeBorder";

-	public static final String DEFAULT_HEADER_COLOR = "__default__header__";

-	public static final String COLOR_BORDER = "__border";

-	public static final String COLOR_COMPOSITE_SEPARATOR = "__compSep";

-

-	private Hashtable colorRegistry = new Hashtable();

-	private Color backgroundColor;

-	private KeyListener deleteListener;

-	private Color foregroundColor;

-	private Display display;

-	public static final int BORDER_STYLE = SWT.NONE; //SWT.BORDER;

-	private BorderPainter borderPainter;

-	private Color borderColor;

-	private HyperlinkHandler hyperlinkHandler;

-	/* default */ VisibilityHandler visibilityHandler;

-	/* default */ KeyboardHandler keyboardHandler;

-

-	class BorderPainter implements PaintListener {

-		public void paintControl(PaintEvent event) {

-			Composite composite = (Composite) event.widget;

-			Control[] children = composite.getChildren();

-			for (int i = 0; i < children.length; i++) {

-				Control c = children[i];

-				boolean inactiveBorder=false;

-				if (c.getEnabled() == false && !(c instanceof CCombo))

-					continue;

-				if (c instanceof SelectableFormLabel)

-					continue;

-				Object flag = c.getData(KEY_DRAW_BORDER);

-				if (flag!=null) {

-					if (flag.equals(Boolean.FALSE)) continue;

-					if (flag.equals(TREE_BORDER)) inactiveBorder=true;

-				}

-				 

-				if (!inactiveBorder && (c instanceof Text || c instanceof Canvas || c instanceof CCombo)) {

-					Rectangle b = c.getBounds();

-					GC gc = event.gc;

-					gc.setForeground(c.getBackground());

-					gc.drawRectangle(b.x - 1, b.y - 1, b.width + 1, b.height + 1);

-					gc.setForeground(foregroundColor);

-					if (c instanceof CCombo)

-						gc.drawRectangle(b.x - 1, b.y - 1, b.width + 1, b.height + 1);

-					else 

-						gc.drawRectangle(b.x - 1, b.y - 2, b.width + 1, b.height + 3);

-				} else if (inactiveBorder ||c instanceof Table || c instanceof Tree || c instanceof TableTree) {

-					Rectangle b = c.getBounds();

-					GC gc = event.gc;

-					gc.setForeground(borderColor);

-					//gc.drawRectangle(b.x - 2, b.y - 2, b.width + 3, b.height + 3);

-					gc.drawRectangle(b.x - 1, b.y - 1, b.width + 2, b.height + 2);

-				}

-			}

-		}

-	}

-

-	class VisibilityHandler extends FocusAdapter {

-		public void focusGained(FocusEvent e) {

-			Widget w = e.widget;

-			if (w instanceof Control) {

-				ensureVisible((Control) w);

-			}

-		}

-	}

-

-	class KeyboardHandler extends KeyAdapter {

-		public void keyPressed(KeyEvent e) {

-			Widget w = e.widget;

-			if (w instanceof Control) {

-				processKey(e.keyCode, (Control) w);

-			}

-		}

-	}

-

-	public FormWidgetFactory() {

-		this(Display.getCurrent());

-	}

-

-	public FormWidgetFactory(Display display) {

-		this.display = display;

-		initialize();

-	}

-

-	public static ScrolledComposite getScrolledComposite(Control c) {

-		Composite parent = c.getParent();

-

-		while (parent != null) {

-			if (parent instanceof ScrolledComposite) {

-				return (ScrolledComposite) parent;

-			}

-			parent = parent.getParent();

-		}

-		return null;

-	}

-

-	public static void ensureVisible(Control c) {

-		ScrolledComposite scomp = getScrolledComposite(c);

-		if (scomp != null) {

-			AbstractSectionForm.ensureVisible(scomp, c);

-		}

-	}

-

-	public static void processKey(int keyCode, Control c) {

-		ScrolledComposite scomp = getScrolledComposite(c);

-		if (scomp != null) {

-			switch (keyCode) {

-				case SWT.ARROW_DOWN :

-					AbstractSectionForm.scrollVertical(scomp, false);

-					break;

-				case SWT.ARROW_UP :

-					AbstractSectionForm.scrollVertical(scomp, true);

-					break;

-				case SWT.ARROW_LEFT :

-					AbstractSectionForm.scrollHorizontal(scomp, true);

-					break;

-				case SWT.ARROW_RIGHT :

-					AbstractSectionForm.scrollHorizontal(scomp, false);

-					break;

-				case SWT.PAGE_UP :

-					AbstractSectionForm.scrollPage(scomp, true);

-					break;

-				case SWT.PAGE_DOWN :

-					AbstractSectionForm.scrollPage(scomp, false);

-					break;

-			}

-		}

-	}

-

-	public Button createButton(Composite parent, String text, int style) {

-		int flatStyle = BORDER_STYLE == SWT.BORDER ? SWT.NULL : SWT.FLAT;

-		//int flatStyle = SWT.NULL;

-		Button button = new Button(parent, style | flatStyle);

-		button.setBackground(backgroundColor);

-		button.setForeground(foregroundColor);

-		if (text != null)

-			button.setText(text);

-		button.addFocusListener(visibilityHandler);

-		return button;

-	}

-	public Composite createComposite(Composite parent) {

-		return createComposite(parent, SWT.NULL);

-	}

-	public Composite createComposite(Composite parent, int style) {

-		Composite composite = new Composite(parent, style);

-		composite.setBackground(backgroundColor);

-		composite.addMouseListener(new MouseAdapter() {

-			public void mousePressed(MouseEvent e) {

-				((Control) e.widget).setFocus();

-			}

-		});

-		composite.setMenu(parent.getMenu());

-		return composite;

-	}

-	public Composite createCompositeSeparator(Composite parent) {

-		Composite composite = new Composite(parent, SWT.NONE);

-		composite.setBackground(getColor(COLOR_COMPOSITE_SEPARATOR));

-		return composite;

-	}

-

-	public Label createHeadingLabel(Composite parent, String text) {

-		return createHeadingLabel(parent, text, null, SWT.NONE);

-	}

-

-	public Label createHeadingLabel(Composite parent, String text, int style) {

-		return createHeadingLabel(parent, text, null, style);

-	}

-

-	public Label createHeadingLabel(Composite parent, String text, Color bg) {

-		return createHeadingLabel(parent, text, bg, SWT.NONE);

-	}

-

-	public Label createHeadingLabel(

-		Composite parent,

-		String text,

-		Color bg,

-		int style) {

-		Label label = new Label(parent, style);

-		if (text != null)

-			label.setText(text);

-		label.setBackground(backgroundColor);

-		label.setForeground(foregroundColor);

-		label.setFont(JFaceResources.getFontRegistry().get(JFaceResources.BANNER_FONT));

-		return label;

-	}

-

-	public Label createHyperlinkLabel(

-		Composite parent,

-		String text,

-		IHyperlinkListener listener) {

-		return createHyperlinkLabel(parent, text, listener, SWT.NULL);

-	}

-	public Label createHyperlinkLabel(

-		Composite parent,

-		String text,

-		IHyperlinkListener listener,

-		int style) {

-		Label label = createLabel(parent, text, style);

-		turnIntoHyperlink(label, listener);

-		return label;

-	}

-	public Label createLabel(Composite parent, String text) {

-		return createLabel(parent, text, SWT.NONE);

-	}

-	public Label createLabel(Composite parent, String text, int style) {

-		Label label = new Label(parent, style);

-		if (text != null)

-			label.setText(text);

-		label.setBackground(backgroundColor);

-		label.setForeground(foregroundColor);

-		return label;

-	}

-

-	public SelectableFormLabel createSelectableLabel(

-		Composite parent,

-		String text) {

-		return createSelectableLabel(parent, text, SWT.NONE);

-	}

-

-	public SelectableFormLabel createSelectableLabel(

-		Composite parent,

-		String text,

-		int style) {

-		SelectableFormLabel label = new SelectableFormLabel(parent, style);

-		if (text != null)

-			label.setText(text);

-		label.setBackground(backgroundColor);

-		label.setForeground(foregroundColor);

-		label.addFocusListener(visibilityHandler);

-		label.addKeyListener(keyboardHandler);

-		return label;

-	}

-

-	public FormEngine createFormEngine(Composite parent) {

-		return createFormEngine(parent, false);

-	}

-	

-	public FormEngine createFormEngine(Composite parent, boolean trackFocus) {

-		FormEngine engine = new FormEngine(parent, SWT.WRAP);

-		engine.setBackground(backgroundColor);

-		engine.setForeground(foregroundColor);

-		engine.marginWidth = 1;

-		engine.marginHeight = 0;

-		engine.setHyperlinkSettings(getHyperlinkHandler());

-		if (trackFocus) engine.addFocusListener(visibilityHandler);

-		engine.addKeyListener(keyboardHandler);

-		engine.setMenu(parent.getMenu());

-		return engine;

-	}

-

-	public Label createSeparator(Composite parent, int style) {

-		Label label = new Label(parent, SWT.SEPARATOR | style);

-		label.setBackground(backgroundColor);

-		label.setForeground(borderColor);

-		return label;

-	}

-	public Table createTable(Composite parent, int style) {

-		Table table = new Table(parent, BORDER_STYLE | style);

-		table.setBackground(backgroundColor);

-		table.setForeground(foregroundColor);

-		hookDeleteListener(table);

-		return table;

-	}

-	public Text createText(Composite parent, String value) {

-		return createText(parent, value, BORDER_STYLE | SWT.SINGLE);

-	}

-	public Text createText(Composite parent, String value, int style) {

-		Text text = new Text(parent, style);

-		if (value != null)

-			text.setText(value);

-		text.setBackground(backgroundColor);

-		text.setForeground(foregroundColor);

-		text.addFocusListener(visibilityHandler);

-		return text;

-	}

-	public Tree createTree(Composite parent, int style) {

-		Tree tree = new Tree(parent, BORDER_STYLE | style);

-		tree.setBackground(backgroundColor);

-		tree.setForeground(foregroundColor);

-		hookDeleteListener(tree);

-		return tree;

-	}

-	private void deleteKeyPressed(Widget widget) {

-		if (!(widget instanceof Control))

-			return;

-		Control control = (Control) widget;

-		for (Control parent = control.getParent();

-			parent != null;

-			parent = parent.getParent()) {

-			if (parent.getData() instanceof FormSection) {

-				FormSection section = (FormSection) parent.getData();

-				section.doGlobalAction(IWorkbenchActionConstants.DELETE);

-				break;

-			}

-		}

-	}

-	public void dispose() {

-		Enumeration colors = colorRegistry.elements();

-		while (colors.hasMoreElements()) {

-			Color c = (Color) colors.nextElement();

-			c.dispose();

-		}

-		hyperlinkHandler.dispose();

-		colorRegistry = null;

-	}

-	public Color getBackgroundColor() {

-		return backgroundColor;

-	}

-	public Color getBorderColor() {

-		return borderColor;

-	}

-	public Cursor getBusyCursor() {

-		return hyperlinkHandler.getBusyCursor();

-	}

-	public Color getColor(String key) {

-		return (Color) colorRegistry.get(key);

-	}

-	public Color getForegroundColor() {

-		return foregroundColor;

-	}

-	public HyperlinkHandler getHyperlinkHandler() {

-		return hyperlinkHandler;

-	}

-	public Cursor getHyperlinkCursor() {

-		return hyperlinkHandler.getHyperlinkCursor();

-	}

-	public Color getHyperlinkColor() {

-		return hyperlinkHandler.getForeground();

-	}

-	public Color getHyperlinkHoverColor() {

-		return hyperlinkHandler.getActiveForeground();

-	}

-	public int getHyperlinkUnderlineMode() {

-		return hyperlinkHandler.getHyperlinkUnderlineMode();

-	}

-	public void hookDeleteListener(Control control) {

-		if (deleteListener == null) {

-			deleteListener = new KeyAdapter() {

-				public void keyPressed(KeyEvent event) {

-					if (event.character == SWT.DEL && event.stateMask == 0) {

-						deleteKeyPressed(event.widget);

-					}

-				}

-			};

-		}

-		control.addKeyListener(deleteListener);

-	}

-	private void initialize() {

-		backgroundColor = display.getSystemColor(SWT.COLOR_LIST_BACKGROUND);

-		registerColor(COLOR_BORDER, 195, 191, 179);

-		registerColor(COLOR_COMPOSITE_SEPARATOR, 152, 170, 203);

-		registerColor(DEFAULT_HEADER_COLOR, 0x48, 0x70, 0x98);

-		if (isWhiteBackground())

-			borderColor = getColor(COLOR_BORDER);

-		else

-			borderColor = display.getSystemColor(SWT.COLOR_WIDGET_BACKGROUND);

-		foregroundColor = display.getSystemColor(SWT.COLOR_LIST_FOREGROUND);

-		hyperlinkHandler = new HyperlinkHandler();

-		hyperlinkHandler.setBackground(backgroundColor);

-		updateHyperlinkColors();

-		visibilityHandler = new VisibilityHandler();

-		keyboardHandler = new KeyboardHandler();

-	}

-	

-	public boolean isWhiteBackground() {

-		return backgroundColor.getRed()==255 && backgroundColor.getGreen()==255 &&

-			backgroundColor.getBlue()==255;

-	}

-

-	public void updateHyperlinkColors() {

-		Color hyperlinkColor = JFaceColors.getHyperlinkText(display);

-		Color activeHyperlinkColor = JFaceColors.getActiveHyperlinkText(display);

-		hyperlinkHandler.setForeground(hyperlinkColor);

-		hyperlinkHandler.setActiveForeground(activeHyperlinkColor);

-	}

-

-	public void paintBordersFor(Composite parent) {

-		if (BORDER_STYLE == SWT.BORDER)

-			return;

-		if (borderPainter == null)

-			borderPainter = new BorderPainter();

-		parent.addPaintListener(borderPainter);

-	}

-	public Color registerColor(String key, int r, int g, int b) {

-		Color c = new Color(display, r, g, b);

-		colorRegistry.put(key, c);

-		return c;

-	}

-	public void setBackgroundColor(Color color) {

-		backgroundColor = color;

-	}

-	public void setHyperlinkColor(Color color) {

-		hyperlinkHandler.setForeground(color);

-	}

-	public void setHyperlinkHoverColor(org.eclipse.swt.graphics.Color hoverColor) {

-		hyperlinkHandler.setActiveForeground(hoverColor);

-	}

-	public void setHyperlinkUnderlineMode(int newHyperlinkUnderlineMode) {

-		hyperlinkHandler.setHyperlinkUnderlineMode(newHyperlinkUnderlineMode);

-	}

-	public void turnIntoHyperlink(Control control, IHyperlinkListener listener) {

-		hyperlinkHandler.registerHyperlink(control, listener);

-	}

-}

diff --git a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/FormsPlugin.java b/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/FormsPlugin.java
deleted file mode 100644
index 13b3410..0000000
--- a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/FormsPlugin.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.update.ui.forms.internal;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.*;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.jface.dialogs.ErrorDialog;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.*;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-
-public class FormsPlugin extends AbstractUIPlugin {
-	private static FormsPlugin instance;
-	private ResourceBundle resourceBundle;
-
-	/**
-	 * Constructor for FormsPlugin.
-	 * @param descriptor
-	 */
-	public FormsPlugin(IPluginDescriptor descriptor) {
-		super(descriptor);
-		instance = this;
-		try {
-			resourceBundle =
-				ResourceBundle.getBundle(
-					"org.eclipse.update.ui.forms.internal.FormsPluginResources");
-		} catch (MissingResourceException x) {
-			resourceBundle = null;
-		}
-	}
-
-	/**
-	 * Returns the string from the plugin's resource bundle,
-	 * or 'key' if not found.
-	 */
-	public static String getResourceString(String key) {
-		ResourceBundle bundle = FormsPlugin.getDefault().getResourceBundle();
-		try {
-			return bundle.getString(key);
-		} catch (MissingResourceException e) {
-			return key;
-		}
-	}
-
-	public static String getFormattedMessage(String key, String[] args) {
-		String text = getResourceString(key);
-		return java.text.MessageFormat.format(text, args);
-	}
-
-	public static String getFormattedMessage(String key, String arg) {
-		String text = getResourceString(key);
-		return java.text.MessageFormat.format(text, new Object[] { arg });
-	}
-
-	/**
-	 * Returns the plugin's resource bundle,
-	 */
-	public ResourceBundle getResourceBundle() {
-		return resourceBundle;
-	}
-
-	public static FormsPlugin getDefault() {
-		return instance;
-	}
-
-	public static IWorkbenchPage getActivePage() {
-		return getDefault().internalGetActivePage();
-	}
-
-	private IWorkbenchPage internalGetActivePage() {
-		return getWorkbench().getActiveWorkbenchWindow().getActivePage();
-	}
-
-	public static Shell getActiveWorkbenchShell() {
-		return getActiveWorkbenchWindow().getShell();
-	}
-
-	public static IWorkbenchWindow getActiveWorkbenchWindow() {
-		return getDefault().getWorkbench().getActiveWorkbenchWindow();
-	}
-
-	public static String getPluginId() {
-		return getDefault().getDescriptor().getUniqueIdentifier();
-	}
-
-	public static void logException(Throwable e) {
-		logException(e, true);
-	}
-
-	public static void logException(Throwable e, boolean showErrorDialog) {
-		if (e instanceof InvocationTargetException) {
-			e = ((InvocationTargetException) e).getTargetException();
-		}
-
-		IStatus status = null;
-		if (e instanceof CoreException) {
-			status = ((CoreException) e).getStatus();
-		} else {
-			String message = e.getMessage();
-			if (message == null)
-				message = e.toString();
-			status =
-				new Status(
-					IStatus.ERROR,
-					getPluginId(),
-					IStatus.OK,
-					message,
-					e);
-		}
-		log(status, showErrorDialog);
-	}
-
-	public static void log(IStatus status, boolean showErrorDialog) {
-		if (showErrorDialog)
-			ErrorDialog.openError(
-				getActiveWorkbenchShell(),
-				null,
-				null,
-				status);
-		Platform.getPlugin("org.eclipse.core.runtime").getLog().log(status);
-	}
-}
\ No newline at end of file
diff --git a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/FormsPluginResources.properties b/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/FormsPluginResources.properties
deleted file mode 100644
index 6d45e06..0000000
--- a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/FormsPluginResources.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2003 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Common Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/cpl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-FormEgine.linkPopup.open = &Open
-FormEgine.linkPopup.copyShortcut = &Copy as Shortcut
\ No newline at end of file
diff --git a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/HTMLTableLayout.java b/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/HTMLTableLayout.java
deleted file mode 100644
index 652e686..0000000
--- a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/HTMLTableLayout.java
+++ /dev/null
@@ -1,651 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2000, 2003 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials 

- * are made available under the terms of the Common Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/cpl-v10.html

- * 

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-package org.eclipse.update.ui.forms.internal;

-import org.eclipse.swt.graphics.*;

-import org.eclipse.swt.widgets.*;

-import java.util.*;

-import org.eclipse.swt.SWT;

-

-/**

- * This implementation of the layout algorithm

- * attempts to position controls in the composite

- * using a two-pass autolayout HTML table altorithm

- * recommeded by HTML 4.01 W3C specification.

- * The main differences with GridLayout is that

- * it has two passes and that width and height

- * are not calculated in the same pass.

- * <p>

- * The advantage of the algorithm over GridLayout

- * is that it is capable of flowing text controls

- * capable of line wrap. These controls do not

- * have natural 'preferred size'. Instead, 

- * they are capable of providing the required

- * height if the width is set. Consequently,

- * this algorithm first calculates the widths

- * that will be assigned to columns, and then

- * passes those widths to the controls to

- * calculate the height. When a composite

- * with this layout is a child of the scrolling

- * composite, they should interact in such

- * a way that reduction in the scrolling composite

- * width results in the reflow and increase of

- * the overall height.

- * <p>

- * If none of the columns contain expandable

- * and wrappable controls, the end-result

- * will be similar to the one provided

- * by GridLayout. The difference will

- * show up for layouts that contain

- * controls whose minimum and maximum

- * widths are not the same.

- */

-

-public class HTMLTableLayout extends Layout implements ILayoutExtension {

-	public int numColumns = 1;

-	public int leftMargin = 5;

-	public int rightMargin = 5;

-	public int topMargin = 5;

-	public int bottomMargin = 5;

-	public int horizontalSpacing = 5;

-	public int verticalSpacing = 5;

-	public boolean makeColumnsEqualWidth = false;

-	

-	private boolean initialLayout=true;

-	private Vector grid = null;

-	private int [] minColumnWidths, maxColumnWidths;

-	private int widestColumnWidth;

-	private int [] growingColumns;

-	

-	public int getMinimumWidth(Composite parent, boolean changed) {

-		changed = true;

-		initializeIfNeeded(parent, changed);

-		if (initialLayout) {

-		   changed = true;

-		   initialLayout = false;

-		}

-		if (grid==null || changed) {

-		   changed = true;

-		   grid = new Vector();

-		   createGrid(parent);

-		}

-		if (minColumnWidths==null)

-		   minColumnWidths = new int [numColumns];

-		for (int i=0; i<numColumns; i++) {

-			minColumnWidths[i] = 0;

-		}

-		return internalGetMinimumWidth(parent, changed);

-	}

-	

-	public int getMaximumWidth(Composite parent, boolean changed) {

-		changed = true;

-		initializeIfNeeded(parent, changed);

-		if (initialLayout) {

-		   changed = true;

-		   initialLayout = false;

-		}

-		if (grid==null || changed) {

-		   changed = true;

-		   grid = new Vector();

-		   createGrid(parent);

-		}

-		if (maxColumnWidths==null)

-		   maxColumnWidths = new int[numColumns];

-		for (int i=0; i<numColumns; i++) {

-			maxColumnWidths[i] = 0;

-		}

-		return internalGetMaximumWidth(parent, changed);

-	}

-	

-	/**

-	 * @see Layout#layout(Composite, boolean)

-	 */

-	protected void layout(Composite parent, boolean changed) {

-		Rectangle clientArea = parent.getClientArea();

-		Control [] children = parent.getChildren();

-		if (children.length ==0) return;

-		int parentWidth = clientArea.width;

-		changed = true;

-		initializeIfNeeded(parent, changed);

-		if (initialLayout) {

-		   changed = true;

-		   initialLayout = false;

-		}

-		if (grid==null || changed) {

-		   changed = true;

-		   grid = new Vector();

-		   createGrid(parent);

-		}

-		resetColumnWidths();

-		int minWidth = internalGetMinimumWidth(parent, changed);

-		int maxWidth = internalGetMaximumWidth(parent, changed);

-		

-		int tableWidth = parentWidth;

-		

-		int [] columnWidths;

-		

-		if (parentWidth < minWidth) {

-		   tableWidth = minWidth;

-		   if (makeColumnsEqualWidth) {

-		      columnWidths = new int[numColumns];

-		      for (int i=0; i<numColumns; i++) {

-		      	columnWidths[i] = widestColumnWidth;

-		      }

-		   }

-		   else

-		      columnWidths = minColumnWidths;

-		}

-		else if (parentWidth > maxWidth) {

-			if (growingColumns.length==0) {

-		   		tableWidth = maxWidth;

-		   		columnWidths = maxColumnWidths;

-			}

-			else {

-				columnWidths = new int [numColumns];

-				int colSpace = tableWidth - leftMargin - rightMargin;

-				colSpace -= (numColumns-1)*horizontalSpacing;

-				int extra = parentWidth - maxWidth;

-				int colExtra = extra / growingColumns.length;

-				for (int i=0; i<numColumns; i++) {

-					columnWidths[i] = maxColumnWidths[i];

-				

-					if (isGrowingColumn(i)) {

-						columnWidths[i] += colExtra;

-					}

-				}

-			}

-		}

-		else {

-			columnWidths = new int [numColumns];

-			if (makeColumnsEqualWidth) {

-				int colSpace = tableWidth - leftMargin - rightMargin;

-				colSpace -= (numColumns-1)*horizontalSpacing;

-				int col = colSpace/numColumns;

-				for (int i=0; i<numColumns; i++) {

-					columnWidths[i] = col;

-				}

-			}

-			else {

-			   int [] extraSpace = calculateExtraSpace(tableWidth, maxWidth, minWidth);

-			   for (int i=0; i<numColumns; i++) {

-				  int minCWidth = minColumnWidths[i];

-		   		  columnWidths[i] = minCWidth + extraSpace[i];

-			   }

-			}

-		}

-		int x = 0;

-		int y = topMargin;

-		// assign widths 

-		for (int i=0; i<grid.size(); i++) {

-			TableData [] row = (TableData [])grid.elementAt(i);

-			// assign widths, calculate heights

-			int rowHeight = 0;

-			x = leftMargin;

-			for (int j=0; j<numColumns; j++) {

-				TableData td = row[j];

-				if (td.isItemData==false) {

-					continue;

-				}

-				Control child = children[td.childIndex];

-				int span = td.colspan;

-				int cwidth = 0;

-				for (int k=j; k<j+span; k++) {

-					cwidth += columnWidths[k];

-					if (k<j+span-1) cwidth += horizontalSpacing;

-				}

-				Point size = computeSize(child, cwidth, changed);

-				td.compWidth = cwidth;

-				if (td.heightHint!=SWT.DEFAULT) {

-					size = new Point(size.x, td.heightHint);

-				}

-				td.compSize = size;

-				rowHeight = Math.max(rowHeight, size.y);

-			}

-			for (int j=0; j<numColumns; j++) {

-				TableData td = row[j];

-				if (td.isItemData==false) {

-					continue;

-				}

-				Control child = children[td.childIndex];

-				placeControl(child, td, x, y, rowHeight);

-				x += td.compWidth;

-				if (j<numColumns-1) x+= horizontalSpacing;		

-			}

-			y += rowHeight + verticalSpacing;

-		}

-	}

-	

-boolean isGrowingColumn(int col) {

-	if (growingColumns==null) return false;

-	for (int i=0; i<growingColumns.length; i++) {

-		if (col == growingColumns[i]) return true;

-	}

-	return false;

-}	

-	

-int [] calculateExtraSpace(int tableWidth, int maxWidth, int minWidth) {

-	int fixedPart = leftMargin + rightMargin + (numColumns-1)*horizontalSpacing;

-	int D = maxWidth - minWidth;

-	

-	int W = tableWidth -fixedPart - minWidth;

-	

-	int extraSpace [] = new int [numColumns];

-

-	int rem = 0;

-	for (int i=0; i<numColumns; i++) { 

-		int cmin = minColumnWidths[i];

-		int cmax = maxColumnWidths[i];

-		int d = cmax - cmin;

-		int extra = D!=0 ? (d * W)/D : 0;

-		if (i<numColumns-1) {

-			extraSpace [i] = extra;

-			rem += extra;

-		}

-		else {

-			extraSpace[i] = W - rem;

-		}

-	}

-	return extraSpace;

-}

-	

-Point computeSize(Control child, int width, boolean changed) {

-	int widthArg = width;

-	if (!isWrap(child))

-	   widthArg = SWT.DEFAULT;

-	Point size = child.computeSize(widthArg, SWT.DEFAULT, changed);

-	return size;

-}

-

-void placeControl(Control control, TableData td, int x, int y, int rowHeight) {

-	int xloc = x + td.indent;

-	int yloc = y;

-	int width = td.compSize.x;

-	int height = td.compSize.y;

-	int colWidth = td.compWidth;

-	

-	// align horizontally

-	if (td.align==TableData.CENTER) {

-		xloc = x + colWidth/2 - width/2;

-	}

-	else if (td.align==TableData.RIGHT) {

-		xloc = x + colWidth - width;

-	}

-	else if (td.align==TableData.FILL) {

-		width = colWidth;

-	}

-	// align vertically

-	if (td.valign == TableData.MIDDLE) {

-		yloc = y + rowHeight/2 - height/2;

-	}

-	else if (td.valign==TableData.BOTTOM) {

-		yloc = y + rowHeight - height;

-	}

-	else if (td.valign==TableData.FILL) {

-		height = rowHeight;	

-	}

-	control.setBounds(xloc, yloc, width, height);

-}

-

-void createGrid(Composite composite) {

-	int row, column, rowFill, columnFill;

-	Control[] children;

-	TableData spacerSpec;

-	Vector growingCols = new Vector();

-

-	// 

-	children = composite.getChildren();

-	if (children.length==0) return;

-

-	// 

-	grid.addElement(createEmptyRow());

-	row = 0;

-	column = 0;

-

-	// Loop through the children and place their associated layout specs in the

-	// grid.  Placement occurs left to right, top to bottom (i.e., by row).

-	for (int i = 0; i < children.length; i++) {

-		// Find the first available spot in the grid.

-		Control child = children[i];

-		TableData spec = (TableData) child.getLayoutData();

-		while (((TableData[]) grid.elementAt(row))[column] != null) {

-			column = column + 1;

-			if (column >= numColumns) {

-				row = row + 1;

-				column = 0;

-				if (row >= grid.size()) {

-					grid.addElement(createEmptyRow());

-				}

-			}

-		}

-		// See if the place will support the widget's horizontal span.  If not, go to the

-		// next row.

-		if (column + spec.colspan - 1 >= numColumns) {

-			grid.addElement(createEmptyRow());

-			row = row + 1;

-			column = 0;

-		}

-

-		// The vertical span for the item will be at least 1.  If it is > 1,

-		// add other rows to the grid.

-		for (int j = 2; j <= spec.rowspan; j++) {

-			if (row + j > grid.size()) {

-				grid.addElement(createEmptyRow());

-			}

-		}

-

-		// Store the layout spec.  Also cache the childIndex.  NOTE: That we assume the children of a

-		// composite are maintained in the order in which they are created and added to the composite.

-		((TableData[]) grid.elementAt(row))[column] = spec;

-		spec.childIndex = i;

-		

-		if (spec.grabHorizontal) {

-			updateGrowingColumns(growingCols, spec, column);

-		}

-

-		// Put spacers in the grid to account for the item's vertical and horizontal

-		// span.

-		rowFill = spec.rowspan - 1;

-		columnFill = spec.colspan - 1;

-		for (int r = 1; r <= rowFill; r++) {

-			for (int c = 0; c < spec.colspan; c++) {

-				spacerSpec = new TableData();

-				spacerSpec.isItemData = false;

-				((TableData[]) grid.elementAt(row + r))[column + c] = spacerSpec;

-			}

-		}

-		for (int c = 1; c <= columnFill; c++) {

-			for (int r = 0; r < spec.rowspan; r++) {

-				spacerSpec = new TableData();

-				spacerSpec.isItemData = false;

-				((TableData[]) grid.elementAt(row + r))[column + c] = spacerSpec;

-			}

-		}

-		column = column + spec.colspan - 1;

-	}

-

-	// Fill out empty grid cells with spacers.

-	for (int k = column + 1; k < numColumns; k++) {

-		spacerSpec = new TableData();

-		spacerSpec.isItemData = false;

-		((TableData[]) grid.elementAt(row))[k] = spacerSpec;

-	}

-	for (int k = row + 1; k < grid.size(); k++) {

-		spacerSpec = new TableData();

-		spacerSpec.isItemData = false;

-		((TableData[]) grid.elementAt(k))[column] = spacerSpec;

-	}

-	growingColumns = new int [growingCols.size()];

-	for (int i=0; i<growingCols.size(); i++) {

-		growingColumns[i] = ((Integer)growingCols.get(i)).intValue();

-	}

-}

-

-private void updateGrowingColumns(Vector growingColumns, TableData spec, int column) {

-	int affectedColumn = column + spec.colspan -1;

-	for (int i=0; i<growingColumns.size(); i++) {

-		Integer col = (Integer)growingColumns.get(i);

-		if (col.intValue()==affectedColumn)

-		   return;

-	}

-	growingColumns.add(new Integer(affectedColumn));

-}

-

-private TableData [] createEmptyRow() {

-	TableData [] row = new TableData[numColumns];

-	for (int i=0; i<numColumns; i++) 

-	   row[i] = null;

-	return row;

-}

-

-	/**

-	 * @see Layout#computeSize(Composite, int, int, boolean)

-	 */

-	protected Point computeSize(Composite parent, int wHint, int hHint, boolean changed) {

-		Control [] children = parent.getChildren();

-		if (children.length == 0) {

-			return new Point(0, 0);

-		}

-		int parentWidth = wHint;

-		changed = true;

-		initializeIfNeeded(parent, changed);

-		if (initialLayout) {

-		   changed = true;

-		   initialLayout = false;

-		}

-		if (grid==null || changed) {

-		   changed = true;

-		   grid = new Vector();

-		   createGrid(parent);

-		}

-		resetColumnWidths();

-		int minWidth = internalGetMinimumWidth(parent, changed);

-		int maxWidth = internalGetMaximumWidth(parent, changed);

-		

-		int tableWidth = parentWidth;

-		

-		int [] columnWidths;

-		

-		if (parentWidth < minWidth) {

-		   tableWidth = minWidth;

-		   if (makeColumnsEqualWidth) {

-		      columnWidths = new int[numColumns];

-		      for (int i=0; i<numColumns; i++) {

-		      	columnWidths[i] = widestColumnWidth;

-		      }

-		   }

-		   else

-		      columnWidths = minColumnWidths;

-		}

-		else if (parentWidth > maxWidth) {

-		   tableWidth = maxWidth;

-		   columnWidths = maxColumnWidths;

-		}

-		else {

-			columnWidths = new int [numColumns];

-			if (makeColumnsEqualWidth) {

-				int colSpace = tableWidth - leftMargin - rightMargin;

-				colSpace -= (numColumns-1)*horizontalSpacing;

-				int col = colSpace/numColumns;

-				for (int i=0; i<numColumns; i++) {

-					columnWidths[i] = col;

-				}

-			}

-			else {

-			   int [] extraSpace = calculateExtraSpace(tableWidth, maxWidth, minWidth);

-			   for (int i=0; i<numColumns; i++) {

-				  int minCWidth = minColumnWidths[i];

-		   		  columnWidths[i] = minCWidth + extraSpace[i];

-			   }

-			}

-		}

-		int totalHeight=0;

-		int y = topMargin;

-		// compute widths 

-		for (int i=0; i<grid.size(); i++) {

-			TableData [] row = (TableData [])grid.elementAt(i);

-			// assign widths, calculate heights

-			int rowHeight = 0;

-			for (int j=0; j<numColumns; j++) {

-				TableData td = row[j];

-				if (td.isItemData==false) {

-					continue;

-				}

-				Control child = children[td.childIndex];

-				int span = td.colspan;

-				int cwidth = 0;

-				for (int k=j; k<j+span; k++) {

-					if (k>j) cwidth += horizontalSpacing;

-					cwidth += columnWidths[k];

-				}

-				int cy = td.heightHint;

-				if (cy == SWT.DEFAULT) {

-				   Point size = computeSize(child, cwidth, changed);

-				   cy = size.y;

-				}

-				rowHeight = Math.max(rowHeight, cy);

-			}

-			y += rowHeight + verticalSpacing;

-		}

-		totalHeight = y + bottomMargin;

-		return new Point(tableWidth, totalHeight);

-	}

-

-	int internalGetMinimumWidth(Composite parent, boolean changed) {

-		if (changed)

-		   calculateMinimumColumnWidths(parent, true);

-		int minimumWidth = 0;

-		

-		widestColumnWidth = 0;

-		

-		if (makeColumnsEqualWidth) {

-			for (int i=0; i<numColumns; i++) {

-				widestColumnWidth = Math.max(widestColumnWidth, minColumnWidths[i]);

-			}

-		}

-		for (int i=0; i<numColumns; i++) {

-			if (i>0) minimumWidth += horizontalSpacing;

-			if (makeColumnsEqualWidth)

-			   minimumWidth += widestColumnWidth;

-			else

-			   minimumWidth += minColumnWidths[i];

-		}

-		// add margins

-		minimumWidth += leftMargin + rightMargin;

-		return minimumWidth;

-	}

-	

-	int internalGetMaximumWidth(Composite parent, boolean changed) {

-		if (changed)

-		   calculateMaximumColumnWidths(parent, true);

-		int maximumWidth = 0;

-		for (int i=0; i<numColumns; i++) {

-			if (i>0) maximumWidth += horizontalSpacing;

-			maximumWidth += maxColumnWidths[i];

-		}

-		// add margins

-		maximumWidth += leftMargin + rightMargin;

-		return maximumWidth;

-	}

-	

-	void resetColumnWidths() {

-		if (minColumnWidths == null)

-		   minColumnWidths = new int [numColumns];

-		if (maxColumnWidths == null)

-		   maxColumnWidths = new int [numColumns];

-		for (int i=0; i<numColumns; i++) {

-			minColumnWidths [i] = 0;

-		}

-		for (int i=0; i<numColumns; i++) {

-			maxColumnWidths [i] = 0;

-		}

-	}

-

-	void calculateMinimumColumnWidths(Composite parent, boolean changed) {

-		Control [] children = parent.getChildren();

-		

-		for (int i=0; i<grid.size(); i++) {

-			TableData [] row = (TableData [])grid.elementAt(i);

-			for (int j=0; j<numColumns; j++) {

-				TableData td = row[j];

-				if (td.isItemData==false) continue;

-				Control child = children[td.childIndex];

-				int minWidth = -1;

-				if (child instanceof Composite) {

-					Composite cc = (Composite)child;

-					Layout l = cc.getLayout();

-					if (l instanceof ILayoutExtension) {

-						minWidth = ((ILayoutExtension)l).getMinimumWidth(cc, changed);

-					}

-				}

-				if (minWidth == -1) {

-					if (isWrap(child)) {

-						// Should be the width of the

-						// longest word, we'll pick

-						// some small number instead

-						minWidth = 30;

-					}

-					else {

-					   Point size = child.computeSize(SWT.DEFAULT, SWT.DEFAULT, changed);

-					   minWidth = size.x;

-					}

-				}

-				minWidth += td.indent;

-				minColumnWidths[j] = Math.max(minColumnWidths[j], minWidth);

-			}

-		}

-	}

-	

-	boolean isWrap(Control control) {

-		if (control instanceof Composite &&

-		   ((Composite)control).getLayout() instanceof ILayoutExtension)

-		   return true;

-		return (control.getStyle() & SWT.WRAP)!=0;

-	}

-	

-	void calculateMaximumColumnWidths(Composite parent, boolean changed) {

-		Control [] children = parent.getChildren();

-		

-		for (int i=0; i<numColumns; i++) {

-			maxColumnWidths [i] = 0;

-		}

-		for (int i=0; i<grid.size(); i++) {

-			TableData [] row = (TableData [])grid.elementAt(i);

-			for (int j=0; j<numColumns; j++) {

-				TableData td = row[j];

-				if (td.isItemData==false) continue;

-				Control child = children[td.childIndex];

-				int maxWidth = -1;

-				if (child instanceof Composite) {

-					Composite cc = (Composite)child;

-					Layout l = cc.getLayout();

-					if (l instanceof ILayoutExtension) {

-						maxWidth = ((ILayoutExtension)l).getMaximumWidth(cc, changed);

-					}

-				}

-				if (maxWidth == -1) {

-					Point size = child.computeSize(SWT.DEFAULT, SWT.DEFAULT, changed);

-					maxWidth = size.x;

-				}

-				maxWidth += td.indent;

-				if (td.colspan==1)

-				   maxColumnWidths[j] = Math.max(maxColumnWidths[j], maxWidth);

-				else {

-					// grow the last column

-					int last = j + td.colspan -1;

-					int rem = 0;

-					for (int k=j; k<j+td.colspan-1; k++) {

-						rem += maxColumnWidths[k];

-					}

-					int reduced = maxWidth - rem;

-					maxColumnWidths[last] = Math.max(maxColumnWidths[last], reduced);

-				}

-			}

-		}

-	}

-	

-private void initializeIfNeeded(Composite parent, boolean changed) {

-	if (changed)

-	   	initialLayout = true;

-	if (initialLayout) {

-		initializeLayoutData(parent);

-		initialLayout = false;

-	}

-}

-	

-void initializeLayoutData(Composite composite) {

-	Control[] children = composite.getChildren();

-	for (int i = 0; i < children.length; i++) {

-		Control child = children[i];

-		if (child.getLayoutData() == null) {

-			child.setLayoutData(new TableData());

-		}

-	}

-}

-}

diff --git a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/HyperlinkAdapter.java b/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/HyperlinkAdapter.java
deleted file mode 100644
index 8180a2d..0000000
--- a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/HyperlinkAdapter.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2000, 2003 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials 

- * are made available under the terms of the Common Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/cpl-v10.html

- * 

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-package org.eclipse.update.ui.forms.internal;

-

-public class HyperlinkAdapter implements IHyperlinkListener {

-

-public HyperlinkAdapter() {

-	super();

-}

-public void linkActivated(org.eclipse.swt.widgets.Control linkLabel) {}

-public void linkEntered(org.eclipse.swt.widgets.Control linkLabel) {}

-public void linkExited(org.eclipse.swt.widgets.Control linkLabel) {}

-}

diff --git a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/HyperlinkHandler.java b/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/HyperlinkHandler.java
deleted file mode 100644
index 031aef6..0000000
--- a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/HyperlinkHandler.java
+++ /dev/null
@@ -1,224 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2000, 2003 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials 

- * are made available under the terms of the Common Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/cpl-v10.html

- * 

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-package org.eclipse.update.ui.forms.internal;

-

-import java.util.Enumeration;

-import java.util.Hashtable;

-

-import org.eclipse.swt.events.MouseEvent;

-import org.eclipse.swt.events.MouseListener;

-import org.eclipse.swt.events.MouseTrackListener;

-import org.eclipse.swt.events.PaintEvent;

-import org.eclipse.swt.events.PaintListener;

-import org.eclipse.swt.events.SelectionEvent;

-import org.eclipse.swt.events.SelectionListener;

-import org.eclipse.swt.graphics.Color;

-import org.eclipse.swt.graphics.GC;

-import org.eclipse.swt.graphics.Point;

-import org.eclipse.swt.graphics.Rectangle;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Control;

-import org.eclipse.swt.widgets.Label;

-

-public class HyperlinkHandler

-	extends HyperlinkSettings

-	implements MouseListener, MouseTrackListener, SelectionListener, PaintListener {

-	private Hashtable hyperlinkListeners;

-	private Control lastActivated;

-	private Control lastEntered;

-

-	public HyperlinkHandler() {

-		hyperlinkListeners = new Hashtable();

-	}

-

-	public Control getLastLink() {

-		return lastActivated;

-	}

-

-	public void mouseDoubleClick(MouseEvent e) {

-	}

-

-	public void mouseDown(MouseEvent e) {

-		if (e.button == 1)

-			return;

-		lastActivated = (Control) e.widget;

-	}

-	public void mouseEnter(MouseEvent e) {

-		Control control = (Control) e.widget;

-		linkEntered(control);

-	}

-	public void mouseExit(MouseEvent e) {

-		Control control = (Control) e.widget;

-		linkExited(control);

-	}

-	public void mouseHover(MouseEvent e) {

-	}

-

-	public void mouseUp(MouseEvent e) {

-		if (e.button != 1)

-			return;

-		Control linkControl = (Control) e.widget;

-		Point size = linkControl.getSize();

-		// Filter out mouse up events outside

-		// the link. This can happen when mouse is

-		// clicked, dragged outside the link, then

-		// released.

-		if (e.x < 0)

-			return;

-		if (e.y < 0)

-			return;

-		if (e.x >= size.x)

-			return;

-		if (e.y >= size.y)

-			return;

-		linkActivated(linkControl);

-	}

-

-	public void widgetDefaultSelected(SelectionEvent e) {

-		Control link = (Control) e.widget;

-		linkActivated(link);

-	}

-

-	public void widgetSelected(SelectionEvent e) {

-		Control link = (Control) e.widget;

-		SelectableFormLabel l = (SelectableFormLabel) link;

-		if (l.getSelection())

-			linkEntered(link);

-		else

-			linkExited(link);

-	}

-

-	private void linkActivated(Control link) {

-		IHyperlinkListener action =

-			(IHyperlinkListener) hyperlinkListeners.get(link);

-		if (action != null) {

-			link.setCursor(getBusyCursor());

-			action.linkActivated(link);

-			if (!link.isDisposed())

-				link.setCursor(

-					isHyperlinkCursorUsed() ? getHyperlinkCursor() : null);

-		}

-	}

-

-	private void linkEntered(Control link) {

-		if (lastEntered != null

-			&& lastEntered instanceof SelectableFormLabel) {

-			SelectableFormLabel fl = (SelectableFormLabel) lastEntered;

-			linkExited(fl);

-		}

-		if (isHyperlinkCursorUsed())

-			link.setCursor(getHyperlinkCursor());

-		if (activeBackground != null)

-			link.setBackground(activeBackground);

-		if (activeForeground != null)

-			link.setForeground(activeForeground);

-		if (hyperlinkUnderlineMode == UNDERLINE_ROLLOVER)

-			underline(link, true);

-

-		IHyperlinkListener action =

-			(IHyperlinkListener) hyperlinkListeners.get(link);

-		if (action != null)

-			action.linkEntered(link);

-		lastEntered = link;

-	}

-

-	private void linkExited(Control link) {

-		if (isHyperlinkCursorUsed())

-			link.setCursor(null);

-		if (hyperlinkUnderlineMode == UNDERLINE_ROLLOVER)

-			underline(link, false);

-		if (background != null)

-			link.setBackground(background);

-		if (foreground != null)

-			link.setForeground(foreground);

-		IHyperlinkListener action =

-			(IHyperlinkListener) hyperlinkListeners.get(link);

-		if (action != null)

-			action.linkExited(link);

-		if (lastEntered == link)

-			lastEntered = null;

-	}

-

-	public void paintControl(PaintEvent e) {

-		Control label = (Control) e.widget;

-		if (hyperlinkUnderlineMode == UNDERLINE_ALWAYS)

-			HyperlinkHandler.underline(label, true);

-	}

-

-	public void registerHyperlink(

-		Control control,

-		IHyperlinkListener listener) {

-		if (background != null)

-			control.setBackground(background);

-		if (foreground != null)

-			control.setForeground(foreground);

-		control.addMouseListener(this);

-		control.addMouseTrackListener(this);

-

-		if (hyperlinkUnderlineMode == UNDERLINE_ALWAYS

-			&& control instanceof Label)

-			control.addPaintListener(this);

-		if (control instanceof SelectableFormLabel) {

-			SelectableFormLabel sl = (SelectableFormLabel) control;

-			sl.addSelectionListener(this);

-			if (hyperlinkUnderlineMode == UNDERLINE_ALWAYS)

-				sl.setUnderlined(true);

-		}

-		hyperlinkListeners.put(control, listener);

-		removeDisposedLinks();

-	}

-

-	private void removeDisposedLinks() {

-		for (Enumeration keys = hyperlinkListeners.keys();

-			keys.hasMoreElements();

-			) {

-			Control control = (Control) keys.nextElement();

-			if (control.isDisposed()) {

-				hyperlinkListeners.remove(control);

-			}

-		}

-	}

-

-	public void reset() {

-		hyperlinkListeners.clear();

-	}

-

-	public static void underline(Control control, boolean inside) {

-		if (control instanceof SelectableFormLabel) {

-			SelectableFormLabel l = (SelectableFormLabel) control;

-			l.setUnderlined(inside);

-			l.redraw();

-			return;

-		}

-		if (!(control instanceof Label))

-			return;

-		Composite parent = control.getParent();

-		Rectangle bounds = control.getBounds();

-		GC gc = new GC(parent);

-		Color color =

-			inside ? control.getForeground() : control.getBackground();

-		gc.setForeground(color);

-		int y = bounds.y + bounds.height;

-		gc.drawLine(bounds.x, y, bounds.x + bounds.width, y);

-		gc.dispose();

-	}

-

-	public void setForeground(Color color) {

-		super.setForeground(color);

-		removeDisposedLinks();

-		for (Enumeration links = hyperlinkListeners.keys();

-			links.hasMoreElements();

-			) {

-			Control control = (Control) links.nextElement();

-			control.setForeground(color);

-		}

-	}

-}

diff --git a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/HyperlinkSettings.java b/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/HyperlinkSettings.java
deleted file mode 100644
index 3a1c6a0..0000000
--- a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/HyperlinkSettings.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2000, 2003 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials 

- * are made available under the terms of the Common Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/cpl-v10.html

- * 

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-package org.eclipse.update.ui.forms.internal;

-

-import org.eclipse.swt.widgets.*;

-import org.eclipse.swt.graphics.*;

-import org.eclipse.swt.*;

-

-public class HyperlinkSettings {

-	public static final int UNDERLINE_NEVER = 1;

-	public static final int UNDERLINE_ROLLOVER = 2;

-	public static final int UNDERLINE_ALWAYS = 3;

-

-	protected boolean hyperlinkCursorUsed = true;

-	protected int hyperlinkUnderlineMode = UNDERLINE_ALWAYS;

-	protected Color background;

-	protected Color foreground;

-	protected Color activeBackground;

-	protected Color activeForeground;

-	protected static Cursors cursors = new Cursors();

-

-	static class Cursors {

-		Cursor hyperlinkCursor;

-		Cursor busyCursor;

-		Cursor textCursor;

-		int counter = 0;

-

-		public void allocate() {

-			if (counter == 0) {

-				hyperlinkCursor =

-					new Cursor(Display.getCurrent(), SWT.CURSOR_HAND);

-				busyCursor = new Cursor(Display.getCurrent(), SWT.CURSOR_WAIT);

-				textCursor = new Cursor(Display.getCurrent(), SWT.CURSOR_IBEAM);

-			}

-			counter++;

-		}

-		public void dispose() {

-			counter--;

-			if (counter == 0) {

-				hyperlinkCursor.dispose();

-				busyCursor.dispose();

-				textCursor.dispose();

-				hyperlinkCursor = null;

-				busyCursor = null;

-				textCursor = null;

-			}

-		}

-	}

-

-	public HyperlinkSettings() {

-		cursors.allocate();

-	}

-

-	public void dispose() {

-		if (cursors != null)

-			cursors.dispose();

-	}

-

-	public Color getActiveBackground() {

-		return activeBackground;

-	}

-	public Color getActiveForeground() {

-		return activeForeground;

-	}

-	public Color getBackground() {

-		return background;

-	}

-	public Cursor getBusyCursor() {

-		return cursors.busyCursor;

-	}

-	public Cursor getTextCursor() {

-		return cursors.textCursor;

-	}

-	public Color getForeground() {

-		return foreground;

-	}

-	public Cursor getHyperlinkCursor() {

-		return cursors.hyperlinkCursor;

-	}

-	public int getHyperlinkUnderlineMode() {

-		return hyperlinkUnderlineMode;

-	}

-

-	public boolean isHyperlinkCursorUsed() {

-		return hyperlinkCursorUsed;

-	}

-

-	public void setActiveBackground(Color newActiveBackground) {

-		activeBackground = newActiveBackground;

-	}

-	public void setActiveForeground(Color newActiveForeground) {

-		activeForeground = newActiveForeground;

-	}

-	public void setBackground(Color newBackground) {

-		background = newBackground;

-	}

-	public void setForeground(Color newForeground) {

-		foreground = newForeground;

-	}

-	public void setHyperlinkCursorUsed(boolean newHyperlinkCursorUsed) {

-		hyperlinkCursorUsed = newHyperlinkCursorUsed;

-	}

-	public void setHyperlinkUnderlineMode(int newHyperlinkUnderlineMode) {

-		hyperlinkUnderlineMode = newHyperlinkUnderlineMode;

-	}

-

-}

diff --git a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/IForm.java b/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/IForm.java
deleted file mode 100644
index 1661485..0000000
--- a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/IForm.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2000, 2003 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials 

- * are made available under the terms of the Common Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/cpl-v10.html

- * 

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-package org.eclipse.update.ui.forms.internal;

-import org.eclipse.swt.widgets.*;

-import org.eclipse.swt.graphics.*;

-

-public interface IForm {

-public void commitChanges(boolean onSave);

-public Control createControl(Composite parent);

-public void dispose();

-public boolean doGlobalAction(String actionId);

-public void expandTo(Object object);

-public Control getControl();

-public FormWidgetFactory getFactory();

-public Color getHeadingBackground();

-public Color getHeadingForeground();

-public Image getHeadingImage();

-public String getHeadingText();

-public void initialize(Object model);

-public boolean isHeadingVisible();

-public void registerSection(FormSection section);

-public void setFocus();

-public void setHeadingBackground(Color newHeadingBackground);

-public void setHeadingForeground(Color newHeadingForeground);

-public void setHeadingImage(Image headingImage);

-public void setHeadingVisible(boolean newHeadingVisible);

-public void setHeadingText(String heading);

-public void update();

-}

diff --git a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/IFormPage.java b/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/IFormPage.java
deleted file mode 100644
index 8839598..0000000
--- a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/IFormPage.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2000, 2003 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials 

- * are made available under the terms of the Common Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/cpl-v10.html

- * 

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-package org.eclipse.update.ui.forms.internal;

-

-import org.eclipse.swt.widgets.*;

-

-public interface IFormPage {

-

-boolean becomesInvisible(IFormPage newPage);

-void becomesVisible(IFormPage previousPage);

-void createControl(Composite parent);

-Control getControl();

-String getLabel();

-String getTitle();

-boolean isSource();

-boolean isVisible();

-}

diff --git a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/IFormSelectionListener.java b/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/IFormSelectionListener.java
deleted file mode 100644
index a334d41..0000000
--- a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/IFormSelectionListener.java
+++ /dev/null
@@ -1,15 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2000, 2003 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials 

- * are made available under the terms of the Common Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/cpl-v10.html

- * 

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-package org.eclipse.update.ui.forms.internal;

-

-public interface IFormSelectionListener {

-	public void formSelected(IFormPage page, boolean setFocus);

-}

diff --git a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/IFormTextListener.java b/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/IFormTextListener.java
deleted file mode 100644
index 237f714..0000000
--- a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/IFormTextListener.java
+++ /dev/null
@@ -1,16 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2000, 2003 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials 

- * are made available under the terms of the Common Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/cpl-v10.html

- * 

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-package org.eclipse.update.ui.forms.internal;

-

-public interface IFormTextListener {

-	public void textValueChanged(FormEntry text);

-	public void textDirty(FormEntry text);

-}

diff --git a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/IFormWorkbook.java b/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/IFormWorkbook.java
deleted file mode 100644
index 9fe78ab..0000000
--- a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/IFormWorkbook.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2000, 2003 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials 

- * are made available under the terms of the Common Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/cpl-v10.html

- * 

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-package org.eclipse.update.ui.forms.internal;

-

-import org.eclipse.swt.widgets.*;

-

-public interface IFormWorkbook {

-

-	void addFormSelectionListener(IFormSelectionListener listener);

-	public void addPage(IFormPage page);

-	public void createControl(Composite parent);

-	Control getControl();

-	public IFormPage getCurrentPage();

-	boolean isFirstPageSelected();

-	void removeFormSelectionListener(IFormSelectionListener listener);

-	public void removePage(IFormPage page);

-	public void selectPage(final IFormPage page, boolean setFocus);

-	void setFirstPageSelected(boolean selected);

-}

diff --git a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/IHyperlinkListener.java b/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/IHyperlinkListener.java
deleted file mode 100644
index d69af34..0000000
--- a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/IHyperlinkListener.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2000, 2003 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials 

- * are made available under the terms of the Common Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/cpl-v10.html

- * 

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-package org.eclipse.update.ui.forms.internal;

-

-import org.eclipse.swt.widgets.*;

-

-public interface IHyperlinkListener {

-

-public void linkActivated(Control linkLabel);

-public void linkEntered(Control linkLabel);

-public void linkExited(Control linkLabel);

-}

diff --git a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/ILayoutExtension.java b/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/ILayoutExtension.java
deleted file mode 100644
index c6d947b..0000000
--- a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/ILayoutExtension.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.update.ui.forms.internal;
-
-import org.eclipse.swt.widgets.Composite;
-
-/**
- * Classes that extend abstract class Layout and implement
- * this interface can take part in layout computation of
- * the HTMLTableLayout manager. The said layout uses
- * alternative algorithm that computes columns before rows.
- * It allows it to 'flow' wrapped text proportionally
- * (as in the popular web browsers). Custom layout managers
- * that implement this interface allow recursive reflow
- * to be performed.
- */
-public interface ILayoutExtension {
-	public int getMinimumWidth(Composite parent, boolean changed);
-	public int getMaximumWidth(Composite parent, boolean changed); 
-}
diff --git a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/NoTabsWorkbook.java b/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/NoTabsWorkbook.java
deleted file mode 100644
index a8a59a8..0000000
--- a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/NoTabsWorkbook.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2000, 2003 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials 

- * are made available under the terms of the Common Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/cpl-v10.html

- * 

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-package org.eclipse.update.ui.forms.internal;

-

-import java.util.*;

-import org.eclipse.swt.widgets.*;

-import org.eclipse.swt.*;

-import org.eclipse.ui.part.*;

-import org.eclipse.swt.custom.*;

-

-public class NoTabsWorkbook implements IFormWorkbook {

-	private Vector pages;

-	private boolean firstPageSelected = true;

-	private PageBook pageBook;

-	private Vector listeners = new Vector();

-	private IFormPage currentPage;

-

-	public NoTabsWorkbook() {

-		pages = new Vector();

-	}

-	public void addFormSelectionListener(IFormSelectionListener listener) {

-		listeners.addElement(listener);

-	}

-	public void addPage(IFormPage page) {

-		pages.add(page);

-

-		if (firstPageSelected && currentPage == null)

-			selectPage(page, true);

-	}

-

-	public void createControl(Composite parent) {

-		pageBook = new PageBook(parent, SWT.NULL);

-	}

-

-	private void fireSelectionChanged(IFormPage page, boolean setFocus) {

-		for (Iterator iter = listeners.iterator(); iter.hasNext();) {

-			IFormSelectionListener listener = (IFormSelectionListener) iter.next();

-			listener.formSelected(page, setFocus);

-		}

-	}

-

-	public Control getControl() {

-		return pageBook;

-	}

-

-	public IFormPage getCurrentPage() {

-		return currentPage;

-	}

-

-	public boolean isFirstPageSelected() {

-		return firstPageSelected;

-	}

-	public void removeFormSelectionListener(IFormSelectionListener listener) {

-		listeners.removeElement(listener);

-	}

-

-	public void removePage(IFormPage page) {

-		if (pages.contains(page)) {

-			Control c = page.getControl();

-			if (c!=null && !c.isDisposed())

-				c.dispose();

-			pages.remove(page);

-		}

-	}

-

-	public void selectPage(final IFormPage page, final boolean setFocus) {

-		final IFormPage oldPage = currentPage;

-		currentPage = page;

-

-		if (pageBook != null) {

-

-			// It may take a while

-			BusyIndicator.showWhile(pageBook.getDisplay(), new Runnable() {

-				public void run() {

-					switchPages(oldPage, page, setFocus);

-				}

-			});

-		}

-	}

-

-	public void setFirstPageSelected(boolean newFirstPageSelected) {

-		firstPageSelected = newFirstPageSelected;

-	}

-

-	private void switchPages(IFormPage oldPage, IFormPage newPage, boolean setFocus) {

-		if (oldPage != null && oldPage != newPage) {

-			oldPage.becomesInvisible(newPage);

-		}

-		if (newPage.getControl() == null)

-			newPage.createControl(pageBook);

-		pageBook.showPage(newPage.getControl());

-

-		newPage.becomesVisible(oldPage);

-		fireSelectionChanged(newPage, setFocus);

-	}

-}

diff --git a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/ScrollableSectionForm.java b/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/ScrollableSectionForm.java
deleted file mode 100644
index 8abd1ff..0000000
--- a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/ScrollableSectionForm.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2000, 2003 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials 

- * are made available under the terms of the Common Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/cpl-v10.html

- * 

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-package org.eclipse.update.ui.forms.internal;

-

-import org.eclipse.swt.graphics.*;

-import org.eclipse.swt.custom.*;

-import org.eclipse.swt.layout.*;

-import org.eclipse.swt.widgets.*;

-import org.eclipse.swt.*;

-

-/**

- * This version of the section form adds scrolling

- * capability. However, scrolling can be disabled

- * using 'setScrollable' method. For this reason,

- * this class can be used instead of the SectionForm.

- */

-

-public class ScrollableSectionForm extends SectionForm {

-	private Composite container;

-	private boolean verticalFit;

-	private boolean scrollable = true;

-

-	public ScrollableSectionForm() {

-	}

-	public Control createControl(Composite parent) {

-		container = createParent(parent);

-		Control formControl = super.createControl(container);

-		if (container instanceof ScrolledComposite) {

-			ScrolledComposite sc = (ScrolledComposite) container;

-			sc.setContent(formControl);

-		}

-		GridData gd = new GridData(GridData.FILL_BOTH);

-		formControl.setLayoutData(gd);

-		container.setBackground(formControl.getBackground());

-		return container;

-	}

-	protected Composite createParent(Composite parent) {

-		Composite result = null;

-		if (isScrollable()) {

-			ScrolledComposite scomp =

-				new ScrolledComposite(parent, SWT.V_SCROLL | SWT.H_SCROLL);

-			if (isVerticalFit()) {

-				scomp.setExpandHorizontal(true);

-				scomp.setExpandVertical(true);

-			}

-			initializeScrollBars(scomp);

-			result = scomp;

-		} else {

-			result = new Composite(parent, SWT.NONE);

-			GridLayout layout = new GridLayout();

-			layout.marginHeight = 0;

-			layout.marginWidth = 0;

-			result.setLayout(layout);

-		}

-		result.setMenu(parent.getMenu());

-		return result;

-	}

-	public boolean isScrollable() {

-		return scrollable;

-	}

-	public boolean isVerticalFit() {

-		return verticalFit;

-	}

-	public void setScrollable(boolean newScrollable) {

-		scrollable = newScrollable;

-	}

-

-	public void setVerticalFit(boolean newVerticalFit) {

-		verticalFit = newVerticalFit;

-	}

-

-	private void initializeScrollBars(ScrolledComposite scomp) {

-		ScrollBar hbar = scomp.getHorizontalBar();

-		if (hbar != null) {

-			hbar.setIncrement(H_SCROLL_INCREMENT);

-		}

-		ScrollBar vbar = scomp.getVerticalBar();

-		if (vbar != null) {

-			vbar.setIncrement(V_SCROLL_INCREMENT);

-		}

-		updatePageIncrement(scomp);

-	}

-

-	public void update() {

-		super.update();

-		if (container instanceof ScrolledComposite) {

-			updateScrolledComposite();

-		} else {

-			container.layout(true);

-		}

-	}

-	public void updateScrollBars() {

-		if (container instanceof ScrolledComposite) {

-			updateScrolledComposite();

-		}

-	}

-	public void updateScrolledComposite() {

-		ScrolledComposite sc = (ScrolledComposite) container;

-		Control formControl = getControl();

-		Point newSize = formControl.computeSize(SWT.DEFAULT, SWT.DEFAULT);

-		formControl.setSize(newSize);

-		sc.setMinSize(newSize);

-		updatePageIncrement(sc);

-	}

-}

diff --git a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/SectionChangeManager.java b/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/SectionChangeManager.java
deleted file mode 100644
index 80af6d1..0000000
--- a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/SectionChangeManager.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2000, 2003 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials 

- * are made available under the terms of the Common Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/cpl-v10.html

- * 

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-package org.eclipse.update.ui.forms.internal;

-

-import java.util.*;

-

-public class SectionChangeManager {

-	Hashtable sources = new Hashtable();

-

-public SectionChangeManager() {

-	super();

-}

-public void dispatchNotification(

-	FormSection source,

-	int type,

-	Object changeObject) {

-	Vector targets = (Vector) sources.get(source);

-	if (targets != null) {

-		for (Iterator iter = targets.iterator(); iter.hasNext();) {

-			FormSection section = (FormSection) iter.next();

-			section.sectionChanged(source, type, changeObject);

-		}

-	}

-}

-public void linkSections(FormSection source, FormSection target) {

-	source.setManager(this);

-	Vector targets = null;

-

-	targets = (Vector) sources.get(source);

-	if (targets == null) {

-		targets = new Vector();

-		sources.put(source, targets);

-	}

-	targets.addElement(target);

-}

-}

diff --git a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/SectionForm.java b/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/SectionForm.java
deleted file mode 100644
index 7e4f918..0000000
--- a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/SectionForm.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2000, 2003 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials 

- * are made available under the terms of the Common Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/cpl-v10.html

- * 

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-package org.eclipse.update.ui.forms.internal;

-

-import org.eclipse.swt.graphics.*;

-import org.eclipse.swt.widgets.*;

-import org.eclipse.swt.*;

-import org.eclipse.swt.events.*;

-import org.eclipse.jface.resource.*;

-import org.eclipse.jface.util.PropertyChangeEvent;

-

-/**

- * This form implementation assumes that it contains

- * form sections and that they fill up the screen.

- * Typically, the form client will use up the entire

- * parent area below the heading. Sections must

- * be able to return their preferred size in both

- * dimensions. If they contain wrappable text,

- * WebForm should be used instead.

- */

-

-public class SectionForm extends AbstractSectionForm implements PaintListener {

-	private Composite control;

-	private int TITLE_HMARGIN = 10;

-	private int TITLE_VMARGIN = 5;

-

-	class FormLayout extends Layout {

-		protected Point computeSize(

-			Composite composite,

-			int wHint,

-			int hHint,

-			boolean flushCache) {

-			if (wHint != SWT.DEFAULT && hHint != SWT.DEFAULT)

-				return new Point(wHint, hHint);

-			Control client = composite.getChildren()[0];

-			Point csize = client.computeSize(widthHint, heightHint, flushCache);

-			if (headingVisible)

-				csize.y += getTitleHeight();

-			return csize;

-		}

-		protected void layout(Composite composite, boolean flushCache) {

-			Rectangle clientArea = composite.getClientArea();

-			Control client = composite.getChildren()[0];

-			if (client != null && !client.isDisposed()) {

-				int theight = headingVisible ? getTitleHeight() : 0;

-				client.setBounds(

-					clientArea.x,

-					clientArea.y + theight,

-					clientArea.width,

-					clientArea.height - theight);

-			}

-		}

-	}

-	private int widthHint = SWT.DEFAULT;

-	private int heightHint = SWT.DEFAULT;

-

-	public SectionForm() {

-	}

-

-	public Control createControl(Composite parent) {

-		Composite canvas = new Composite(parent, SWT.NONE);

-		canvas.setBackground(factory.getBackgroundColor());

-		canvas.setForeground(factory.getForegroundColor());

-		canvas.addPaintListener(this);

-		canvas.setLayout(new FormLayout());

-		canvas.setMenu(parent.getMenu());

-		Composite formParent = factory.createComposite(canvas);

-		createFormClient(formParent);

-		this.control = canvas;

-		//canvas.setFocus();

-		return canvas;

-	}

-

-	protected void createFormClient(Composite parent) {

-		factory.createComposite(parent);

-	}

-

-	public Control getControl() {

-		return control;

-	}

-

-	private int getTitleHeight() {

-		int imageHeight = 0;

-		if (headingImage != null

-			&& SWT.getPlatform().equals("motif") == false) {

-			imageHeight = headingImage.getBounds().height;

-		}

-		GC gc = new GC(control);

-		gc.setFont(titleFont);

-		FontMetrics fm = gc.getFontMetrics();

-		int fontHeight = fm.getHeight();

-		gc.dispose();

-

-		int height = fontHeight + TITLE_VMARGIN + TITLE_VMARGIN;

-		return Math.max(height, imageHeight);

-	}

-

-	private void paint(Control form, GC gc) {

-		Rectangle bounds = form.getBounds();

-		int height = getTitleHeight();

-		if (headingImage != null) {

-			Rectangle imageBounds = headingImage.getBounds();

-			int x = bounds.width - imageBounds.width;

-			int y = 0;

-			//x = Math.max(x, 0);

-			x = 0;

-			if (headingBackground != null) {

-				gc.setBackground(headingBackground);

-				gc.fillRectangle(0, 0, bounds.width, height);

-			}

-			if (SWT.getPlatform().equals("motif") == false) {

-				gc.drawImage(headingImage, x, y);

-			}

-			if (headingForeground != null)

-				gc.setForeground(headingForeground);

-			else

-				gc.setForeground(factory.getForegroundColor());

-			gc.setFont(titleFont);

-			gc.drawText(getHeadingText(), TITLE_HMARGIN, TITLE_VMARGIN, true);

-		} else {

-			gc.setFont(titleFont);

-			gc.setBackground(factory.getColor(FormWidgetFactory.DEFAULT_HEADER_COLOR));

-			//gc.fillRectangle(TITLE_HMARGIN, TITLE_VMARGIN, bounds.width-TITLE_HMARGIN*2, height-TITLE_VMARGIN*2);

-			gc.setForeground(factory.getForegroundColor());

-			gc.drawText(getHeadingText(), TITLE_HMARGIN, TITLE_VMARGIN, true);

-		}

-	}

-

-	public final void paintControl(PaintEvent event) {

-		if (!headingVisible)

-			return;

-		GC gc = event.gc;

-		Control form = (Control) event.widget;

-		paint(form, gc);

-	}

-

-	public void setHeadingVisible(boolean newHeadingVisible) {

-		super.setHeadingVisible(newHeadingVisible);

-		if (control != null)

-			control.layout(true);

-	}

-	public void setHeadingText(String headingText) {

-		super.setHeadingText(headingText);

-		if (control != null) {

-			control.layout(true);

-			control.redraw();

-		}

-	}

-

-	public void propertyChange(PropertyChangeEvent event) {

-		titleFont = JFaceResources.getHeaderFont();

-		if (control != null) {

-			control.layout(true);

-			control.redraw();

-		}

-	}

-

-}

diff --git a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/SelectableControl.java b/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/SelectableControl.java
deleted file mode 100644
index 8479133..0000000
--- a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/SelectableControl.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2000, 2003 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials 

- * are made available under the terms of the Common Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/cpl-v10.html

- * 

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-package org.eclipse.update.ui.forms.internal;

-

-

-import org.eclipse.swt.widgets.*;

-import org.eclipse.swt.graphics.*;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.events.*;

-

-/**

- * FormText is a windowless control that

- * draws text in the provided context.

- */

-public abstract class SelectableControl extends Canvas {

-	private boolean hasFocus;

-

-	public SelectableControl(Composite parent, int style) {

-		super(parent, style);

-		addPaintListener(new PaintListener() {

-			public void paintControl(PaintEvent e) {

-				paint(e);

-			}

-		});

-		addMouseListener(new MouseAdapter () {

-			public void mouseUp(MouseEvent e) {

-				notifyListeners(SWT.Selection);

-			}

-		});

-		addKeyListener(new KeyAdapter() {

-			public void keyPressed(KeyEvent e) {

-				if (e.character == '\r') {

-					// Activation

-					notifyListeners(SWT.Selection);

-				}

-			}

-		});

-		addListener(SWT.Traverse, new Listener () {

-			public void handleEvent(Event e) {

-				if (e.detail != SWT.TRAVERSE_RETURN)

-					e.doit = true;

-			}

-		});

-		addFocusListener(new FocusListener() {

-			public void focusGained(FocusEvent e) {

-				if (!hasFocus) {

-				   hasFocus=true;

-				   redraw();

-				}

-			}

-			public void focusLost(FocusEvent e) {

-				if (hasFocus) {

-					hasFocus=false;

-					redraw();

-				}

-			}

-		});

-	}

-

-	protected void paint(PaintEvent e) {

-		GC gc = e.gc;

-		Point size = getSize();

-	   	gc.setFont(getFont());

-	   	paint(gc);

-		if (hasFocus) {

-	   		gc.setForeground(getForeground());

-	   		gc.drawFocus(0, 0, size.x, size.y);

-		}

-	}

-	

-	protected abstract void paint(GC gc);

-	

-	private void notifyListeners(int eventType) {

-		Event event = new Event();

-		event.type = eventType;

-		event.widget = this;

-		notifyListeners(eventType, event);

-	}

-	

-	public void addSelectionListener(SelectionListener listener) {

-		checkWidget ();

-		if (listener == null) return;

-		TypedListener typedListener = new TypedListener (listener);

-		addListener (SWT.Selection,typedListener);

-	}

-	

-	public void removeSelectionListener(SelectionListener listener) {

-		checkWidget ();

-		if (listener == null) return;

-		removeListener (SWT.Selection, listener);

-	}

-}

diff --git a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/SelectableFormLabel.java b/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/SelectableFormLabel.java
deleted file mode 100644
index ea5d5c4..0000000
--- a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/SelectableFormLabel.java
+++ /dev/null
@@ -1,149 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2000, 2003 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials 

- * are made available under the terms of the Common Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/cpl-v10.html

- * 

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-package org.eclipse.update.ui.forms.internal;

-

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.accessibility.*;

-import org.eclipse.swt.events.*;

-import org.eclipse.swt.graphics.*;

-import org.eclipse.swt.widgets.*;

-

-public class SelectableFormLabel extends FormLabel {

-	private boolean hasFocus;

-

-	public boolean getSelection() {

-		return hasFocus;

-	}

-	

-	/**

-	 * Constructor for SelectableFormLabel

-	 */

-	public SelectableFormLabel(Composite parent, int style) {

-		super(parent, style);

-		addKeyListener(new KeyAdapter() {

-			public void keyPressed(KeyEvent e) {

-				if (e.character == '\r') {

-					// Activation

-					notifyListeners(SWT.DefaultSelection);

-				}

-			}

-		});

-		addListener(SWT.Traverse, new Listener () {

-			public void handleEvent(Event e) {

-				switch (e.detail) {

-					case SWT.TRAVERSE_PAGE_NEXT:

-					case SWT.TRAVERSE_PAGE_PREVIOUS:

-					case SWT.TRAVERSE_ARROW_NEXT:

-					case SWT.TRAVERSE_ARROW_PREVIOUS:

-					case SWT.TRAVERSE_RETURN:

-					e.doit = false;

-					return;

-				}

-				e.doit = true;

-			}

-		});

-		addFocusListener(new FocusListener() {

-			public void focusGained(FocusEvent e) {

-				if (!hasFocus) {

-				   hasFocus=true;

-				   notifyListeners(SWT.Selection);

-				   redraw();

-				}

-			}

-			public void focusLost(FocusEvent e) {

-				if (hasFocus) {

-					hasFocus=false;

-					notifyListeners(SWT.Selection);

-					redraw();

-				}

-			}

-		});

-		textMarginWidth = 1;

-		textMarginHeight = 1;

-	}

-	

-	protected void initAccessible() {

-		Accessible accessible = getAccessible();

-		accessible.addAccessibleListener(new AccessibleAdapter() {

-			public void getName(AccessibleEvent e) {

-				e.result = getText();

-			}

-

-			public void getHelp(AccessibleEvent e) {

-				e.result = getToolTipText();

-			}

-		});

-

-		accessible

-			.addAccessibleControlListener(new AccessibleControlAdapter() {

-			public void getChildAtPoint(AccessibleControlEvent e) {

-				Point pt = toControl(new Point(e.x, e.y));

-				e.childID =

-					(getBounds().contains(pt))

-						? ACC.CHILDID_SELF

-						: ACC.CHILDID_NONE;

-			}

-

-			public void getLocation(AccessibleControlEvent e) {

-				Rectangle location = getBounds();

-				Point pt = toDisplay(new Point(location.x, location.y));

-				e.x = pt.x;

-				e.y = pt.y;

-				e.width = location.width;

-				e.height = location.height;

-			}

-

-			public void getChildCount(AccessibleControlEvent e) {

-				e.detail = 0;

-			}

-

-			public void getRole(AccessibleControlEvent e) {

-				e.detail = ACC.ROLE_PUSHBUTTON;

-			}

-

-			public void getState(AccessibleControlEvent e) {

-				e.detail = SelectableFormLabel.this.getSelection()?ACC.STATE_SELECTED:ACC.STATE_NORMAL;

-			}

-		});

-	}

-	

-	private void notifyListeners(int eventType) {

-		Event event = new Event();

-		event.type = eventType;

-		event.widget = this;

-		notifyListeners(eventType, event);

-	}

-

-	protected void paint(PaintEvent e) {

-		super.paint(e);

-	   	if (hasFocus) {

-	   		GC gc = e.gc;

-	   		Point size = getSize();

-	   		gc.setForeground(getForeground());

-	   		gc.drawFocus(0, 0, size.x, size.y);

-		}

-	}

-

-	public void addSelectionListener(SelectionListener listener) {

-		checkWidget ();

-		if (listener == null) return;

-		TypedListener typedListener = new TypedListener (listener);

-		addListener (SWT.Selection,typedListener);

-		addListener (SWT.DefaultSelection,typedListener);

-	}

-	

-	public void removeSelectionListener(SelectionListener listener) {

-		checkWidget ();

-		if (listener == null) return;

-		removeListener (SWT.Selection, listener);

-		removeListener (SWT.DefaultSelection, listener);

-	}

-}
\ No newline at end of file
diff --git a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/TableData.java b/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/TableData.java
deleted file mode 100644
index 8f968f5..0000000
--- a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/TableData.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2000, 2003 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials 

- * are made available under the terms of the Common Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/cpl-v10.html

- * 

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-package org.eclipse.update.ui.forms.internal;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.graphics.Point;

-

-public class TableData {

-	public static final int LEFT = 1;

-	public static final int CENTER = 2;

-	public static final int RIGHT = 3;

-	public static final int TOP = 4;

-	public static final int MIDDLE = 5;

-	public static final int BOTTOM = 6;

-	public static final int FILL = 7;

-	public int colspan=1;

-	public int rowspan=1;

-	public int align = LEFT;

-	public int valign = TOP;

-	public int indent = 0;

-	public int maxWidth = SWT.DEFAULT;

-	public int maxHeight = SWT.DEFAULT;

-	public int heightHint = SWT.DEFAULT;

-	public boolean grabHorizontal=false;

-	

-	//private

-	int childIndex;

-	boolean isItemData=true; 

-	int compWidth;

-	Point compSize;

-		

-	public TableData() {

-	}

-	

-	public TableData(int align, int valign) {

-		this(align, valign, 1, 1);

-	}

-	

-	public TableData(int align, int valign, int rowspan, int colspan) {

-		this.align = align;

-		this.valign = valign;

-		this.rowspan = rowspan;

-		this.colspan = colspan;

-	}

-}

diff --git a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/TableLayoutTest.java b/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/TableLayoutTest.java
deleted file mode 100644
index 7b07e01..0000000
--- a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/TableLayoutTest.java
+++ /dev/null
@@ -1,232 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2000, 2003 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials 

- * are made available under the terms of the Common Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/cpl-v10.html

- * 

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-package org.eclipse.update.ui.forms.internal;

-import org.eclipse.swt.widgets.*;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.layout.*;

-import org.eclipse.swt.custom.*;

-import org.eclipse.swt.graphics.*;

-import java.io.InputStream;

-import org.eclipse.update.ui.forms.internal.engine.*;

-import org.eclipse.jface.action.IStatusLineManager;

-import org.eclipse.jface.action.StatusLineManager;

-

-public class TableLayoutTest {

-

-public static void main (String [] args) {

-     Display display = new Display ();

-     Shell shell = new Shell (display);

-     shell.setLayout(new FillLayout());

-     final ScrolledComposite sc = new ScrolledComposite(shell, SWT.H_SCROLL | SWT.V_SCROLL);

-    // sc.setAlwaysShowScrollBars(true);

-     sc.setBackground(sc.getDisplay().getSystemColor(SWT.COLOR_WHITE));

-     final Composite c = new Composite(sc, SWT.NONE);

-     //c.setBackground(c.getDisplay().getSystemColor(SWT.COLOR_RED));

-     sc.setContent(c);

-     sc.addListener (SWT.Resize,  new Listener () {

-		public void handleEvent (Event e) {

-			Rectangle ssize = sc.getClientArea();

-			int swidth = ssize.width;

-			HTMLTableLayout layout = (HTMLTableLayout)c.getLayout();

-			Point size = layout.computeSize(c, swidth, SWT.DEFAULT, true);

-			//if (size.x < swidth) size.x = swidth;

-			Rectangle trim = c.computeTrim(0, 0, size.x, size.y);

-			size = new Point(trim.width, trim.height);

-			/*

-			Point size = c.computeSize(swidth, SWT.DEFAULT, true);

-			*/

-			//System.out.println("in: "+swidth+", out: "+size.x);

-			c.setSize(size);

-		}

-	});

-     c.setBackground(c.getDisplay().getSystemColor(SWT.COLOR_WHITE));

-     HTMLTableLayout layout = new HTMLTableLayout();

-     layout.numColumns = 2;

-     //layout.horizontalSpacing = 0;

-     layout.leftMargin = 0;

-     layout.rightMargin = 0;

-     layout.makeColumnsEqualWidth=false;

-     //layout.marginWidth = layout.marginHeight = 0;

-     //layout.horizontalSpacing = 0;

-     c.setLayout(layout);

-     

-     Label label;

-     Button b;

-     TableData td;

-/*     

-     label = new Label(c, SWT.NULL);

-     label.setText("Single line1");

-     

-     //label = new Label(c, SWT.WRAP);

-     Text text = new Text(c, SWT.MULTI | SWT.WRAP);

-     text.setEditable(false);

-     text.setText("This is a much longer text that I want wrapped,"+

-     " but depending on the window size it can be rendered completely.");

-     

-     b = new Button(c, SWT.PUSH);

-     b.setText("Simple button");

-     

-     label = new Label(c, SWT.WRAP);

-     label.setText("Another text that may or may not be wrapped");

-

-     label = new Label(c, SWT.NULL);

-     td = new TableData(TableData.RIGHT, TableData.BOTTOM);

-     label.setLayoutData(td);

-     label.setText("Fixed label");

-     

-     Composite nested = new Composite(c, SWT.NULL);

-     layout = new HTMLTableLayout();

-     layout.numColumns = 2;

-     nested.setLayout(layout);

-     b = new Button(nested, SWT.PUSH);

-     b.setText("Button2");

-     label = new Label(nested, SWT.WRAP);

-     td = new TableData(TableData.LEFT, TableData.MIDDLE);

-     label.setLayoutData(td);

-     label.setText("Some text in the nested label that can be wrapped");

-*/     

-     label = new Label(c, SWT.NULL);

-     label.setText("Text in the left column");

-     

-     b = new Button(c, SWT.CHECK);

-     b.setText("Checkbox in the right column");

-

-     

-     label = new Label(c, SWT.WRAP);

-     label.setText("This assignment step is then repeated for nested tables using the minimum and maximum widths derived for all such tables in the first pass. In this case, the width of the parent table cell plays the role of the current window size in the above description. This process is repeated recursively for all nested tables. The topmost table is then rendered using the assigned widths. Nested tables are subsequently rendered as part of the parent table's cell contents.");

-     td = new TableData();

-     td.colspan = 2;

-     td.align = TableData.FILL;

-     label.setLayoutData(td);

-     

-     ExpandableGroup exp = new ExpandableGroup (SWT.WRAP) {

-     	public void fillExpansion(Composite container, FormWidgetFactory factory) {

-     		HTMLTableLayout layout = new HTMLTableLayout();

-     		container.setLayout(layout);

-     		layout.leftMargin = layout.rightMargin = 0;

-     		Button button = factory.createButton(container, null, SWT.PUSH);

-     		button.setText("Button");

-    	}

-     	public void expanded() {

-     		c.layout(true);

-     		updateSize(sc, c);

-     	}

-     	public void collapsed() {

-     		c.layout(true);

-     		updateSize(sc, c);

-     	}

-     };

-     exp.setText("Expandable Section");

-     //exp.setExpandable(false);

-     FormWidgetFactory factory = new FormWidgetFactory();

-     exp.createControl(c, factory);

-     //exp.getControl().setBackground(label.getDisplay().getSystemColor(SWT.COLOR_GREEN));

-     td = new TableData();

-     td.colspan = 2;

-     td.align = TableData.FILL;

-     exp.getControl().setLayoutData(td);

-     

-	 StatusLineManager manager = new StatusLineManager();

-     addFormEngine(c, factory, manager);

-     //addFormEngine(c, factory, manager);

-     //addFormEngine(c, factory, manager);

-     

-     addRow(c);

- 

-     Control mcontrol = manager.createControl(c);

-     td = new TableData();

-     td.colspan = 2;

-     td.align = TableData.FILL;

-     mcontrol.setLayoutData(td);

-     

-     factory.setHyperlinkUnderlineMode(HyperlinkHandler.UNDERLINE_ROLLOVER);

-     

-     SelectableFormLabel ft = new SelectableFormLabel(c, SWT.WRAP);

-     ft.setText("Some text in the form text that should also wrap");

-     factory.turnIntoHyperlink(ft, new IHyperlinkListener() {

-     	public void linkEntered(Control link) {

-     		System.out.println("Link entered");

-     	}

-     	public void linkExited(Control link) {

-    		System.out.println("Link exited");

-     	}

-     	public void linkActivated(Control link) {

-     		System.out.println("Link activated");

-     	}

-     });

-

-     ft = new SelectableFormLabel(c, SWT.WRAP);

-     ft.setText("Some more form text here");

-     factory.turnIntoHyperlink(ft, new IHyperlinkListener() {

-     	public void linkEntered(Control link) {

-     		System.out.println("Link entered");

-     	}

-     	public void linkExited(Control link) {

-    		System.out.println("Link exited");

-     	}

-     	public void linkActivated(Control link) {

-     		System.out.println("Link activated");

-     	}

-     });

-   

-     shell.open ();

-     while (!shell.isDisposed ()) {

-          if (!display.readAndDispatch ()) display.sleep ();

-     }

-     display.dispose ();

-}

-

-public static void addFormEngine(Composite c, FormWidgetFactory factory, IStatusLineManager manager) {

-     new Label(c, SWT.NULL);

-     FormEngine html = new FormEngine(c, SWT.WRAP);

-     html.setHyperlinkSettings(factory.getHyperlinkHandler());

-     HTTPAction action = new HTTPAction();

-     action.setStatusLineManager(manager);

-     html.registerTextObject("urlHandler", action);

-     //html.setBackground(factory.getBackgroundColor());

-     html.setForeground(factory.getForegroundColor());

-     InputStream is = TableLayoutTest.class.getResourceAsStream("index.xml");

-     //html.setParagraphsSeparated(false);

-     html.load(is, true);

-     TableData td = new TableData();

-     td.colspan = 1;

-     td.align = TableData.FILL;

-     html.setLayoutData(td);

-}

-

-public static void addRow(Composite c) {

-	Composite row = new Composite(c, SWT.WRAP);

-	RowLayout layout = new RowLayout();

-	layout.wrap = true;

-	row.setLayout(layout);

-	

-	for (int i=0; i<10; i++) {

-		Button button = new Button(row, SWT.PUSH);

-		button.setText("Button that should be wrapped");

-	}

-	TableData td = new TableData();

-	td.colspan = 2;

-	td.align = TableData.FILL;

-	td.grabHorizontal = true;

-	row.setLayoutData(td);

-}

-

-private static void updateSize(ScrolledComposite sc, Composite c) {

-	Rectangle ssize = sc.getClientArea();

-	int swidth = ssize.width;

-	HTMLTableLayout layout = (HTMLTableLayout)c.getLayout();

-	Point size = layout.computeSize(c, swidth, SWT.DEFAULT, true);

-	Rectangle trim = c.computeTrim(0, 0, size.x, size.y);

-	size = new Point(trim.width, trim.height);

-	c.setSize(size);

-}

-

-}

diff --git a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/ToggleControl.java b/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/ToggleControl.java
deleted file mode 100644
index 33c285a..0000000
--- a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/ToggleControl.java
+++ /dev/null
@@ -1,170 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2000, 2003 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials 

- * are made available under the terms of the Common Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/cpl-v10.html

- * 

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-package org.eclipse.update.ui.forms.internal;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.accessibility.*;

-import org.eclipse.swt.events.*;

-import org.eclipse.swt.graphics.*;

-import org.eclipse.swt.widgets.Composite;

-

-public class ToggleControl extends SelectableControl {

-	private boolean selection;

-	private Color decorationColor;

-	private Color activeColor;

-	private Cursor activeCursor;

-	private boolean hover=false;

-	private static final int marginWidth = 2;

-	private static final int marginHeight = 2;

-	private static final int WIDTH = 9;

-	private static final int HEIGHT = 9;

-	private static final int [] offPoints = { 0,2, 8,2, 4,6 };

-	private static final int [] onPoints = { 2, -1, 2,8, 6,4 };	

-

-	public ToggleControl(Composite parent, int style) {

-		super(parent, style);

-		addSelectionListener(new SelectionAdapter() {

-			public void widgetSelected(SelectionEvent e) {

-				selection = !selection;

-				redraw();

-			}

-		});

-

-		addMouseTrackListener(new MouseTrackAdapter() {

-			public void mouseEnter(MouseEvent e) {

-				hover = true;

-				if (activeCursor!=null)

-				   setCursor(activeCursor);

-				redraw();

-			}

-			public void mouseExit(MouseEvent e) {

-				hover = false;

-				if (activeCursor!=null)

-				   setCursor(null);

-				redraw();

-			}

-		});

-		initAccessible();

-	}

-	void initAccessible() {

-		getAccessible().addAccessibleListener(new AccessibleAdapter() {

-			public void getHelp(AccessibleEvent e) {

-				e.result = getToolTipText();

-			}

-		});

-		

-		getAccessible().addAccessibleControlListener(new AccessibleControlAdapter() {

-			public void getChildAtPoint(AccessibleControlEvent e) {

-				Point testPoint = toControl(new Point(e.x, e.y));

-				if (getBounds().contains(testPoint)) {

-					e.childID = ACC.CHILDID_SELF;

-				}

-			}

-		

-			public void getLocation(AccessibleControlEvent e) {

-				Rectangle location = getBounds();

-				Point pt = toDisplay(new Point(location.x, location.y));

-				e.x = pt.x;

-				e.y = pt.y;

-				e.width = location.width;

-				e.height = location.height;

-			}

-		

-			public void getChildCount(AccessibleControlEvent e) {

-				e.detail = 0;

-			}

-		

-			public void getRole(AccessibleControlEvent e) {

-				e.detail = ACC.ROLE_TREE;

-			}

-		

-			public void getState(AccessibleControlEvent e) {

-				e.detail = ToggleControl.this.getSelection()?ACC.STATE_EXPANDED:ACC.STATE_COLLAPSED;

-			}

-

-			public void getValue(AccessibleControlEvent e) {

-				e.result = ToggleControl.this.getSelection()?"1":"0";

-			}

-		});

-	}

-	

-	public void setDecorationColor(Color decorationColor) {

-		this.decorationColor = decorationColor;

-	}

-	

-	public Color getDecorationColor() {

-		return decorationColor;

-	}

-	

-	public void setActiveDecorationColor(Color activeColor) {

-		this.activeColor = activeColor;

-	}

-	

-	public void setActiveCursor(Cursor activeCursor) {

-		this.activeCursor = activeCursor;

-	}

-	

-	public Color getActiveDecorationColor() {

-		return activeColor;

-	}

-	

-	public Point computeSize(int wHint, int hHint, boolean changed) {

-		int width, height;

-		

-		if (wHint!=SWT.DEFAULT) width = wHint; 

-		else 

-		   width = WIDTH + 2*marginWidth;

-		if (hHint!=SWT.DEFAULT) height = hHint;

-		else height = HEIGHT + 2*marginHeight;

-		return new Point(width, height);

-	}

-

-	/*

-	 * @see SelectableControl#paint(GC)

-	 */

-	protected void paint(GC gc) {

-		if (hover && activeColor!=null)

-			gc.setBackground(activeColor);

-		else if (decorationColor!=null)

-	   	   gc.setBackground(decorationColor);

-	   	else

-	   			gc.setBackground(getForeground());

-		int [] data;

-		Point size = getSize();

-		int x = (size.x - 9)/2;

-		int y = (size.y - 9)/2;

-		if (selection)

-			data = translate(onPoints, x, y);

-		

-		else 

-			data = translate(offPoints, x, y);

-		gc.fillPolygon(data);

-		gc.setBackground(getBackground());

-	}

-	

-	private int [] translate(int [] data, int x, int y) {

-		int [] target = new int [data.length];

-		for (int i=0; i<data.length; i+=2) {

-			target[i] = data[i]+ x;

-		}

-		for (int i=1; i<data.length; i+=2) {

-			target[i] = data[i]+y;

-		}

-		return target;

-	}

-

-	public boolean getSelection() {

-		return selection;

-	}

-	

-	public void setSelection(boolean selection) {

-		this.selection = selection;

-	}

-}

diff --git a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/WebForm.java b/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/WebForm.java
deleted file mode 100644
index 21519af..0000000
--- a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/WebForm.java
+++ /dev/null
@@ -1,237 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2000, 2003 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials 

- * are made available under the terms of the Common Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/cpl-v10.html

- * 

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-package org.eclipse.update.ui.forms.internal;

-

-import org.eclipse.swt.graphics.*;

-import org.eclipse.swt.graphics.Point;

-import org.eclipse.swt.widgets.*;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.*;

-import org.eclipse.swt.events.*;

-import org.eclipse.jface.resource.*;

-import org.eclipse.jface.util.PropertyChangeEvent;

-import org.eclipse.swt.custom.*;

-

-/**

- * This form implementation assumes that it contains

- * children that do not have independent dimensions.

- * In other words, these widgets are not capable

- * of answering their preferred size. Instead,

- * desired width must be supplied to get the

- * preferred height. These forms are layed out

- * top to bottom, left to right and use

- * a layout algorithm very similar to

- * HTML tables. Scrolling is not optional

- * for this type of presentation - 

- * scroll bars will show up when needed.

- */

-

-public class WebForm extends AbstractSectionForm {

-	protected ScrolledComposite scrollComposite;

-	private Composite control;

-	private Composite client;

-	private final static int HMARGIN = 5;

-	private final static int VMARGIN = 5;

-	private Image headingUnderlineImage;

-

-	class WebFormLayout extends Layout {

-

-		protected void layout(Composite parent, boolean changed) {

-			Rectangle bounds = parent.getClientArea();

-			int x = 0;

-			int y = 0;

-			if (isHeadingVisible()) {

-				y = getHeadingHeight(parent);

-			}

-			Point csize;

-

-			Layout layout = client.getLayout();

-			if (layout != null && layout instanceof HTMLTableLayout) {

-				HTMLTableLayout hlayout = (HTMLTableLayout) layout;

-				csize = hlayout.computeSize(client, bounds.width, SWT.DEFAULT, true);

-				if (csize.x < bounds.width)

-					csize.x = bounds.width;

-				Rectangle trim = control.computeTrim(0, 0, csize.x, csize.y);

-				csize = new Point(trim.width, trim.height);

-			} else {

-				csize = client.computeSize(bounds.width, SWT.DEFAULT, changed);

-			}

-			client.setBounds(x, y, csize.x, csize.y);

-		}

-

-		protected Point computeSize(

-			Composite parent,

-			int wHint,

-			int hHint,

-			boolean changed) {

-			int width = wHint;

-			int height = 0;

-			if (isHeadingVisible()) {

-				height = getHeadingHeight(parent);

-			}

-			Point csize;

-			Layout layout = client.getLayout();

-

-			if (layout != null && layout instanceof HTMLTableLayout) {

-				HTMLTableLayout hlayout = (HTMLTableLayout) layout;

-				csize = hlayout.computeSize(client, width, SWT.DEFAULT, true);

-				if (csize.x < width)

-					csize.x = width;

-				Rectangle trim = control.computeTrim(0, 0, csize.x, csize.y);

-				csize = new Point(trim.width, trim.height);

-			} else {

-				csize = client.computeSize(width, SWT.DEFAULT, changed);

-			}

-			width = csize.x;

-			height += csize.y;

-			return new Point(width, height);

-		}

-	}

-

-	public WebForm() {

-	}

-

-	public Control createControl(Composite parent) {

-		scrollComposite = new ScrolledComposite(parent, SWT.V_SCROLL | SWT.H_SCROLL);

-		scrollComposite.setBackground(factory.getBackgroundColor());

-		scrollComposite.setMenu(parent.getMenu());

-		final Composite form = factory.createComposite(scrollComposite);

-

-		scrollComposite.setContent(form);

-		scrollComposite.addListener(SWT.Resize, new Listener() {

-			public void handleEvent(Event e) {

-				updateSize();

-			}

-		});

-		WebFormLayout layout = new WebFormLayout();

-		form.setLayout(layout);

-		form.addPaintListener(new PaintListener() {

-			public void paintControl(PaintEvent e) {

-				paint(e);

-			}

-		});

-		this.control = form;

-		client = factory.createComposite(form);

-		createContents(client);

-		initializeScrollBars(scrollComposite);

-		//form.setFocus();

-		return scrollComposite;

-	}

-	private void initializeScrollBars(ScrolledComposite scomp) {

-		ScrollBar hbar = scomp.getHorizontalBar();

-		if (hbar != null) {

-			hbar.setIncrement(H_SCROLL_INCREMENT);

-		}

-		ScrollBar vbar = scomp.getVerticalBar();

-		if (vbar != null) {

-			vbar.setIncrement(V_SCROLL_INCREMENT);

-		}

-		updatePageIncrement(scomp);

-	}

-

-	private int getHeadingHeight(Composite parent) {

-		int width = parent.getSize().x;

-		int height = 0;

-		int imageHeight = 0;

-		if (getHeadingImage() != null) {

-			Rectangle ibounds = getHeadingImage().getBounds();

-			imageHeight = ibounds.height;

-		}

-		GC gc = new GC(parent);

-		gc.setFont(titleFont);

-		int textWidth = width - 2 * HMARGIN;

-		height = FormLabel.computeWrapHeight(gc, getHeadingText(), textWidth);

-		height += 2 * VMARGIN;

-		height = Math.max(height, imageHeight);

-		if (headingUnderlineImage != null) {

-			Rectangle ibounds = headingUnderlineImage.getBounds();

-			height += ibounds.height;

-		}

-		gc.dispose();

-		return height;

-	}

-

-	protected void createContents(Composite parent) {

-	}

-

-	public Control getControl() {

-		return control;

-	}

-

-	public void setHeadingVisible(boolean newHeadingVisible) {

-		super.setHeadingVisible(newHeadingVisible);

-		if (control != null)

-			control.layout();

-	}

-

-	public Image getHeadingUnderlineImage() {

-		return headingUnderlineImage;

-	}

-

-	public void setHeadingUnderlineImage(Image image) {

-		this.headingUnderlineImage = image;

-	}

-

-	public void propertyChange(PropertyChangeEvent event) {

-		titleFont = JFaceResources.getHeaderFont();

-		if (control != null) {

-			control.layout();

-		}

-	}

-	

-	protected void updateHyperlinkColors() {

-		factory.updateHyperlinkColors();

-		if (control != null && !control.isDisposed()) {

-			control.redraw();

-		}

-	}

-

-	public void updateSize() {

-		Rectangle ssize = scrollComposite.getClientArea();

-		int swidth = ssize.width;

-		WebFormLayout layout = (WebFormLayout) control.getLayout();

-		Point size = layout.computeSize(control, swidth, SWT.DEFAULT, true);

-		if (size.x < swidth)

-			size.x = swidth;

-		Rectangle trim = control.computeTrim(0, 0, size.x, size.y);

-		size = new Point(trim.width, trim.height);

-		control.setSize(size);

-		updatePageIncrement(scrollComposite);

-	}

-

-	private void paint(PaintEvent e) {

-		if (isHeadingVisible() == false)

-			return;

-		GC gc = e.gc;

-		if (headingImage != null) {

-			gc.drawImage(headingImage, 0, 0);

-		}

-		Point size = control.getSize();

-		if (getHeadingBackground() != null)

-			gc.setBackground(getHeadingBackground());

-		if (getHeadingForeground() != null)

-			gc.setForeground(getHeadingForeground());

-		gc.setFont(titleFont);

-		FormLabel.paintWrapText(gc, size, getHeadingText(), HMARGIN, VMARGIN);

-		if (headingUnderlineImage != null) {

-			int y =

-				getHeadingHeight((Composite) control)

-					- headingUnderlineImage.getBounds().height;

-			gc.drawImage(headingUnderlineImage, 0, y);

-		}

-	}

-	public void setHeadingText(String headingText) {

-		super.setHeadingText(headingText);

-		if (control!=null)

-			control.redraw();

-	}

-

-}

diff --git a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/engine/BulletParagraph.java b/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/engine/BulletParagraph.java
deleted file mode 100644
index de3f838..0000000
--- a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/engine/BulletParagraph.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.update.ui.forms.internal.engine;
-
-import org.eclipse.swt.graphics.GC;
-import java.util.Hashtable;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.Color;
-
-public class BulletParagraph extends Paragraph implements IBulletParagraph {
-	private int style = CIRCLE;
-	private String text;
-	private int CIRCLE_DIAM = 5;
-	private int SPACING = 10;
-	private int indent = -1;
-	/**
-	 * Constructor for BulletParagraph.
-	 * @param addVerticalSpace
-	 */
-	public BulletParagraph(boolean addVerticalSpace) {
-		super(addVerticalSpace);
-	}
-
-	public int getIndent() {
-		if (indent != -1)
-			return indent;
-		switch (style) {
-			case CIRCLE :
-				return CIRCLE_DIAM + SPACING;
-		}
-		return 20;
-	}
-
-	/*
-	 * @see IBulletParagraph#getBulletStyle()
-	 */
-	public int getBulletStyle() {
-		return style;
-	}
-
-	public void setBulletStyle(int style) {
-		this.style = style;
-	}
-
-	public void setBulletText(String text) {
-		this.text = text;
-	}
-
-	public void setIndent(int indent) {
-		this.indent = indent;
-	}
-
-	/*
-	 * @see IBulletParagraph#getBulletText()
-	 */
-	public String getBulletText() {
-		return text;
-	}
-
-	public void paint(
-		GC gc,
-		int width,
-		Locator loc,
-		int lineHeight,
-		Hashtable objectTable,
-		IHyperlinkSegment selectedLink) {
-		paintBullet(gc, loc, lineHeight, objectTable);
-		super.paint(gc, width, loc, lineHeight, objectTable, selectedLink);
-	}
-
-	public void paintBullet(
-		GC gc,
-		Locator loc,
-		int lineHeight,
-		Hashtable objectTable) {
-		int x = loc.x - getIndent();
-		if (style == CIRCLE) {
-			int y = loc.y + lineHeight / 2 - CIRCLE_DIAM / 2;
-			Color bg = gc.getBackground();
-			Color fg = gc.getForeground();
-			gc.setBackground(fg);
-			gc.fillRectangle(x, y + 1, 5, 3);
-			gc.fillRectangle(x + 1, y, 3, 5);
-			gc.setBackground(bg);
-		} else if (style == TEXT && text != null) {
-			gc.drawText(text, x, loc.y);
-		} else if (style == IMAGE && text != null) {
-			Image image = (Image) objectTable.get(text);
-			if (image != null) {
-				int y = loc.y + lineHeight / 2 - image.getBounds().height / 2;
-				gc.drawImage(image, x, y);
-			}
-		}
-	}
-}
\ No newline at end of file
diff --git a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/engine/FormEngine.java b/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/engine/FormEngine.java
deleted file mode 100644
index a07f865..0000000
--- a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/engine/FormEngine.java
+++ /dev/null
@@ -1,533 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2000, 2003 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials 

- * are made available under the terms of the Common Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/cpl-v10.html

- * 

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-package org.eclipse.update.ui.forms.internal.engine;

-

-import java.io.InputStream;

-import java.util.Hashtable;

-

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.jface.action.*;

-import org.eclipse.jface.action.IMenuManager;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.accessibility.*;

-import org.eclipse.swt.accessibility.Accessible;

-import org.eclipse.swt.custom.ScrolledComposite;

-import org.eclipse.swt.dnd.*;

-import org.eclipse.swt.dnd.Clipboard;

-import org.eclipse.swt.events.*;

-import org.eclipse.swt.graphics.*;

-import org.eclipse.swt.widgets.*;

-import org.eclipse.update.ui.forms.internal.*;

-

-public class FormEngine extends Canvas {

-	public static final String URL_HANDLER_ID = "urlHandler";

-	boolean hasFocus;

-	boolean paragraphsSeparated = true;

-	TextModel model;

-	Hashtable objectTable = new Hashtable();

-	public int marginWidth = 0;

-	public int marginHeight = 1;

-	IHyperlinkSegment entered;

-	boolean mouseDown = false;

-	Point dragOrigin;

-	private Action openAction;

-	private Action copyShortcutAction;

-

-	public boolean getFocus() {

-		return hasFocus;

-	}

-

-	public int getParagraphSpacing(int lineHeight) {

-		return lineHeight / 2;

-	}

-

-	public void setParagraphsSeparated(boolean value) {

-		paragraphsSeparated = value;

-	}

-

-	/**

-	 * Constructor for SelectableFormLabel

-	 */

-	public FormEngine(Composite parent, int style) {

-		super(parent, style);

-		setLayout(new FormEngineLayout());

-		model = new TextModel();

-

-		addDisposeListener(new DisposeListener() {

-			public void widgetDisposed(DisposeEvent e) {

-				model.dispose();

-			}

-		});

-		addPaintListener(new PaintListener() {

-			public void paintControl(PaintEvent e) {

-				paint(e);

-			}

-		});

-		addListener(SWT.KeyDown, new Listener() {

-			public void handleEvent(Event e) {

-				if (e.character == '\r') {

-					activateSelectedLink();

-					return;

-				}

-			}

-		});

-		addListener(SWT.Traverse, new Listener() {

-			public void handleEvent(Event e) {

-				switch (e.detail) {

-					case SWT.TRAVERSE_PAGE_NEXT :

-					case SWT.TRAVERSE_PAGE_PREVIOUS :

-					case SWT.TRAVERSE_ARROW_NEXT :

-					case SWT.TRAVERSE_ARROW_PREVIOUS :

-						e.doit = false;

-						return;

-				}

-				if (!model.hasFocusSegments()) {

-					e.doit = true;

-					return;

-				}

-				if (e.detail == SWT.TRAVERSE_TAB_NEXT)

-					e.doit = advance(true);

-				else if (e.detail == SWT.TRAVERSE_TAB_PREVIOUS)

-					e.doit = advance(false);

-				else if (e.detail != SWT.TRAVERSE_RETURN)

-					e.doit = true;

-			}

-		});

-		addFocusListener(new FocusListener() {

-			public void focusGained(FocusEvent e) {

-				if (!hasFocus) {

-					hasFocus = true;

-					handleFocusChange();

-				}

-			}

-			public void focusLost(FocusEvent e) {

-				if (hasFocus) {

-					hasFocus = false;

-					handleFocusChange();

-				}

-			}

-		});

-		addMouseListener(new MouseListener() {

-			public void mouseDoubleClick(MouseEvent e) {

-			}

-			public void mouseDown(MouseEvent e) {

-				// select a link

-				handleMouseClick(e, true);

-			}

-			public void mouseUp(MouseEvent e) {

-				// activate a link

-				handleMouseClick(e, false);

-			}

-		});

-		addMouseTrackListener(new MouseTrackListener() {

-			public void mouseEnter(MouseEvent e) {

-				handleMouseMove(e);

-			}

-			public void mouseExit(MouseEvent e) {

-				if (entered != null) {

-					exitLink(entered);

-					paintLinkHover(entered, false);

-					entered = null;

-					setCursor(null);

-				}

-			}

-			public void mouseHover(MouseEvent e) {

-				handleMouseHover(e);

-			}

-		});

-		addMouseMoveListener(new MouseMoveListener() {

-			public void mouseMove(MouseEvent e) {

-				handleMouseMove(e);

-			}

-		});

-		initAccessible();

-		makeActions();

-	}

-

-	private void makeActions() {

-		openAction = new Action() {

-			public void run() {

-				activateSelectedLink();

-			}

-		};

-		openAction.setText(

-			FormsPlugin.getResourceString("FormEgine.linkPopup.open"));

-		copyShortcutAction = new Action() {

-			public void run() {

-				copyShortcut(getSelectedLink());

-			}

-		};

-		copyShortcutAction.setText(

-			FormsPlugin.getResourceString("FormEgine.linkPopup.copyShortcut"));

-	}

-

-	private String getAcessibleText() {

-		return model.getAccessibleText();

-	}

-

-	private void initAccessible() {

-		Accessible accessible = getAccessible();

-		accessible.addAccessibleListener(new AccessibleAdapter() {

-			public void getName(AccessibleEvent e) {

-				e.result = getAcessibleText();

-			}

-

-			public void getHelp(AccessibleEvent e) {

-				e.result = getToolTipText();

-			}

-		});

-

-		accessible

-			.addAccessibleControlListener(new AccessibleControlAdapter() {

-			public void getChildAtPoint(AccessibleControlEvent e) {

-				Point pt = toControl(new Point(e.x, e.y));

-				e.childID =

-					(getBounds().contains(pt))

-						? ACC.CHILDID_SELF

-						: ACC.CHILDID_NONE;

-			}

-

-			public void getLocation(AccessibleControlEvent e) {

-				Rectangle location = getBounds();

-				Point pt = toDisplay(new Point(location.x, location.y));

-				e.x = pt.x;

-				e.y = pt.y;

-				e.width = location.width;

-				e.height = location.height;

-			}

-

-			public void getChildCount(AccessibleControlEvent e) {

-				e.detail = 0;

-			}

-

-			public void getRole(AccessibleControlEvent e) {

-				e.detail = ACC.ROLE_TEXT;

-			}

-

-			public void getState(AccessibleControlEvent e) {

-				e.detail = ACC.STATE_READONLY;

-			}

-		});

-	}

-

-	private void handleMouseClick(MouseEvent e, boolean down) {

-		if (down) {

-			// select a hyperlink

-			IHyperlinkSegment segmentUnder = model.findHyperlinkAt(e.x, e.y);

-			if (segmentUnder != null) {

-				IHyperlinkSegment oldLink = model.getSelectedLink();

-				model.selectLink(segmentUnder);

-				enterLink(segmentUnder);

-				paintFocusTransfer(oldLink, segmentUnder);

-			}

-			mouseDown = true;

-			dragOrigin = new Point(e.x, e.y);

-		} else {

-			if (e.button == 1) {

-				IHyperlinkSegment segmentUnder =

-					model.findHyperlinkAt(e.x, e.y);

-				if (segmentUnder != null) {

-					activateLink(segmentUnder);

-				}

-			}

-			mouseDown = false;

-		}

-	}

-	private void handleMouseHover(MouseEvent e) {

-	}

-	private void handleMouseMove(MouseEvent e) {

-		if (mouseDown) {

-			handleDrag(e);

-			return;

-		}

-		ITextSegment segmentUnder = model.findSegmentAt(e.x, e.y);

-

-		if (segmentUnder == null) {

-			if (entered != null) {

-				exitLink(entered);

-				paintLinkHover(entered, false);

-				entered = null;

-			}

-			setCursor(null);

-		} else {

-			if (segmentUnder instanceof IHyperlinkSegment) {

-				IHyperlinkSegment linkUnder = (IHyperlinkSegment) segmentUnder;

-				if (entered == null) {

-					entered = linkUnder;

-					enterLink(linkUnder);

-					paintLinkHover(entered, true);

-					setCursor(

-						model.getHyperlinkSettings().getHyperlinkCursor());

-				}

-			} else {

-				if (entered != null) {

-					exitLink(entered);

-					paintLinkHover(entered, false);

-					entered = null;

-				}

-				setCursor(model.getHyperlinkSettings().getTextCursor());

-			}

-		}

-	}

-

-	private void handleDrag(MouseEvent e) {

-	}

-

-	public HyperlinkSettings getHyperlinkSettings() {

-		return model.getHyperlinkSettings();

-	}

-

-	public void setHyperlinkSettings(HyperlinkSettings settings) {

-		model.setHyperlinkSettings(settings);

-	}

-

-	private boolean advance(boolean next) {

-		IHyperlinkSegment current = model.getSelectedLink();

-		if (current != null)

-			exitLink(current);

-

-		boolean valid = model.traverseLinks(next);

-		

-		IHyperlinkSegment newLink = model.getSelectedLink();

-

-		if (valid)

-			enterLink(newLink);

-		paintFocusTransfer(current, newLink);

-		if (newLink!=null) ensureVisible(newLink);

-		return !valid;

-	}

-

-	public IHyperlinkSegment getSelectedLink() {

-		return model.getSelectedLink();

-	}

-

-	private void handleFocusChange() {

-		if (hasFocus) {

-			model.traverseLinks(true);

-			enterLink(model.getSelectedLink());

-			paintFocusTransfer(null, model.getSelectedLink());

-		} else {

-			paintFocusTransfer(model.getSelectedLink(), null);

-			model.selectLink(null);

-		}

-	}

-

-	private void enterLink(IHyperlinkSegment link) {

-		if (link == null)

-			return;

-		HyperlinkAction action = link.getAction(objectTable);

-		if (action != null)

-			action.linkEntered(link);

-	}

-

-	private void exitLink(IHyperlinkSegment link) {

-		if (link == null)

-			return;

-		HyperlinkAction action = link.getAction(objectTable);

-		if (action != null)

-			action.linkExited(link);

-	}

-

-	private void paintLinkHover(IHyperlinkSegment link, boolean hover) {

-		GC gc = new GC(this);

-

-		HyperlinkSettings settings = getHyperlinkSettings();

-

-		gc.setForeground(

-			hover ? settings.getActiveForeground() : settings.getForeground());

-		gc.setBackground(getBackground());

-		gc.setFont(getFont());

-		boolean selected = (link == getSelectedLink());

-		link.repaint(gc, hover);

-		if (selected) {

-			link.paintFocus(gc, getBackground(), getForeground(), false);

-			link.paintFocus(gc, getBackground(), getForeground(), true);

-		}

-		gc.dispose();

-	}

-

-	private void activateSelectedLink() {

-		IHyperlinkSegment link = model.getSelectedLink();

-		if (link != null)

-			activateLink(link);

-	}

-

-	private void activateLink(IHyperlinkSegment link) {

-		setCursor(model.getHyperlinkSettings().getBusyCursor());

-		HyperlinkAction action = link.getAction(objectTable);

-		if (action != null)

-			action.linkActivated(link);

-		if (!isDisposed())

-			setCursor(model.getHyperlinkSettings().getHyperlinkCursor());

-	}

-

-	protected void paint(PaintEvent e) {

-		int width = getClientArea().width;

-		IParagraph[] paragraphs = model.getParagraphs();

-

-		GC gc = e.gc;

-		gc.setFont(getFont());

-		gc.setForeground(getForeground());

-		gc.setBackground(getBackground());

-

-		Locator loc = new Locator();

-		loc.marginWidth = marginWidth;

-		loc.marginHeight = marginHeight;

-		loc.x = marginWidth;

-		loc.y = marginHeight;

-

-		FontMetrics fm = gc.getFontMetrics();

-		int lineHeight = fm.getHeight();

-

-		IHyperlinkSegment selectedLink = model.getSelectedLink();

-

-		for (int i = 0; i < paragraphs.length; i++) {

-			IParagraph p = paragraphs[i];

-

-			if (i > 0 && paragraphsSeparated && p.getAddVerticalSpace())

-				loc.y += getParagraphSpacing(lineHeight);

-

-			loc.indent = p.getIndent();

-			loc.resetCaret();

-			loc.rowHeight = 0;

-			p.paint(gc, width, loc, lineHeight, objectTable, selectedLink);

-		}

-	}

-

-	public void registerTextObject(String key, Object value) {

-		objectTable.put(key, value);

-	}

-

-	public void load(String text, boolean parseTags, boolean expandURLs) {

-		try {

-			if (parseTags)

-				model.parseTaggedText(text, expandURLs);

-			else

-				model.parseRegularText(text, expandURLs);

-		} catch (CoreException e) {

-			FormsPlugin.logException(e);

-		}

-	}

-	public void load(InputStream is, boolean expandURLs) {

-		try {

-			model.parseInputStream(is, expandURLs);

-		} catch (CoreException e) {

-			FormsPlugin.logException(e);

-		}

-	}

-

-	public boolean setFocus() {

-		/*

-		if (!model.hasFocusSegments())

-			return false;

-		*/

-		return super.setFocus();

-	}

-

-	private void paintFocusTransfer(

-		IHyperlinkSegment oldLink,

-		IHyperlinkSegment newLink) {

-		GC gc = new GC(this);

-		Color bg = getBackground();

-		Color fg = getForeground();

-

-		gc.setFont(getFont());

-

-		if (oldLink != null) {

-			gc.setBackground(bg);

-			gc.setForeground(fg);

-			oldLink.paintFocus(gc, bg, fg, false);

-		}

-		if (newLink != null) {

-			//ensureVisible(newLink);

-			gc.setBackground(bg);

-			gc.setForeground(fg);

-			newLink.paintFocus(gc, bg, fg, true);

-		}

-		gc.dispose();

-	}

-	/**

-	 * Gets the marginWidth.

-	 * @return Returns a int

-	 */

-	public int getMarginWidth() {

-		return marginWidth;

-	}

-

-	/**

-	 * Sets the marginWidth.

-	 * @param marginWidth The marginWidth to set

-	 */

-	public void setMarginWidth(int marginWidth) {

-		this.marginWidth = marginWidth;

-	}

-

-	/**

-	 * Gets the marginHeight.

-	 * @return Returns a int

-	 */

-	public int getMarginHeight() {

-		return marginHeight;

-	}

-

-	/**

-	 * Sets the marginHeight.

-	 * @param marginHeight The marginHeight to set

-	 */

-	public void setMarginHeight(int marginHeight) {

-		this.marginHeight = marginHeight;

-	}

-

-	public void contextMenuAboutToShow(IMenuManager manager) {

-		IHyperlinkSegment link = getSelectedLink();

-		if (link != null)

-			contributeLinkActions(manager, link);

-	}

-

-	private void contributeLinkActions(

-		IMenuManager manager,

-		IHyperlinkSegment link) {

-		manager.add(openAction);

-		manager.add(copyShortcutAction);

-		manager.add(new Separator());

-	}

-

-	private void copyShortcut(IHyperlinkSegment link) {

-		String text = link.getText();

-		Clipboard clipboard = new Clipboard(getDisplay());

-		clipboard.setContents(

-			new Object[] { text },

-			new Transfer[] { TextTransfer.getInstance()});

-	}

-

-	private void ensureVisible(IHyperlinkSegment segment) {

-		Rectangle bounds = segment.getBounds();

-		ScrolledComposite scomp = getScrolledComposite();

-		if (scomp == null)

-			return;

-		Point origin = AbstractSectionForm.getControlLocation(scomp, this);

-		origin.x += bounds.x;

-		origin.y += bounds.y;

-		AbstractSectionForm.ensureVisible(

-			scomp,

-			origin,

-			new Point(bounds.width, bounds.height));

-	}

-	ScrolledComposite getScrolledComposite() {

-		Composite parent = getParent();

-		while (parent != null) {

-			if (parent instanceof ScrolledComposite)

-				return (ScrolledComposite) parent;

-			parent = parent.getParent();

-		}

-		return null;

-	}

-}
\ No newline at end of file
diff --git a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/engine/FormEngineLayout.java b/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/engine/FormEngineLayout.java
deleted file mode 100644
index add3ba7..0000000
--- a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/engine/FormEngineLayout.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2000, 2003 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials 

- * are made available under the terms of the Common Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/cpl-v10.html

- * 

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-package org.eclipse.update.ui.forms.internal.engine;

-

-import org.eclipse.swt.graphics.Point;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Layout;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.graphics.*;

-

-/**

- * @version 	1.0

- * @author

- */

-public class FormEngineLayout extends Layout {

-

-	/*

-	 * @see Layout#computeSize(Composite, int, int, boolean)

-	 */

-

-	public Point computeSize(

-		Composite composite,

-		int wHint,

-		int hHint,

-		boolean changed) {

-		FormEngine engine = (FormEngine) composite;

-		int innerWidth = wHint;

-		if (innerWidth != SWT.DEFAULT)

-			innerWidth -= engine.marginWidth * 2;

-		Point textSize = computeTextSize(engine, innerWidth);

-		int textWidth = textSize.x + 2 * engine.marginWidth;

-		int textHeight = textSize.y + 2 * engine.marginHeight;

-		Point result = new Point(textWidth, textHeight);

-		return result;

-	}

-

-	private Point computeTextSize(FormEngine engine, int wHint) {

-		IParagraph[] paragraphs = engine.model.getParagraphs();

-

-		GC gc = new GC(engine);

-		gc.setFont(engine.getFont());

-

-		Locator loc = new Locator();

-

-		int width = wHint != SWT.DEFAULT ? wHint : 0;

-

-		FontMetrics fm = gc.getFontMetrics();

-		int lineHeight = fm.getHeight();

-

-		for (int i = 0; i < paragraphs.length; i++) {

-			IParagraph p = paragraphs[i];

-

-			if (i > 0 && engine.paragraphsSeparated && p.getAddVerticalSpace())

-				loc.y += engine.getParagraphSpacing(lineHeight);

-

-			loc.rowHeight = 0;

-			loc.indent = p.getIndent();

-			loc.x = p.getIndent();

-

-			IParagraphSegment[] segments = p.getSegments();

-			if (segments.length > 0) {

-				for (int j = 0; j < segments.length; j++) {

-					IParagraphSegment segment = segments[j];

-					segment.advanceLocator(gc, wHint, loc, engine.objectTable);

-					width = Math.max(width, loc.width);

-				}

-				loc.y += loc.rowHeight;

-			} else {

-				// empty new line

-				loc.y += lineHeight;

-			}

-		}

-		gc.dispose();

-		return new Point(width, loc.y);

-	}

-

-	/*

-	 * @see Layout#layout(Composite, boolean)

-	 */

-	protected void layout(Composite composite, boolean flushCache) {

-	}

-}

diff --git a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/engine/HTTPAction.java b/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/engine/HTTPAction.java
deleted file mode 100644
index cd3d0b5..0000000
--- a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/engine/HTTPAction.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2000, 2003 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials 

- * are made available under the terms of the Common Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/cpl-v10.html

- * 

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-package org.eclipse.update.ui.forms.internal.engine;

-import org.eclipse.swt.program.Program;

-

-/**

- * @version 	1.0

- * @author

- */

-public class HTTPAction extends HyperlinkAction {

-	public HTTPAction () {

-	}

-	

-	public void linkActivated(IHyperlinkSegment link) {

-		Program.launch(link.getText());

-	}

-	

-	public void linkEntered(IHyperlinkSegment link) {

-		setDescription(link.getText());

-		super.linkEntered(link);

-	}

-}

diff --git a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/engine/HyperlinkAction.java b/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/engine/HyperlinkAction.java
deleted file mode 100644
index 3b11a68..0000000
--- a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/engine/HyperlinkAction.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2000, 2003 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials 

- * are made available under the terms of the Common Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/cpl-v10.html

- * 

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-package org.eclipse.update.ui.forms.internal.engine;

-

-import org.eclipse.jface.action.IStatusLineManager;

-

-/**

- * @version 	1.0

- * @author

- */

-public class HyperlinkAction {

-	IStatusLineManager manager;

-	private String description;

-	

-	public HyperlinkAction() {

-	}

-	

-	public void linkActivated(final IHyperlinkSegment link) {

-	}

-	

-	public void linkEntered(IHyperlinkSegment link) {

-		if (manager!=null && description!=null) {

-			manager.setMessage(description);

-		}

-	}

-

-	public void linkExited(IHyperlinkSegment link) {

-		if (manager!=null && description!=null) {

-			manager.setMessage(null);

-		}

-	}

-	

-	public void setStatusLineManager(IStatusLineManager manager) {

-		this.manager = manager;

-	}

-	

-	public String getDescription() {

-		return description;

-	}

-	public void setDescription(String description) {

-		this.description = description;

-	}

-}

diff --git a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/engine/HyperlinkSegment.java b/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/engine/HyperlinkSegment.java
deleted file mode 100644
index 2c41587..0000000
--- a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/engine/HyperlinkSegment.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2000, 2003 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials 

- * are made available under the terms of the Common Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/cpl-v10.html

- * 

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-package org.eclipse.update.ui.forms.internal.engine;

-

-import java.util.Hashtable;

-import org.eclipse.update.ui.forms.internal.*;

-import org.eclipse.swt.graphics.*;

-import org.eclipse.swt.graphics.GC;

-

-/**

- * @version 	1.0

- * @author

- */

-public class HyperlinkSegment

-	extends TextSegment

-	implements IHyperlinkSegment {

-	private String actionId;

-	private String arg;

-	private HyperlinkSettings settings;

-	

-	public HyperlinkSegment(String text, HyperlinkSettings settings, String fontId) {

-		super(text, fontId);

-		this.settings = settings;

-		underline = settings.getHyperlinkUnderlineMode()==HyperlinkSettings.UNDERLINE_ALWAYS;

-	}

-	

-	/*

-	 * @see IHyperlinkSegment#getListener(Hashtable)

-	 */

-	public HyperlinkAction getAction(Hashtable objectTable) {

-		if (actionId==null) return null;

-		Object obj = objectTable.get(actionId);

-		if (obj==null) return null;

-		if (obj instanceof HyperlinkAction) return (HyperlinkAction)obj;

-		return null;

-	}

-	

-	/*

-	 * @see IObjectReference#getObjectId()

-	 */

-	public String getObjectId() {

-		return actionId;

-	}

-	

-	void setActionId(String id) {

-		this.actionId = id;

-	}

-	public void paint(GC gc, int width, Locator locator, Hashtable objectTable, boolean selected) {

-		setColor(settings.getForeground());

-		super.paint(gc, width, locator, objectTable, selected);

-	}

-	

-	public void repaint(GC gc, boolean hover) {

-		FontMetrics fm = gc.getFontMetrics();

-		int lineHeight = fm.getHeight();

-		int descent = fm.getDescent();

-		boolean rolloverMode = settings.getHyperlinkUnderlineMode()==HyperlinkSettings.UNDERLINE_ROLLOVER;

-		for (int i=0; i<areaRectangles.size(); i++) {

-			AreaRectangle areaRectangle = (AreaRectangle)areaRectangles.get(i);

-			Rectangle rect = areaRectangle.rect;

-			String text = areaRectangle.getText();

-			Point extent = gc.textExtent(text);

-			int textX = rect.x + 1;

-			gc.drawString(text, textX, rect.y, true);

-			if (underline || hover || rolloverMode) {

-				int lineY = rect.y + lineHeight - descent + 1;

-				Color saved=null;

-				if (rolloverMode && !hover) {

-					saved = gc.getForeground();

-					gc.setForeground(gc.getBackground());

-				}

-				gc.drawLine(textX, lineY, textX+extent.x, lineY);

-				if (saved!=null)

-					gc.setForeground(saved);

-			}

-		}

-	}

-	/**

-	 * @return

-	 */

-	public String getArg() {

-		return arg;

-	}

-

-	/**

-	 * @param string

-	 */

-	public void setArg(String string) {

-		arg = string;

-	}

-

-}

diff --git a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/engine/IBulletParagraph.java b/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/engine/IBulletParagraph.java
deleted file mode 100644
index 55f3383..0000000
--- a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/engine/IBulletParagraph.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.update.ui.forms.internal.engine;
-
-import org.eclipse.swt.graphics.GC;
-import java.util.Hashtable;
-
-public interface IBulletParagraph extends IParagraph {
-	int CIRCLE = 0;
-	int TEXT = 1;
-	int IMAGE = 2;
-	public int getBulletStyle();
-	public String getBulletText();
-
-	public void paintBullet(GC gc, Locator loc, int lineHeight, Hashtable objectTable);
-}
\ No newline at end of file
diff --git a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/engine/IHyperlinkSegment.java b/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/engine/IHyperlinkSegment.java
deleted file mode 100644
index ea5b58a..0000000
--- a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/engine/IHyperlinkSegment.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2000, 2003 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials 

- * are made available under the terms of the Common Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/cpl-v10.html

- * 

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-package org.eclipse.update.ui.forms.internal.engine;

-

-import java.util.Hashtable;

-

-import org.eclipse.swt.graphics.GC;

-

-/**

- * @version 	1.0

- * @author

- */

-public interface IHyperlinkSegment extends ITextSegment, IObjectReference {

-	HyperlinkAction getAction(Hashtable objectTable);

-	

-	boolean contains(int x, int y);

-	

-	String getArg();

-	

-	public void repaint(GC gc, boolean hover);

-}

diff --git a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/engine/IImageSegment.java b/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/engine/IImageSegment.java
deleted file mode 100644
index 1e9bd56..0000000
--- a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/engine/IImageSegment.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2000, 2003 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials 

- * are made available under the terms of the Common Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/cpl-v10.html

- * 

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-package org.eclipse.update.ui.forms.internal.engine;

-import org.eclipse.swt.graphics.Image;

-import java.util.Hashtable;

-

-/**

- * @version 	1.0

- * @author

- */

-public interface IImageSegment extends IParagraphSegment, IObjectReference {

-	public static final int TOP = 1;

-	public static final int MIDDLE = 2;

-	public static final int BOTTOM = 3;

-	

-	public int getVerticalAlignment();

-

-	Image getImage(Hashtable objectTable);

-}

diff --git a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/engine/IObjectReference.java b/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/engine/IObjectReference.java
deleted file mode 100644
index f12a7eb..0000000
--- a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/engine/IObjectReference.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2000, 2003 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials 

- * are made available under the terms of the Common Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/cpl-v10.html

- * 

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-package org.eclipse.update.ui.forms.internal.engine;

-

-/**

- * @version 	1.0

- * @author

- */

-public interface IObjectReference {

-	public String getObjectId();

-}

diff --git a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/engine/IParagraph.java b/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/engine/IParagraph.java
deleted file mode 100644
index fb336eb..0000000
--- a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/engine/IParagraph.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2000, 2003 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials 

- * are made available under the terms of the Common Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/cpl-v10.html

- * 

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-package org.eclipse.update.ui.forms.internal.engine;

-

-

-import org.eclipse.swt.graphics.GC;

-import java.util.Hashtable;

-

-/**

- * @version 	1.0

- * @author

- */

-public interface IParagraph {

-	public int getIndent();

-	public IParagraphSegment [] getSegments();

-	public void addSegment(IParagraphSegment segment);

-	public boolean getAddVerticalSpace();

-	public ITextSegment findSegmentAt(int x, int y);

-	public void paint(GC gc, int width, Locator loc, int lineHeight, Hashtable objectTable, IHyperlinkSegment selectedLink);

-	public String getAccessibleText();

-}

diff --git a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/engine/IParagraphSegment.java b/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/engine/IParagraphSegment.java
deleted file mode 100644
index 9217105..0000000
--- a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/engine/IParagraphSegment.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2000, 2003 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials 

- * are made available under the terms of the Common Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/cpl-v10.html

- * 

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-package org.eclipse.update.ui.forms.internal.engine;

-

-import org.eclipse.swt.graphics.GC;

-import java.util.Hashtable;

-

-/**

- * @version 	1.0

- * @author

- */

-public interface IParagraphSegment {

-	

-	public void advanceLocator(GC gc, int wHint, Locator loc, Hashtable objectTable);

-	

-	public void paint(GC gc, int width, Locator loc, Hashtable objectTable, boolean selected);

-}

diff --git a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/engine/ITextModel.java b/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/engine/ITextModel.java
deleted file mode 100644
index 4071ad2..0000000
--- a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/engine/ITextModel.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2000, 2003 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials 

- * are made available under the terms of the Common Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/cpl-v10.html

- * 

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-package org.eclipse.update.ui.forms.internal.engine;

-

-import org.eclipse.core.runtime.CoreException;

-

-/**

- * @version 	1.0

- * @author

- */

-public interface ITextModel {

-	IParagraph [] getParagraphs();

-	public void parseTaggedText(String taggedText, boolean expandURLs) throws CoreException;

-	public void parseRegularText(String regularText, boolean expandURLs) throws CoreException;

-	public void dispose();

-}

diff --git a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/engine/ITextSegment.java b/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/engine/ITextSegment.java
deleted file mode 100644
index 47e5fb0..0000000
--- a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/engine/ITextSegment.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2000, 2003 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials 

- * are made available under the terms of the Common Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/cpl-v10.html

- * 

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-package org.eclipse.update.ui.forms.internal.engine;

-

-import org.eclipse.swt.graphics.*;

-

-/**

- * @version 	1.0

- * @author

- */

-public interface ITextSegment extends IParagraphSegment {

-	String getText();

-	Color getColor();

-	Font getFont();

-	boolean isWordWrapAllowed();

-	boolean isSelectable();

-	boolean contains(int x, int y);

-	Rectangle getBounds();

-	void paintFocus(GC gc, Color bg, Color fg, boolean selected);

-}

diff --git a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/engine/ImageSegment.java b/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/engine/ImageSegment.java
deleted file mode 100644
index 4c84cb9..0000000
--- a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/engine/ImageSegment.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2000, 2003 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials 

- * are made available under the terms of the Common Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/cpl-v10.html

- * 

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-package org.eclipse.update.ui.forms.internal.engine;

-

-import org.eclipse.swt.graphics.*;

-import java.util.Hashtable;

-import org.eclipse.swt.SWT;

-

-/**

- * @version 	1.0

- * @author

- */

-public class ImageSegment extends ParagraphSegment implements IImageSegment {

-	private int alignment = BOTTOM;

-	private String imageId;

-	

-	public int getVerticalAlignment() {

-		return alignment;

-	}

-	

-	void setVerticalAlignment(int alignment) {

-		this.alignment = alignment;

-	}

-	

-	public Image getImage(Hashtable objectTable) {

-		if (imageId==null) return null;

-		Object obj = objectTable.get(imageId);

-		if (obj==null) return null;

-		if (obj instanceof Image) return (Image)obj;

-		return null;

-	}

-	

-	public String getObjectId() {

-		return imageId;

-	}

-	

-	void setObjectId(String imageId) {

-		this.imageId = imageId;

-	}

-	

-	public void advanceLocator(GC gc, int wHint, Locator loc, Hashtable objectTable) {

-		Image image = getImage(objectTable);

-		int iwidth = 0;

-		int iheight = 0;

-		if (image!=null) {

-			Rectangle rect = image.getBounds();

-			iwidth = rect.width;

-			iheight = rect.height;

-		}

-		if (wHint != SWT.DEFAULT && loc.x + iwidth > wHint) {

-			// new line

-			loc.x = loc.indent + iwidth;

-			loc.width = loc.x;

-			loc.y += loc.rowHeight;

-			loc.rowHeight = iheight;

-		}

-		else {

-			loc.x += iwidth;

-			loc.rowHeight = Math.max(loc.rowHeight, iheight);

-		}

-	}

-

-	public void paint(GC gc, int width, Locator loc, Hashtable objectTable, boolean selected) {

-		Image image = getImage(objectTable);

-		int iwidth = 0;

-		int iheight = 0;

-		if (image!=null) {

-			Rectangle rect = image.getBounds();

-			iwidth = rect.width;

-			iheight = rect.height;

-		}

-		else return;

-		loc.width = iwidth;

-		loc.height = iheight;

-		

-		int ix = loc.x;

-		int iy = loc.y;

-		

-		if (ix + iwidth > width) {

-			// new row

-			ix = loc.indent + loc.marginWidth;

-			iy += loc.rowHeight;

-			loc.rowHeight = 0;

-		}

-		

-		gc.drawImage(image, ix, iy);

-		loc.x = ix + iwidth;

-		loc.y = iy;

-		loc.rowHeight = Math.max(loc.rowHeight, iheight);

-	}

-}

diff --git a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/engine/Locator.java b/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/engine/Locator.java
deleted file mode 100644
index 350154b..0000000
--- a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/engine/Locator.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2000, 2003 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials 

- * are made available under the terms of the Common Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/cpl-v10.html

- * 

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-package org.eclipse.update.ui.forms.internal.engine;

-

-/**

- * @version 	1.0

- * @author

- */

-public class Locator { 

-	public int indent;

-	public int x, y;

-	public int width, height;

-	public int rowHeight;

-	public int marginWidth;

-	public int marginHeight;

-	

-	public void newLine() {

-		resetCaret();

-		y += rowHeight;

-		rowHeight = 0;

-	}

-	

-	public void resetCaret() {

-		x = marginWidth + indent;

-	}

-}

diff --git a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/engine/Paragraph.java b/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/engine/Paragraph.java
deleted file mode 100644
index a9a4352..0000000
--- a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/engine/Paragraph.java
+++ /dev/null
@@ -1,159 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2000, 2003 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials 

- * are made available under the terms of the Common Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/cpl-v10.html

- * 

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-package org.eclipse.update.ui.forms.internal.engine;

-

-import java.io.*;

-import java.util.*;

-

-import org.eclipse.swt.graphics.GC;

-import org.eclipse.update.ui.forms.internal.HyperlinkSettings;

-

-/**

- * @version 	1.0

- * @author

- */

-public class Paragraph implements IParagraph {

-	public static final String HTTP = "http://";

-	private Vector segments;

-	private boolean addVerticalSpace = true;

-

-	public Paragraph(boolean addVerticalSpace) {

-		this.addVerticalSpace = addVerticalSpace;

-	}

-

-	public int getIndent() {

-		return 0;

-	}

-

-	public boolean getAddVerticalSpace() {

-		return addVerticalSpace;

-	}

-

-	/*

-	 * @see IParagraph#getSegments()

-	 */

-	public IParagraphSegment[] getSegments() {

-		if (segments == null)

-			return new IParagraphSegment[0];

-		return (IParagraphSegment[]) segments.toArray(

-			new IParagraphSegment[segments.size()]);

-	}

-

-	public void addSegment(IParagraphSegment segment) {

-		if (segments == null)

-			segments = new Vector();

-		segments.add(segment);

-	}

-

-	public void parseRegularText(

-		String text,

-		boolean expandURLs,

-		HyperlinkSettings settings,

-		String fontId) {

-		if (text.length() == 0)

-			return;

-		if (expandURLs) {

-			int loc = text.indexOf(HTTP);

-

-			if (loc == -1)

-				addSegment(new TextSegment(text, fontId));

-			else {

-				int textLoc = 0;

-				while (loc != -1) {

-					addSegment(new TextSegment(text.substring(textLoc, loc), fontId));

-					boolean added = false;

-					for (textLoc = loc; textLoc < text.length(); textLoc++) {

-						char c = text.charAt(textLoc);

-						if (Character.isSpaceChar(c)) {

-							addHyperlinkSegment(text.substring(loc, textLoc), settings, fontId);

-							added = true;

-							break;

-						}

-					}

-					if (!added) {

-						// there was no space - just end of text

-						addHyperlinkSegment(text.substring(loc), settings, fontId);

-						break;

-					}

-					loc = text.indexOf(HTTP, textLoc);

-				}

-				if (textLoc < text.length()) {

-					addSegment(new TextSegment(text.substring(textLoc), fontId));

-				}

-			}

-		} else {

-			addSegment(new TextSegment(text, fontId));

-		}

-	}

-

-	private void addHyperlinkSegment(

-		String text,

-		HyperlinkSettings settings,

-		String fontId) {

-		HyperlinkSegment hs = new HyperlinkSegment(text, settings, fontId);

-		hs.setWordWrapAllowed(false);

-		hs.setActionId(FormEngine.URL_HANDLER_ID);

-		addSegment(hs);

-	}

-

-	public void paint(

-		GC gc,

-		int width,

-		Locator loc,

-		int lineHeight,

-		Hashtable objectTable,

-		IHyperlinkSegment selectedLink) {

-		IParagraphSegment [] segments = getSegments();

-		if (segments.length > 0) {

-			if (segments[0] instanceof ITextSegment

-				&& ((ITextSegment) segments[0]).isSelectable())

-				loc.x += 1;

-			for (int j = 0; j < segments.length; j++) {

-				IParagraphSegment segment = segments[j];

-				boolean doSelect = false;

-				if (selectedLink != null && segment.equals(selectedLink))

-					doSelect = true;

-				segment.paint(gc, width, loc, objectTable, doSelect);

-			}

-			loc.y += loc.rowHeight;

-		} else {

-			loc.y += lineHeight;

-		}

-	}

-	public String getAccessibleText() {

-		IParagraphSegment [] segments = getSegments();

-		StringWriter swriter = new StringWriter();

-		PrintWriter writer = new PrintWriter(swriter);

-		for (int i = 0; i < segments.length; i++) {

-			IParagraphSegment segment = segments[i];

-			if (segment instanceof ITextSegment) {

-				String text = ((ITextSegment)segment).getText();

-				writer.print(text);

-			}

-		}

-		writer.println();

-		swriter.flush();

-		return swriter.toString();

-	}

-	public ITextSegment findSegmentAt(int x, int y) {

-		if (segments!=null) {

-			for (int i=0; i<segments.size(); i++) {

-				IParagraphSegment segment = (IParagraphSegment)segments.get(i);

-				if (segment instanceof ITextSegment) {

-					ITextSegment textSegment = (ITextSegment)segment;

-					if (textSegment.contains(x, y))

-						return textSegment;

-				}

-			}

-		}

-		return null;

-	}

-}

diff --git a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/engine/ParagraphSegment.java b/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/engine/ParagraphSegment.java
deleted file mode 100644
index 7d16aac..0000000
--- a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/engine/ParagraphSegment.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2000, 2003 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials 

- * are made available under the terms of the Common Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/cpl-v10.html

- * 

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-package org.eclipse.update.ui.forms.internal.engine;

-

-/**

- * @version 	1.0

- * @author

- */

-public abstract class ParagraphSegment implements IParagraphSegment {

-

-}

diff --git a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/engine/TextModel.java b/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/engine/TextModel.java
deleted file mode 100644
index 19d282e..0000000
--- a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/engine/TextModel.java
+++ /dev/null
@@ -1,449 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2000, 2003 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials 

- * are made available under the terms of the Common Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/cpl-v10.html

- * 

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-package org.eclipse.update.ui.forms.internal.engine;

-

-import java.util.Vector;

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.update.ui.forms.internal.*;

-import org.apache.xerces.parsers.DOMParser;

-import org.xml.sax.*;

-import java.io.*;

-import org.w3c.dom.*;

-import org.eclipse.jface.resource.JFaceResources;

-

-/**

- * @version 	1.0

- * @author

- */

-public class TextModel implements ITextModel {

-	Vector paragraphs;

-	IHyperlinkListener urlListener;

-	IHyperlinkSegment[] hyperlinks;

-	int selectedLinkIndex = -1;

-	HyperlinkSettings hyperlinkSettings;

-	

-	public TextModel() {

-		reset();

-	}

-

-	class LocalHyperlinkSettings extends HyperlinkSettings {

-	}

-

-	/*

-	 * @see ITextModel#getParagraphs()

-	 */

-	public IParagraph[] getParagraphs() {

-		if (paragraphs == null)

-			return new IParagraph[0];

-		return (IParagraph[]) paragraphs.toArray(

-			new IParagraph[paragraphs.size()]);

-	}

-	

-	public String getAccessibleText() {

-		if (paragraphs == null)

-			return "";

-		StringBuffer sbuf = new StringBuffer();

-		for (int i=0; i<paragraphs.size(); i++) {

-			IParagraph paragraph  = (IParagraph)paragraphs.get(i);

-			String text = paragraph.getAccessibleText();

-			sbuf.append(text);

-		}

-		return sbuf.toString();

-	}

-

-	/*

-	 * @see ITextModel#parse(String)

-	 */

-	public void parseTaggedText(String taggedText, boolean expandURLs)

-		throws CoreException {

-		if (taggedText==null) {

-			reset();

-			return;

-		}

-		try {

-			InputStream stream =

-				new ByteArrayInputStream(taggedText.getBytes("UTF8"));

-			parseInputStream(stream, expandURLs);

-		} catch (UnsupportedEncodingException e) {

-		}

-	}

-

-	public void parseInputStream(InputStream is, boolean expandURLs)

-		throws CoreException {

-		DOMParser parser = new DOMParser();

-		reset();

-		try {

-			InputSource source = new InputSource(is);

-			parser.parse(source);

-			processDocument(parser.getDocument(), expandURLs);

-		} catch (SAXException e) {

-			FormsPlugin.logException(e);

-		} catch (IOException e) {

-			FormsPlugin.logException(e);

-		}

-	}

-

-	private void processDocument(Document doc, boolean expandURLs) {

-		Node root = doc.getDocumentElement();

-		NodeList children = root.getChildNodes();

-		for (int i = 0; i < children.getLength(); i++) {

-			Node child = children.item(i);

-			if (child.getNodeType() == Node.TEXT_NODE) {

-				// Make an implicit paragraph

-				String text = child.getNodeValue();

-				if (text != null && !isIgnorableWhiteSpace(text, true)) {

-					Paragraph p = new Paragraph(true);

-					p.parseRegularText(

-						text,

-						expandURLs,

-						getHyperlinkSettings(),

-						null);

-					paragraphs.add(p);

-				}

-			} else if (child.getNodeType() == Node.ELEMENT_NODE) {

-				String tag = child.getNodeName().toLowerCase();

-				if (tag.equals("p")) {

-					IParagraph p = processParagraph(child, expandURLs);

-					if (p != null)

-						paragraphs.add(p);

-				} else if (tag.equals("li")) {

-					IParagraph p = processListItem(child, expandURLs);

-					if (p != null)

-						paragraphs.add(p);

-				}

-			}

-		}

-	}

-	private IParagraph processParagraph(Node paragraph, boolean expandURLs) {

-		NodeList children = paragraph.getChildNodes();

-		NamedNodeMap atts = paragraph.getAttributes();

-		Node addSpaceAtt = atts.getNamedItem("addVerticalSpace");

-		boolean addSpace = true;

-

-		if (addSpaceAtt != null) {

-			String value = addSpaceAtt.getNodeValue();

-			addSpace = value.equalsIgnoreCase("true");

-		}

-		Paragraph p = new Paragraph(addSpace);

-

-		processSegments(p, children, expandURLs);

-		return p;

-	}

-	private IParagraph processListItem(Node listItem, boolean expandURLs) {

-		NodeList children = listItem.getChildNodes();

-		NamedNodeMap atts = listItem.getAttributes();

-		Node addSpaceAtt = atts.getNamedItem("addVerticalSpace");

-		Node styleAtt = atts.getNamedItem("style");

-		Node valueAtt = atts.getNamedItem("value");

-		Node indentAtt = atts.getNamedItem("indent");

-		int style = IBulletParagraph.CIRCLE;

-		int indent = -1;

-		String text = null;

-		boolean addSpace = true;

-

-		if (addSpaceAtt != null) {

-			String value = addSpaceAtt.getNodeValue();

-			addSpace = value.equalsIgnoreCase("true");

-		}

-		if (styleAtt != null) {

-			String value = styleAtt.getNodeValue();

-			if (value.equalsIgnoreCase("text")) {

-				style = IBulletParagraph.TEXT;

-			} else if (value.equalsIgnoreCase("image")) {

-				style = IBulletParagraph.IMAGE;

-			}

-		}

-		if (valueAtt != null) {

-			text = valueAtt.getNodeValue();

-		}

-		if (indentAtt != null) {

-			String value = indentAtt.getNodeValue();

-			try {

-				indent = Integer.parseInt(value);

-			} catch (NumberFormatException e) {

-			}

-		}

-

-		BulletParagraph p = new BulletParagraph(addSpace);

-		p.setIndent(indent);

-		p.setBulletStyle(style);

-		p.setBulletText(text);

-

-		processSegments(p, children, expandURLs);

-		return p;

-	}

-

-	private void processSegments(

-		Paragraph p,

-		NodeList children,

-		boolean expandURLs) {

-		for (int i = 0; i < children.getLength(); i++) {

-			Node child = children.item(i);

-			IParagraphSegment segment = null;

-

-			if (child.getNodeType() == Node.TEXT_NODE) {

-				String value = child.getNodeValue();

-

-				if (value != null && !isIgnorableWhiteSpace(value, false)) {

-					p.parseRegularText(

-						value,

-						expandURLs,

-						getHyperlinkSettings(),

-						null);

-				}

-			} else if (child.getNodeType() == Node.ELEMENT_NODE) {

-				String name = child.getNodeName();

-				if (name.equalsIgnoreCase("img")) {

-					segment = processImageSegment(child);

-				} else if (name.equalsIgnoreCase("a")) {

-					segment =

-						processHyperlinkSegment(child, getHyperlinkSettings());

-				} else if (name.equalsIgnoreCase("text")) {

-					processTextSegment(p, expandURLs, child);

-				} else if (name.equalsIgnoreCase("b")) {

-					String text = getNodeText(child).trim();

-					String fontId = JFaceResources.BANNER_FONT;

-					p.parseRegularText(

-						text,

-						expandURLs,

-						getHyperlinkSettings(),

-						fontId);

-				}

-			}

-			if (segment != null) {

-				p.addSegment(segment);

-			}

-		}

-	}

-

-	private boolean isIgnorableWhiteSpace(String text, boolean ignoreSpaces) {

-		for (int i = 0; i < text.length(); i++) {

-			char c = text.charAt(i);

-			if (ignoreSpaces && c == ' ')

-				continue;

-			if (c == '\n' || c == '\r' || c == '\f')

-				continue;

-			return false;

-		}

-		return true;

-	}

-

-	private IParagraphSegment processImageSegment(Node image) {

-		ImageSegment segment = new ImageSegment();

-		NamedNodeMap atts = image.getAttributes();

-		Node id = atts.getNamedItem("href");

-		Node align = atts.getNamedItem("align");

-		if (id != null) {

-			String value = id.getNodeValue();

-			segment.setObjectId(value);

-		}

-		if (align != null) {

-			String value = align.getNodeValue().toLowerCase();

-			if (value.equals("top"))

-				segment.setVerticalAlignment(ImageSegment.TOP);

-			else if (value.equals("middle"))

-				segment.setVerticalAlignment(ImageSegment.MIDDLE);

-			else if (value.equals("bottom"))

-				segment.setVerticalAlignment(ImageSegment.BOTTOM);

-		}

-		return segment;

-	}

-

-	private String getNodeText(Node node) {

-		NodeList children = node.getChildNodes();

-		String text = "";

-		for (int i = 0; i < children.getLength(); i++) {

-			Node child = children.item(i);

-			if (child.getNodeType() == Node.TEXT_NODE) {

-				text += child.getNodeValue();

-			}

-		}

-		return text;

-	}

-

-	private IParagraphSegment processHyperlinkSegment(

-		Node link,

-		HyperlinkSettings settings) {

-		String text = getNodeText(link);

-		HyperlinkSegment segment = new HyperlinkSegment(text, settings, null);

-		NamedNodeMap atts = link.getAttributes();

-		Node href = atts.getNamedItem("href");

-		if (href != null) {

-			String value = href.getNodeValue();

-			segment.setActionId(value);

-		}

-		Node arg = atts.getNamedItem("arg");

-		if (arg != null) {

-			String value = arg.getNodeValue();

-			segment.setArg(value);

-		}

-		return segment;

-	}

-

-	private void processTextSegment(

-		Paragraph p,

-		boolean expandURLs,

-		Node textNode) {

-		String text = getNodeText(textNode).trim();

-

-		NamedNodeMap atts = textNode.getAttributes();

-		Node font = atts.getNamedItem("font");

-		String fontId = null;

-		if (font != null) {

-			fontId = font.getNodeValue();

-		}

-		p.parseRegularText(text, expandURLs, getHyperlinkSettings(), fontId);

-	}

-

-	public void parseRegularText(String regularText, boolean convertURLs)

-		throws CoreException {

-		reset();

-		

-		if (regularText==null) return;

-

-		Paragraph p = new Paragraph(true);

-		paragraphs.add(p);

-		int pstart = 0;

-

-		for (int i = 0; i < regularText.length(); i++) {

-			char c = regularText.charAt(i);

-			if (p == null) {

-				p = new Paragraph(true);

-				paragraphs.add(p);

-			}

-			if (c == '\n') {

-				String text = regularText.substring(pstart, i);

-				pstart = i + 1;

-				p.parseRegularText(

-					text,

-					convertURLs,

-					getHyperlinkSettings(),

-					null);

-				p = null;

-			}

-		}

-		if (p != null) {

-			// no new line

-			String text = regularText.substring(pstart);

-			p.parseRegularText(text, convertURLs, getHyperlinkSettings(), null);

-		}

-	}

-

-	public HyperlinkSettings getHyperlinkSettings() {

-		if (hyperlinkSettings == null) {

-			hyperlinkSettings = new LocalHyperlinkSettings();

-		}

-		return hyperlinkSettings;

-	}

-

-	public void setHyperlinkSettings(HyperlinkSettings settings) {

-		this.hyperlinkSettings = settings;

-	}

-

-	public void setURLListener(IHyperlinkListener urlListener) {

-		this.urlListener = urlListener;

-	}

-

-	private void reset() {

-		if (paragraphs == null)

-			paragraphs = new Vector();

-		paragraphs.clear();

-		selectedLinkIndex = -1;

-		hyperlinks = null;

-	}

-

-	IHyperlinkSegment[] getHyperlinks() {

-		if (hyperlinks != null || paragraphs == null)

-			return hyperlinks;

-		Vector result = new Vector();

-		for (int i = 0; i < paragraphs.size(); i++) {

-			IParagraph p = (IParagraph) paragraphs.get(i);

-			IParagraphSegment[] segments = p.getSegments();

-			for (int j = 0; j < segments.length; j++) {

-				if (segments[j] instanceof IHyperlinkSegment)

-					result.add(segments[j]);

-			}

-		}

-		hyperlinks =

-			(IHyperlinkSegment[]) result.toArray(

-				new IHyperlinkSegment[result.size()]);

-		return hyperlinks;

-	}

-

-	public IHyperlinkSegment findHyperlinkAt(int x, int y) {

-		IHyperlinkSegment[] links = getHyperlinks();

-		for (int i = 0; i < links.length; i++) {

-			if (links[i].contains(x, y))

-				return links[i];

-		}

-		return null;

-	}

-	public ITextSegment findSegmentAt(int x, int y) {

-		for (int i = 0; i < paragraphs.size(); i++) {

-			IParagraph p = (IParagraph) paragraphs.get(i);

-			ITextSegment segment = p.findSegmentAt(x, y);

-			if (segment != null)

-				return segment;

-		}

-		return null;

-	}

-

-	public IHyperlinkSegment getSelectedLink() {

-		if (selectedLinkIndex == -1)

-			return null;

-		return hyperlinks[selectedLinkIndex];

-	}

-

-	public boolean traverseLinks(boolean next) {

-		IHyperlinkSegment[] links = getHyperlinks();

-		if (links == null)

-			return false;

-		int size = links.length;

-		if (next) {

-			selectedLinkIndex++;

-		} else

-			selectedLinkIndex--;

-

-		if (selectedLinkIndex < 0 || selectedLinkIndex > size - 1) {

-			selectedLinkIndex = -1;

-		}

-		return selectedLinkIndex != -1;

-	}

-

-	public void selectLink(IHyperlinkSegment link) {

-		if (link == null)

-			selectedLinkIndex = -1;

-		else {

-			IHyperlinkSegment[] links = getHyperlinks();

-			selectedLinkIndex = -1;

-			if (links == null)

-				return;

-			for (int i = 0; i < links.length; i++) {

-				if (links[i].equals(link)) {

-					selectedLinkIndex = i;

-					break;

-				}

-			}

-		}

-	}

-

-	public boolean hasFocusSegments() {

-		IHyperlinkSegment[] links = getHyperlinks();

-		if (links.length > 0)

-			return true;

-		return false;

-	}

-

-	public void dispose() {

-		if (hyperlinkSettings instanceof LocalHyperlinkSettings)

-			hyperlinkSettings.dispose();

-	}

-}

diff --git a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/engine/TextSegment.java b/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/engine/TextSegment.java
deleted file mode 100644
index 49ec5d1..0000000
--- a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/engine/TextSegment.java
+++ /dev/null
@@ -1,368 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2000, 2003 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials 

- * are made available under the terms of the Common Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/cpl-v10.html

- * 

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-package org.eclipse.update.ui.forms.internal.engine;

-

-import org.eclipse.swt.graphics.*;

-import org.eclipse.jface.resource.JFaceResources;

-import java.util.Hashtable;

-import org.eclipse.swt.SWT;

-import java.text.BreakIterator;

-import java.util.Vector;

-

-/**

- * @version 	1.0

- * @author

- */

-public class TextSegment extends ParagraphSegment implements ITextSegment {

-	private Color color;

-	private String fontId;

-	private String text;

-	protected boolean underline;

-	private boolean wrapAllowed = true;

-	protected Vector areaRectangles = new Vector();

-	

-	class AreaRectangle {

-		Rectangle rect;

-		int from, to;

-		public AreaRectangle(Rectangle rect, int from, int to) {

-			this.rect = rect;

-			this.from = from;

-			this.to = to;

-		}

-		public boolean contains(int x, int y) {

-			return rect.contains(x, y);

-		}

-		public String getText() {

-			if (from==0 && to== -1)

-				return TextSegment.this.getText();

-			if (from >0 && to == -1)

-				return TextSegment.this.getText().substring(from);

-			return TextSegment.this.getText().substring(from, to);

-		}

-	}

-	

-	public TextSegment(String text, String fontId) {

-		this.text = cleanup(text);

-		this.fontId = fontId;

-	}

-

-	private String cleanup(String text) {

-		StringBuffer buf = new StringBuffer();

-		for (int i = 0; i < text.length(); i++) {

-			char c = text.charAt(i);

-			if (c == '\n' || c == '\r' || c=='\f') {

-				if (i > 0)

-					buf.append(' ');

-			} else

-				buf.append(c);

-		}

-		return buf.toString();

-	}

-

-	public void setWordWrapAllowed(boolean value) {

-		wrapAllowed = value;

-	}

-

-	public boolean isWordWrapAllowed() {

-		return wrapAllowed;

-	}

-	

-	public boolean isSelectable() {

-		return false;

-	}

-

-	public Color getColor() {

-		return color;

-	}

-

-	public Font getFont() {

-		if (fontId == null)

-			return JFaceResources.getDefaultFont();

-		else

-			return JFaceResources.getFontRegistry().get(fontId);

-	}

-

-	public String getText() {

-		return text;

-	}

-

-	void setText(String text) {

-		this.text = cleanup(text);

-	}

-

-	void setColor(Color color) {

-		this.color = color;

-	}

-

-	void setFontId(String fontId) {

-		this.fontId = fontId;

-	}

-

-	public boolean contains(int x, int y) {

-		for (int i = 0; i < areaRectangles.size(); i++) {

-			AreaRectangle ar = (AreaRectangle) areaRectangles.get(i);

-			if (ar.contains(x, y))

-				return true;

-		}

-		return false;

-	}

-	

-	public Rectangle getBounds() {

-		int x=0, y=0;

-		int width = 0, height = 0;

-		

-		for (int i=0; i<areaRectangles.size(); i++) {

-			AreaRectangle ar = (AreaRectangle)areaRectangles.get(i);

-			if (i==0) y = ar.rect.y;

-			x = Math.min(ar.rect.x, x);

-			width = Math.max(ar.rect.width, width);

-			height += ar.rect.height;

-		}

-		return new Rectangle(x, y, width, height);

-	}

-

-	public void advanceLocator(

-		GC gc,

-		int wHint,

-		Locator locator,

-		Hashtable objectTable) {

-		Font oldFont = null;

-		if (fontId != null) {

-			oldFont = gc.getFont();

-			gc.setFont(getFont());

-		}

-		FontMetrics fm = gc.getFontMetrics();

-		int lineHeight = fm.getHeight();

-

-		if (wHint == SWT.DEFAULT || !wrapAllowed) {

-			Point extent = gc.textExtent(text);

-

-			if (locator.x + extent.x > wHint) {

-				// new line

-				locator.x = isSelectable()?locator.indent+1:locator.indent;

-				locator.y += locator.rowHeight;

-				locator.rowHeight = 0;

-			}

-			int width = extent.x;

-			if (isSelectable()) width+=2;

-			locator.x += width;

-			locator.width = width;

-			locator.height = extent.y;

-			locator.rowHeight = Math.max(locator.rowHeight, extent.y);

-			return;

-		}

-

-		BreakIterator wb = BreakIterator.getLineInstance();

-		wb.setText(text);

-

-		int saved = 0;

-		int last = 0;

-

-		int width = 0;

-

-		Point lastExtent = null;

-

-		for (int loc = wb.first(); loc != BreakIterator.DONE; loc = wb.next()) {

-			String word = text.substring(saved, loc);

-			Point extent = gc.textExtent(word);

-

-			if (locator.x + extent.x > wHint) {

-				// overflow

-				String savedWord = text.substring(saved, last);

-				if (lastExtent==null)

-				   lastExtent = gc.textExtent(savedWord);

-				int lineWidth = locator.x + lastExtent.x;

-				if (isSelectable()) lineWidth+=2;

-

-				saved = last;

-				locator.rowHeight = Math.max(locator.rowHeight, lastExtent.y);

-				locator.x = isSelectable()?locator.indent+1:locator.indent;

-				locator.y += locator.rowHeight;

-				locator.rowHeight = 0;

-				width = Math.max(width, lineWidth);

-			}

-			last = loc;

-			lastExtent = extent;

-		}

-		String lastString = text.substring(saved, last);

-		Point extent = gc.textExtent(lastString);

-		int lineWidth = extent.x;

-		if (isSelectable()) lineWidth += 2;

-		locator.x += lineWidth;

-		locator.width = width;

-		locator.height = lineHeight;

-		locator.rowHeight = Math.max(locator.rowHeight, extent.y);

-		if (oldFont != null) {

-			gc.setFont(oldFont);

-		}

-	}

-	

-	public void paint(

-		GC gc,

-		int width,

-		Locator locator,

-		Hashtable objectTable,

-		boolean selected) {

-		Font oldFont = null;

-		Color oldColor = null;

-

-		areaRectangles.clear();

-

-		if (fontId != null) {

-			oldFont = gc.getFont();

-			gc.setFont(getFont());

-		}

-		if (color != null) {

-			oldColor = gc.getForeground();

-			gc.setForeground(color);

-		}

-		FontMetrics fm = gc.getFontMetrics();

-		int lineHeight = fm.getHeight();

-		int descent = fm.getDescent();

-

-		if (!wrapAllowed) {

-			Point extent = gc.textExtent(text);

-			int ewidth = extent.x;

-			if (isSelectable()) ewidth += 2;

-

-			if (locator.x + ewidth > width) {

-				// new line

-				locator.resetCaret();

-				if (isSelectable()) locator.x += 1;

-				locator.y += locator.rowHeight;

-				locator.rowHeight = 0;

-			}

-			gc.drawString(text, locator.x, locator.y);

-			if (underline) {

-				int lineY = locator.y + lineHeight - descent + 1;

-				gc.drawLine(locator.x, lineY, locator.x + extent.x, lineY);

-			}

-			Rectangle br =

-				new Rectangle(locator.x - 1, locator.y, extent.x + 2, lineHeight - descent + 3);

-			areaRectangles.add(new AreaRectangle(br, 0, -1));

-			if (selected) {

-				if (color != null)

-					gc.setForeground(oldColor);

-				gc.drawFocus(br.x, br.y, br.width, br.height);

-			}

-

-			locator.x += ewidth;

-			locator.width = ewidth;

-			locator.height = lineHeight;

-			locator.rowHeight = Math.max(locator.rowHeight, extent.y);

-			if (oldFont != null) {

-				gc.setFont(oldFont);

-			}

-			if (oldColor != null) {

-				gc.setForeground(oldColor);

-			}

-			return;

-		}

-

-		BreakIterator wb = BreakIterator.getLineInstance();

-		wb.setText(text);

-

-		int saved = 0;

-		int last = 0;

-

-		for (int loc = wb.first(); loc != BreakIterator.DONE; loc = wb.next()) {

-			if (loc == 0)

-				continue;

-			String word = text.substring(saved, loc);

-			Point extent = gc.textExtent(word);

-			int ewidth = extent.x;

-			if (isSelectable()) ewidth += 2;

-

-			if (locator.x + ewidth > width) {

-				// overflow

-				String prevLine = text.substring(saved, last);

-				gc.drawString(prevLine, locator.x, locator.y, true);

-				Point prevExtent = gc.textExtent(prevLine);

-				int prevWidth = prevExtent.x;

-				if (isSelectable()) prevWidth += 2;

-

-				if (underline) {

-					int lineY = locator.y + lineHeight - descent + 1;

-					gc.drawLine(locator.x, lineY, locator.x + prevWidth, lineY);

-				}

-				Rectangle br =

-					new Rectangle(

-						locator.x - 1,

-						locator.y,

-						prevExtent.x + 2,

-						lineHeight - descent + 3);

-				if (selected) {

-					if (color != null)

-						gc.setForeground(oldColor);

-					gc.drawFocus(br.x, br.y, br.width, br.height);

-					if (color != null)

-						gc.setForeground(color);

-				}

-				areaRectangles.add(new AreaRectangle(br, saved, last));

-				

-				locator.rowHeight = Math.max(locator.rowHeight, prevExtent.y);

-				locator.resetCaret();

-				if (isSelectable()) locator.x +=1;

-				locator.y += locator.rowHeight;

-				locator.rowHeight = 0;

-				saved = last;

-			}

-			last = loc;

-		}

-		// paint the last line

-		String lastLine = text.substring(saved, last);

-		gc.drawString(lastLine, locator.x, locator.y, true);

-		Point lastExtent = gc.textExtent(lastLine);

-		int lastWidth = lastExtent.x;

-		if (isSelectable()) lastWidth += 2;

-		Rectangle br =

-			new Rectangle(

-				locator.x - 1,

-				locator.y,

-				lastExtent.x + 2,

-				lineHeight - descent + 3);

-		areaRectangles.add(new AreaRectangle(br, saved, last));

-		if (underline) {

-			int lineY = locator.y + lineHeight - descent + 1;

-			gc.drawLine(locator.x, lineY, locator.x + lastExtent.x, lineY);

-		}

-		if (selected) {

-			if (color != null)

-				gc.setForeground(oldColor);

-			gc.drawFocus(br.x, br.y, br.width, br.height);

-		}

-		locator.x += lastWidth;

-		locator.rowHeight = Math.max(locator.rowHeight, lastExtent.y);

-		if (oldFont != null) {

-			gc.setFont(oldFont);

-		}

-		if (oldColor != null) {

-			gc.setForeground(oldColor);

-		}

-	}

-	

-	public void paintFocus(GC gc, Color bg, Color fg, boolean selected) {

-		if (areaRectangles==null) return;

-		for (int i=0; i<areaRectangles.size(); i++) {

-			AreaRectangle areaRectangle = (AreaRectangle)areaRectangles.get(i);

-			Rectangle br = areaRectangle.rect;

-			if (selected) {

-				gc.setBackground(bg);

-				gc.setForeground(fg);

-				gc.drawFocus(br.x, br.y, br.width, br.height);

-			}

-			else {

-				gc.setForeground(bg);

-				gc.drawRectangle(br.x, br.y, br.width-1, br.height-1);

-			}

-		}

-	}	

-}

diff --git a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/index.xml b/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/index.xml
deleted file mode 100644
index ea4421b..0000000
--- a/update/org.eclipse.update.ui.forms/src/org/eclipse/update/ui/forms/internal/index.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<form>

-<p>

-To check for updates for features you have installed, 

-go to the <a href="action1">My Eclipse</a> and select 

-<b>Available Updates</b> folder. <b>Search page</b> will 

-be shown allowing you to initiate and customize the search.

-</p>

-<li style="text" value="1.">To check for updates for features you have installed, 

-go to the <a href="action1">My Eclipse</a> and select 

-<b>Available Updates</b> folder. <b>Search page</b> will 

-be shown allowing you to initiate and customize the search.</li>

-<li style="text" value="2.">This is the item number 2.</li>

-<li style="text" value="3.">This is the item number 3.</li>

-</form>
\ No newline at end of file
diff --git a/update/org.eclipse.update.ui.win32/src/org/eclipse/update/internal/ui/win32/views/IEmbeddedWebBrowser.java b/update/org.eclipse.update.ui.win32/src/org/eclipse/update/internal/ui/win32/views/IEmbeddedWebBrowser.java
new file mode 100644
index 0000000..b458efa
--- /dev/null
+++ b/update/org.eclipse.update.ui.win32/src/org/eclipse/update/internal/ui/win32/views/IEmbeddedWebBrowser.java
@@ -0,0 +1,15 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials 
+ * are made available under the terms of the Common Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
+ * 
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.update.internal.ui.win32.views;
+
+public interface IEmbeddedWebBrowser {
+	public void openTo(String url);
+}
diff --git a/update/org.eclipse.update.ui.win32/src/org/eclipse/update/internal/ui/win32/views/WebBrowserView.java b/update/org.eclipse.update.ui.win32/src/org/eclipse/update/internal/ui/win32/views/WebBrowserView.java
index 8823efc..f24afcd 100644
--- a/update/org.eclipse.update.ui.win32/src/org/eclipse/update/internal/ui/win32/views/WebBrowserView.java
+++ b/update/org.eclipse.update.ui.win32/src/org/eclipse/update/internal/ui/win32/views/WebBrowserView.java
@@ -20,7 +20,6 @@
 import org.eclipse.ui.help.WorkbenchHelp;
 import org.eclipse.ui.part.ViewPart;
 import org.eclipse.update.internal.ui.*;
-import org.eclipse.update.internal.ui.views.IEmbeddedWebBrowser;
 
 public class WebBrowserView extends ViewPart implements IEmbeddedWebBrowser {
 	// NL
diff --git a/update/org.eclipse.update/.classpath b/update/org.eclipse.update/.classpath
deleted file mode 100644
index f12531d..0000000
--- a/update/org.eclipse.update/.classpath
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-    <classpathentry kind="src" path="src"/>
-    <classpathentry kind="var" path="JRE_LIB" rootpath="JRE_SRCROOT" sourcepath="JRE_SRC"/>
-    <classpathentry kind="var"
-        path="ECLIPSE_HOME/plugins/org.eclipse.core.boot/boot.jar" sourcepath="ECLIPSE_HOME/plugins/org.eclipse.core.boot/bootsrc.zip"/>
-    <classpathentry kind="var"
-        path="ECLIPSE_HOME/plugins/org.eclipse.core.runtime/runtime.jar" sourcepath="ECLIPSE_HOME/plugins/org.eclipse.core.runtime/runtimesrc.zip"/>
-    <classpathentry kind="var"
-        path="ECLIPSE_HOME/plugins/org.eclipse.swt/swt.jar" sourcepath="ECLIPSE_HOME/plugins/org.eclipse.swt/swtsrc.zip"/>
-    <classpathentry kind="var"
-        path="ECLIPSE_HOME/plugins/org.eclipse.ui/workbench.jar" sourcepath="ECLIPSE_HOME/plugins/org.eclipse.ui/workbenchsrc.zip"/>
-    <classpathentry kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.webdav/webdav.jar"/>
-    <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/update/org.eclipse.update/.cvsignore b/update/org.eclipse.update/.cvsignore
deleted file mode 100644
index c5e82d7..0000000
--- a/update/org.eclipse.update/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
\ No newline at end of file
diff --git a/update/org.eclipse.update/.vcm_meta b/update/org.eclipse.update/.vcm_meta
deleted file mode 100644
index 7655f8d..0000000
--- a/update/org.eclipse.update/.vcm_meta
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<project-description>

-	<comment></comment>

-	<nature id="org.eclipse.jdt.core.javanature"/>

-	<builder name="org.eclipse.jdt.core.javabuilder">

-	</builder>

-</project-description>

diff --git a/update/org.eclipse.update/about.html b/update/org.eclipse.update/about.html
deleted file mode 100644
index 9a15e5c..0000000
--- a/update/org.eclipse.update/about.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<html>

-<head>

-<title>About</title>

-<style type="text/css">

-p, table, td, th { font-family: arial, helvetica, geneva; font-size: 10pt}

-pre { font-family: "Courier New", Courier, mono; font-size: 10pt}

-h2 { font-family: arial, helvetica, geneva; font-size: 18pt; font-weight: bold ; line-height: 14px}

-code { font-family: "Courier New", Courier, mono; font-size: 10pt}

-sup { font-family: arial,helvetica,geneva; font-size: 10px}

-h3 { font-family: arial, helvetica, geneva; font-size: 14pt; font-weight: bold}

-li { font-family: arial, helvetica, geneva; font-size: 10pt}

-h1 { font-family: arial, helvetica, geneva; font-size: 28px; font-weight: bold}

-body { font-family: arial, helvetica, geneva; font-size: 10pt; clip: rect(   ); margin-top: 5mm; margin-left: 3mm}

-</style>

-</head>

-<body>

-<body lang=EN-US link=blue vlink=purple>

-<table border=0 cellspacing=5 cellpadding=2 width="100%" >

-  <tr> 

-    <td align=LEFT valign=TOP colspan="2" bgcolor="#0080C0"><b><font color="#FFFFFF" face="Arial,Helvetica">About This Plug-in</font></b></td>

-  </tr>

-  <tr> 

-    <td> 

-<p>1st November, 2001</p>	

-<h3>License</h3>

-<p>Eclipse.org makes available all content in this plug-in.  The plug-in is provided to you under the terms and conditions of the

-<a href="http://www.eclipse.org/legal/cpl-v05.html">Common Public License Version 0.5</a>.  For purposes of the Common Public License, &quot;Program&quot; will mean the plug-in.</p>

-</td></tr></table>

-</body>

-</html>
\ No newline at end of file
diff --git a/update/org.eclipse.update/build.properties b/update/org.eclipse.update/build.properties
deleted file mode 100644
index ac7da03..0000000
--- a/update/org.eclipse.update/build.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-source.update.jar=src/

-bin.includes=plugin.xml,icons/,plugin.properties,*.jar,about.html

diff --git a/update/org.eclipse.update/icons/full/ctool16/new.gif b/update/org.eclipse.update/icons/full/ctool16/new.gif
deleted file mode 100644
index d16d5b0..0000000
--- a/update/org.eclipse.update/icons/full/ctool16/new.gif
+++ /dev/null
Binary files differ
diff --git a/update/org.eclipse.update/icons/full/ctool16/update.gif b/update/org.eclipse.update/icons/full/ctool16/update.gif
deleted file mode 100644
index f011d8a..0000000
--- a/update/org.eclipse.update/icons/full/ctool16/update.gif
+++ /dev/null
Binary files differ
diff --git a/update/org.eclipse.update/icons/full/wizban/new.gif b/update/org.eclipse.update/icons/full/wizban/new.gif
deleted file mode 100644
index 2a0c793..0000000
--- a/update/org.eclipse.update/icons/full/wizban/new.gif
+++ /dev/null
Binary files differ
diff --git a/update/org.eclipse.update/icons/full/wizban/revert.gif b/update/org.eclipse.update/icons/full/wizban/revert.gif
deleted file mode 100644
index d7402a2..0000000
--- a/update/org.eclipse.update/icons/full/wizban/revert.gif
+++ /dev/null
Binary files differ
diff --git a/update/org.eclipse.update/icons/full/wizban/update.gif b/update/org.eclipse.update/icons/full/wizban/update.gif
deleted file mode 100644
index 4ff15da..0000000
--- a/update/org.eclipse.update/icons/full/wizban/update.gif
+++ /dev/null
Binary files differ
diff --git a/update/org.eclipse.update/plugin.properties b/update/org.eclipse.update/plugin.properties
deleted file mode 100644
index 9c052ee..0000000
--- a/update/org.eclipse.update/plugin.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-S_Eclipse_Update_Manager_Plugin = Install/Update Manager

-S_Software_Updates = &Software Updates

-S_Software_Updates_Preferences = Software Updates

diff --git a/update/org.eclipse.update/plugin.xml b/update/org.eclipse.update/plugin.xml
deleted file mode 100644
index 87f8787..0000000
--- a/update/org.eclipse.update/plugin.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!-- File written by PDE 1.0 -->

-<plugin

-   id="org.eclipse.update"

-   name="%S_Eclipse_Update_Manager_Plugin"

-   version="1.0"

-   provider-name="International Business Machines Corp."

-   class="org.eclipse.update.internal.core.UpdateManagerPlugin">

-<requires>

-   <import plugin="org.eclipse.core.runtime"/>

-   <import plugin="org.eclipse.ui"/>

-   <import plugin="org.eclipse.webdav"/>

-</requires>

-

-<runtime>

-   <library name="update.jar"/>

-</runtime>

-

-<!-- ================================================================================= -->

-<!--                                                                                   -->

-<!-- Update Manager Help Menu Action Set                                               -->

-<!--                                                                                   -->

-<!-- ================================================================================= -->

-<extension

-      point="org.eclipse.ui.actionSets">

-   <actionSet

-         label="%S_Software_Updates"

-         visible="false"

-         id="org.eclipse.update.internal.ui.UpdateManagerActionSet">

-      <action

-            label="%S_Software_Updates"

-            class="org.eclipse.update.internal.ui.UMDialogAction"

-            menubarPath="help/helpEnd"

-            id="org.eclipse.update.internal.ui.UpdateManagerAction">

-      </action>

-   </actionSet>

-</extension>

-<!-- ============================================================================================ -->

-<!--                                                                                              -->

-<!-- Update Manager Application                                                                   -->

-<!--                                                                                              -->

-<!-- ============================================================================================ -->

-<extension

-      id="updateManager"

-      point="org.eclipse.core.runtime.applications">

-   <application>

-      <run

-            class="org.eclipse.update.internal.ui.UMApplicationUserInterface">

-      </run>

-   </application>

-</extension>

-</plugin>

diff --git a/update/org.eclipse.update/plugin.xml.off b/update/org.eclipse.update/plugin.xml.off
deleted file mode 100644
index 8a83831..0000000
--- a/update/org.eclipse.update/plugin.xml.off
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<!-- Eclipse Update Manager Plugin -->

-

-<plugin

-    id          = "org.eclipse.update"

-    name        = "%S_Eclipse_Update_Manager_Plugin"

-    version     = "1.0"

-    provider-name = "International Business Machines Corp."

-    class       = "org.eclipse.update.internal.core.UpdateManagerPlugin">

-

-    <requires>

-        <import plugin="org.eclipse.core.runtime"/>

-        <import plugin="org.eclipse.ui"/>

-        <import plugin="org.eclipse.webdav"/>

-    </requires>

-

-    <runtime>

-        <library name="update.jar" />

-    </runtime>

-

-    <!-- ================================================================================= -->

-    <!--                                                                                   -->

-    <!-- Update Manager Preference Page Settings                                           -->

-    <!--                                                                                   -->

-    <!-- ================================================================================= -->

-    <extension point="org.eclipse.ui.preferencePages">

-        <page id       = "UMPreferencePageSettings"

-              name     = "%S_Software_Updates_Preferences"

-              class    = "org.eclipse.update.internal.ui.UMPreferencePageSettings">

-        </page>

-    </extension>

-

-    <!-- ================================================================================= -->

-    <!--                                                                                   -->

-    <!-- Update Manager Help Menu Action Set                                               -->

-    <!--                                                                                   -->

-    <!-- ================================================================================= -->

-    <extension point="org.eclipse.ui.actionSets">

-        <actionSet

-            id      = "org.eclipse.update.internal.ui.UpdateManagerActionSet"

-            label   = "%S_Software_Updates"

-            visible = "true">

-            <action id          = "org.eclipse.update.internal.ui.UpdateManagerAction"

-                    menubarPath = "help/helpEnd"

-                    label       = "%S_Software_Updates"

-                    class       = "org.eclipse.update.internal.ui.UMDialogAction"/>

-        </actionSet>

-    </extension>

-

-    <!-- ============================================================================================ -->

-    <!--                                                                                              -->

-    <!-- Update Manager Application                                                                   -->

-    <!--                                                                                              -->

-    <!-- ============================================================================================ -->

-    <extension id="updateManager" point="org.eclipse.core.runtime.applications">

-        <application>

-            <run class="org.eclipse.update.internal.ui.UMApplicationUserInterface">

-            </run>

-        </application>

-    </extension>

-</plugin>

diff --git a/update/org.eclipse.update/src/org/eclipse/update/internal/core/ISessionDefiner.java b/update/org.eclipse.update/src/org/eclipse/update/internal/core/ISessionDefiner.java
deleted file mode 100644
index 626ca05..0000000
--- a/update/org.eclipse.update/src/org/eclipse/update/internal/core/ISessionDefiner.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.eclipse.update.internal.core;

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

-

-/**

- */

-import org.eclipse.core.internal.boot.update.*;

-

-public interface ISessionDefiner {

-/**

- * Creates one or more operations for the current session.

- */

-void defineOperations( UMSessionManagerSession session, IInstallable[] descriptors, boolean bVerifyJars );

-}

diff --git a/update/org.eclipse.update/src/org/eclipse/update/internal/core/IUMLock.java b/update/org.eclipse.update/src/org/eclipse/update/internal/core/IUMLock.java
deleted file mode 100644
index c25c907..0000000
--- a/update/org.eclipse.update/src/org/eclipse/update/internal/core/IUMLock.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package org.eclipse.update.internal.core;

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

-

-/**

- */

-public interface IUMLock {

-/**

- * Checks to see if the UMLock file is there.  If yes, returns true

- */

-public boolean exists();

-/**

- */

-void remove();

-/**

- */

-void set();

-/**

- */

-void set(String msg);

-}

diff --git a/update/org.eclipse.update/src/org/eclipse/update/internal/core/UMLock.java b/update/org.eclipse.update/src/org/eclipse/update/internal/core/UMLock.java
deleted file mode 100644
index 5c08d9a..0000000
--- a/update/org.eclipse.update/src/org/eclipse/update/internal/core/UMLock.java
+++ /dev/null
@@ -1,97 +0,0 @@
-package org.eclipse.update.internal.core;

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

-

-/**

- */

-import org.eclipse.core.internal.boot.update.*;

-import java.io.*;

-import java.net.*;

-public class UMLock implements IUMLock {

-	File file = null;

-/**

- * UMLock constructor comment.

- */

-public UMLock() {

-	super();

-	URL lockfileURL = null;

-	try {

-		lockfileURL = new URL(UMEclipseTree.getInstallTreeURL(), IManifestAttributes.UM_LOCK);

-	} catch (MalformedURLException ex) {

-	}

-	file = getFile(lockfileURL);

-}

-/**

- * Checks to see if the UMLock file is there.  If yes, returns true

- */

-public boolean exists() {

-	

-	if (file != null) {

-		if (file.exists() == true) {

-			return true;

-		}

-	}

-	return false;

-}

-/**

- */

-public static File getFile(URL url) {

-	File file = null;

-	if (url != null) {

-

-		// Convert the URL to a string

-		//----------------------------

-		String strFilespec = UMEclipseTree.getFileInPlatformString(url);

-

-		file = new File(strFilespec);

-	}

-	return file;

-}

-/**

- */

-public void remove() {

-	if (exists())

-		file.delete();

-		

-}

-/**

- */

-public void set() {

-	set("");

-}

-/**

- */

-public void set(String msg) {

-	URL lockfileURL = null;

-	try {

-		lockfileURL = new URL(UMEclipseTree.getInstallTreeURL(), IManifestAttributes.UM_LOCK);

-	} catch (MalformedURLException ex) {

-	}

-	

-	// Create a lock file

-	//-------------------

-	Log lockfile = new Log();

-

-	try {

-		lockfile.load(lockfileURL);		// creates file if it doesn't exist

-	}

-	catch (LogStoreException ex) {

-		return;

-	}

-

-	// Add an entry

-	//-------------

-	LogEntry lockEntry = new LogEntry( lockfile, msg );

-	lockfile.addChildEntry( lockEntry );

-

-

-	try {

-		lockfile.save(lockfileURL);

-	}

-	catch (LogStoreException ex) {

-		return;

-	}

-}

-}

diff --git a/update/org.eclipse.update/src/org/eclipse/update/internal/core/UMSessionDefinerReferenceUpdate.java b/update/org.eclipse.update/src/org/eclipse/update/internal/core/UMSessionDefinerReferenceUpdate.java
deleted file mode 100644
index 240091b..0000000
--- a/update/org.eclipse.update/src/org/eclipse/update/internal/core/UMSessionDefinerReferenceUpdate.java
+++ /dev/null
@@ -1,216 +0,0 @@
-package org.eclipse.update.internal.core;

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

-

-/**

- */

-import org.eclipse.core.internal.boot.update.*;

-import org.eclipse.core.internal.boot.LaunchInfo;

-

-public class UMSessionDefinerReferenceUpdate implements ISessionDefiner {

-/**

- * UMUpdaterCached constructor comment.

- */

-public UMSessionDefinerReferenceUpdate() {

-	super();

-}

-/**

- * Creates one or more operations for the current parcel.

- */

-public void defineComponentOperation(UMSessionManagerParcel parcel, IInstallable descriptor, boolean bVerifyJars) {

-

-	IComponentDescriptor componentDescriptor = null;

-

-	if (descriptor instanceof IComponentDescriptor) {

-		componentDescriptor = (IComponentDescriptor) descriptor;

-	}

-	else if (descriptor instanceof IComponentEntryDescriptor) {

-		componentDescriptor = ((IComponentEntryDescriptor) descriptor).getComponentDescriptor();

-	}

-	if (componentDescriptor == null)

-		return; 

-

-	UMSessionManagerOperation operation = null;

-

-	// Create download operation

-	//--------------------------

-	operation = parcel.createOperation();

-	operation.setAction(UpdateManagerConstants.OPERATION_COPY);

-	operation.setId(componentDescriptor.getUniqueIdentifier());

-	operation.setSource(componentDescriptor.getDownloadURL().toExternalForm());

-	String downloadTarget = UMEclipseTree.getStagingArea().toExternalForm() + componentDescriptor.getDirName() + ".jar";

-	operation.setTarget(downloadTarget);

-	operation.setData(descriptor);

-

-	// Create jar verification operation

-	//----------------------------------

-	if (bVerifyJars == true) {

-		operation = parcel.createOperation();

-		operation.setAction(UpdateManagerConstants.OPERATION_VERIFY_JAR);

-		operation.setId(componentDescriptor.getUniqueIdentifier());

-		operation.setSource(downloadTarget);

-		operation.setTarget(null);

-		operation.setData(descriptor);

-	}

-

-	// Create apply operation for component files (files not in plugins/ dir structure)

-	//---------------------------------------------------------------------------------

-	operation = parcel.createOperation();

-	operation.setAction(UpdateManagerConstants.OPERATION_UNZIP_INSTALL);

-	operation.setId(componentDescriptor.getUniqueIdentifier());

-	operation.setSource(downloadTarget);

-	String applyTarget = UMEclipseTree.getBaseInstallURL().toExternalForm();

-	//	String applyTarget = "file:///c:/temp/x/" ;

-	operation.setTarget(applyTarget);

-	operation.setData(descriptor);

-

-	// Create apply operation for plug-ins		

-	//------------------------------------

-	IPluginEntryDescriptor[] plugins = componentDescriptor.getPluginEntries();

-	IFragmentEntryDescriptor[] fragments = componentDescriptor.getFragmentEntries();

-	if ((plugins.length > 0) || (fragments.length >0)) {

-		operation = parcel.createOperation();

-		operation.setAction(UpdateManagerConstants.OPERATION_UNZIP_PLUGINS);

-		operation.setId(componentDescriptor.getUniqueIdentifier());

-		operation.setSource(downloadTarget);

-		// by specifiying the install dir with a trailing slash, the unzip method

-		// will just unzip the contents of the jar into the dir

-		applyTarget = UMEclipseTree.getBaseInstallURL().toExternalForm();

-		//	applyTarget = "file:///c:/temp/x/" ;

-		operation.setTarget(applyTarget);

-		operation.setData(descriptor);

-	}

-

-}

-/**

- * Creates one or more operations for the current session.

- */

-public void defineOperations(UMSessionManagerSession session, IInstallable[] descriptors, boolean bVerifyJars) {

-

-	for (int i = 0; i < descriptors.length; ++i) {

-

-		// Products

-		//---------

-		if (descriptors[i] instanceof IProductDescriptor) {

-

-			UMSessionManagerParcel parcel = null;

-

-			// Create parcel

-			//--------------

-			parcel = session.createParcel();

-			parcel.setType(IManifestAttributes.PRODUCT);

-			parcel.setAction(UpdateManagerConstants.OPERATION_ACTION_INSTALL);

-			parcel.setId(((IProductDescriptor) descriptors[i]).getUniqueIdentifier());

-			parcel.setData((IProductDescriptor) descriptors[i]);

-

-			defineProductOperation(parcel, descriptors[i], bVerifyJars);

-		}

-

-		// Components

-		//-----------

-		else if (descriptors[i] instanceof IComponentDescriptor) {

-

-			UMSessionManagerParcel parcel = null;

-

-			// Create parcel

-			//--------------

-			parcel = session.createParcel();

-			parcel.setType(IManifestAttributes.COMPONENT);

-			parcel.setAction(UpdateManagerConstants.OPERATION_ACTION_INSTALL);

-			parcel.setId(((IComponentDescriptor) descriptors[i]).getUniqueIdentifier());

-			parcel.setData((IComponentDescriptor) descriptors[i]);

-

-			defineComponentOperation(parcel, descriptors[i], bVerifyJars);

-		}

-

-		// Component Entries

-		//------------------

-		else if (descriptors[i] instanceof IComponentEntryDescriptor) {

-

-			UMSessionManagerParcel parcel = null;

-

-			// Create parcel

-			//--------------

-			parcel = session.createParcel();

-			parcel.setType(IManifestAttributes.COMPONENT);

-			parcel.setAction(UpdateManagerConstants.OPERATION_ACTION_INSTALL);

-			parcel.setId(((IComponentEntryDescriptor) descriptors[i]).getUniqueIdentifier());

-			parcel.setData((IComponentEntryDescriptor) descriptors[i]);

-

-			defineComponentOperation(parcel, descriptors[i], bVerifyJars);

-		}

-	}

-}

-/**

- * Creates one or more operations for the current parcel.

- */

-public void defineProductOperation(UMSessionManagerParcel parcel, IInstallable descriptor, boolean bVerifyJars) {

-

-	IProductDescriptor productDescriptor = (IProductDescriptor) descriptor;

-	UMSessionManagerOperation operation = null;

-

-	// Create download operation

-	//--------------------------

-	operation = parcel.createOperation();

-	operation.setAction(UpdateManagerConstants.OPERATION_COPY);

-	operation.setId(productDescriptor.getUniqueIdentifier());

-	operation.setSource(productDescriptor.getDownloadURL().toExternalForm());

-	String downloadTarget = UMEclipseTree.getStagingArea().toString() + productDescriptor.getDirName() + ".jar";

-	operation.setTarget(downloadTarget);

-	operation.setData(productDescriptor);

-

-	// Create jar verification operation

-	//----------------------------------

-	if (bVerifyJars == true) {

-		operation = parcel.createOperation();

-		operation.setAction(UpdateManagerConstants.OPERATION_VERIFY_JAR);

-		operation.setId(productDescriptor.getUniqueIdentifier());

-		operation.setSource(downloadTarget);

-		operation.setTarget(null);

-		operation.setData(productDescriptor);

-	}

-

-	// Create apply operation for product files     

-	//-----------------------------------------

-	operation = parcel.createOperation();

-	operation.setAction(UpdateManagerConstants.OPERATION_UNZIP_INSTALL);

-	operation.setId(productDescriptor.getUniqueIdentifier());

-	operation.setSource(downloadTarget);

-	String applyTarget = UMEclipseTree.getBaseInstallURL().toExternalForm();

-	operation.setTarget(applyTarget);

-	operation.setData(productDescriptor);

-

-	// Create component sub-parcels

-	//-----------------------------

-	IComponentEntryDescriptor[] entries = productDescriptor.getComponentEntries();

-	for (int j = 0; j < entries.length; ++j) {

-		if (entries[j].isSelected()) {

-

-			UMSessionManagerParcel subparcel = null;

-			// Create parcel for each component

-			//---------------------------------

-			subparcel = parcel.createParcel();

-			subparcel.setType(IManifestAttributes.COMPONENT);

-			subparcel.setAction(UpdateManagerConstants.OPERATION_ACTION_INSTALL);

-			subparcel.setId(entries[j].getUniqueIdentifier());

-			subparcel.setData(entries[j]);

-

-			defineComponentOperation(subparcel, entries[j], bVerifyJars);

-		}

-	}

-

-	// Create apply operation for product files     

-	//-----------------------------------------

-	String app = LaunchInfo.getCurrent().getApplicationConfigurationIdentifier();

-	if ((app != null) && (app.equals(productDescriptor.getUniqueIdentifier()))) { 	// dominant app?

-		operation = parcel.createOperation();

-		operation.setAction(UpdateManagerConstants.OPERATION_UNZIP_BINDIR);

-		operation.setId(productDescriptor.getUniqueIdentifier());

-		operation.setSource(downloadTarget);

-		operation.setTarget(applyTarget);

-		operation.setData(productDescriptor);

-	}

-}

-}

diff --git a/update/org.eclipse.update/src/org/eclipse/update/internal/core/UMSessionManager.java b/update/org.eclipse.update/src/org/eclipse/update/internal/core/UMSessionManager.java
deleted file mode 100644
index ab379b5..0000000
--- a/update/org.eclipse.update/src/org/eclipse/update/internal/core/UMSessionManager.java
+++ /dev/null
@@ -1,351 +0,0 @@
-package org.eclipse.update.internal.core;

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

-

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.core.internal.boot.update.*;

-import java.io.*;

-import java.net.*;

-import java.util.*;

-

-/**

- * Session Manager executes defined sessions, and manages the update and update history logs.

- * Logs look like this:

- *

- * <session timestamp="xxxx" status="complete" attempts="1">

- *   <operation action="urltocache" status="complete" attempts="1">

- *      <parcel type="component" id="xxx" action="add" status="complete" attempts="1">

- *         <item id="xxx" source="file:///C:/temp/sample_in.java" target="file:///C:/temp/sample_out.java" status="complete" attempts="1">

- *            <message text="successful" timestamp="Thu Mar 01 09:56:49 EST 2001" />

- *         </item>

- *      </parcel>

- *   </operation>

- * </session>

- *

- *

- *  Each element is represented by an UpdateManagerXyz class and have specific

- * member functions for accessing domain specific attributes and child elements.

- * The "status" attribute can be one of "pending", "failed", or "complete".

- */

-

-public class UMSessionManager {

-	

-	protected Log _logUpdate  = null;

-	protected Log _logHistory = null;

-	

-	protected URL _urlUpdate  = null;

-	protected URL _urlHistory = null;

-

-	protected ArrayList _alUpdateSessions = new ArrayList();

-/**

- * Constructs an UpdateManager with the update log and history log URLs.

- * The boolean specifies whether an exception should be thrown if one of

- * the logs is not found.

- */

-public UMSessionManager(URL urlUpdateLog, URL urlHistoryLog, boolean notifyIfLogNotFound) throws LogStoreException {

-

-	_urlUpdate = urlUpdateLog;

-	_urlHistory = urlHistoryLog;

-

-	// Attempt to open the two logs

-	//-----------------------------

-	_logUpdate = new Log();

-	_logHistory = new Log();

-

-	// If the files do not exist

-	// notify if required.  Otherwise assume new files

-	//------------------------------------------------

-	try {

-		_logUpdate.load(_urlUpdate);

-	}

-	catch (LogStoreException ex) {

-//		_logUpdate.printEntryTree(0);

-		if (notifyIfLogNotFound == true) {

-			throw ex;

-		}

-	}

-

-	// Create the update session structure from the log

-	//-------------------------------------------------

-	buildTreeFromLog( _logUpdate );

-

-/*	

-	try {

-		_logHistory.load(_urlUpdate);

-	}

-	catch (LogStoreException ex) {

-		

-		if (notifyIfLogNotFound == true) {

-			throw ex;

-		}

-	}

-

-	_logHistory.printEntryTree(0);

-*/

-}

-/**

- * Creates a tree of sessions from the given log.

- * @param logUpdate org.eclipse.update.internal.core.Log

- * @param alUpdate java.util.ArrayList

- */

-private void buildTreeFromLog(Log logUpdate ) {

-	

-	ILogEntry[] entryChildren = logUpdate.getChildEntries();

-

-	UMSessionManagerSession session = null;

-	

-	for( int i=0; i<entryChildren.length; ++i )

-	{

-		session = new UMSessionManagerSession( entryChildren[i] );

-

-		_alUpdateSessions.add( session );

-		

-		session.buildTreeFromLog( entryChildren[i] );

-	}

-	

-	return;

-}

-/**

- * Creates a new update session where pending operations may be defined for

- * completion.

- * @return org.eclipse.update.internal.core.UMSessionManagerSession

- */

-public UMSessionManagerSession createUpdateSession() {

-

-	UMSessionManagerSession umSession = null;

-	

-	if( _logUpdate != null )

-	{

-		ILogEntry entrySession = new LogEntry( _logUpdate, UpdateManagerConstants.STRING_SESSION );

-		

-		_logUpdate.addChildEntry( entrySession );

-

-		umSession = new UMSessionManagerSession( entrySession );

-

-		umSession.buildTreeFromLog( entrySession );

-

-		_alUpdateSessions.add( umSession );

-	}

-	

-	return umSession;

-}

-/**

- * Runs all sessions

- */

-public boolean executePendingSessions(IProgressMonitor progressMonitor) {

-

-	// Run each of the failed sessions

-	//--------------------------------

-	boolean bSuccess = true;

-

-	UMSessionManagerSession session = null;

-

-	Iterator iter = _alUpdateSessions.iterator();

-

-	while (iter.hasNext() == true) {

-

-		session = (UMSessionManagerSession) iter.next();

-

-		if (session.getStatus().equals(UpdateManagerConstants.STATUS_PENDING) == true) {

-			if (session.execute(progressMonitor) == false) {

-				bSuccess = false;

-			}

-		}

-	}

-

-	return bSuccess;

-}

-/**

- * Runs one session

- */

-public boolean executeSession(UMSessionManagerSession session, IProgressMonitor progressMonitor) {

-

-	if (session == null)

-		return false;

-

-	// Run the session

-	//----------------

-	return session.execute(progressMonitor);

-}

-/**

- * Runs one session

- */

-public boolean executeSessionUndo(UMSessionManagerSession session, IProgressMonitor progressMonitor) {

-

-	if (session == null)

-		return false;

-

-	// Run the session

-	//----------------

-	return session.executeUndo(progressMonitor);

-}

-/**

- * Returns an array of sessions that are complete.

- * @return org.eclipse.update.internal.core.UMSessionManagerSession[]

- */

-private UMSessionManagerSession[] getUpdateSessionsCompleted() {

-

-	// Obtain the successfully completed sessions

-	//-------------------------------------------

-	UMSessionManagerSession session = null;

-

-	ArrayList alSessionsCompleted = new ArrayList();

-

-	Iterator iter = _alUpdateSessions.iterator();

-

-	while (iter.hasNext() == true) {

-

-		session = (UMSessionManagerSession) iter.next();

-

-		if (session.isComplete() == true) {

-			alSessionsCompleted.add(session);

-		}

-	}

-

-	Object[] objArray = alSessionsCompleted.toArray();

-	UMSessionManagerSession[] sessions = new UMSessionManagerSession[objArray.length];

-	System.arraycopy(objArray, 0, sessions, 0, objArray.length);

-

-	return sessions;

-}

-/**

- * Removes an existing update session

- *

- */

-private boolean removeUpdateSession(UMSessionManagerSession session) {

-

-	if (session != null && _logUpdate != null) {

-

-	    // Ensure session exists

-	    //----------------------

-		if (_alUpdateSessions.contains(session) == false) {

-			return false;

-		}

-

-		// Remove the log entry

-		//---------------------

-		if (session.getLogEntry() != null) {

-

-			if (_logUpdate.removeChildEntry(session.getLogEntry()) == false) {

-				return false;

-			}

-

-			// Remove the session

-			//-------------------

-			_alUpdateSessions.remove(session);

-		}

-	}

-

-	return true;

-}

-/**

- * Saves the current state of the update log.

- */

-public void saveUpdateLog() throws LogStoreException {

-	_logUpdate.save( _urlUpdate );

-}

-/**

- * Moves all completed sessions in the update log to the history log.

- * This method does not parse the history file.  Sessions are written to

- * the end of the history log and removed from the update log tree, and update

- * session tree.  The update log is saved.

- */

-public void updateAndSaveLogs() throws LogStoreException {

-

-	// Check for history log URL

-	// If none, save the update log

-	//-----------------------------

-	if (_urlHistory == null) {

-		saveUpdateLog();

-		return;

-	}

-

-	// Obtain a list of completed update sessions

-	//-------------------------------------------

-	UMSessionManagerSession[] sessionsCompleted = getUpdateSessionsCompleted();

-

-	// If there are none, save the update log

-	//---------------------------------------

-	if (sessionsCompleted.length <= 0) {

-		saveUpdateLog();

-		return;

-	}

-

-	// Attempt to open the output log

-	//-------------------------------

-	String strFilespec = UMEclipseTree.getFileInPlatformString(_urlHistory);

-	

-

-	File file = new File(strFilespec);

-

-	boolean bExists = file.exists();

-

-	if (bExists == false) {

-		try {

-			bExists = file.createNewFile();

-		}

-		catch (IOException ex) {

-			return;

-		}

-	}

-

-	// Create a file writer and seek to the end of the file

-	//-----------------------------------------------------

-	RandomAccessFile fileWriter = null;

-

-	if (bExists == true) {

-		try {

-			fileWriter = new RandomAccessFile(file, "rw");

-			long lLength = fileWriter.length();

-			fileWriter.seek(lLength);

-		}

-		catch (IOException ex) {

-			fileWriter = null;

-		}

-	}

-

-	// Write out each session log to the history log

-	// Remove the session log from the update log

-	// Save both logs

-	//----------------------------------------------

-	StringBuffer strb = new StringBuffer();

-

-	if (fileWriter != null) {

-

-		ILogEntry logEntry = null;

-

-		for (int i = 0; i < sessionsCompleted.length; ++i) {

-

-			logEntry = sessionsCompleted[i].getLogEntry();

-

-			if (logEntry != null) {

-				logEntry.printPersistentEntryString(strb, 0);

-			}

-		}

-	}

-

-	// Write the buffer to the end of the history file

-	//------------------------------------------------

-	if (strb.length() > 0) {

-		try {

-			fileWriter.write(strb.toString().getBytes());

-			fileWriter.close();

-		}

-		catch (IOException ex) {

-

-		}

-	}

-

-	// Remove the update sessions from the update log

-	//-----------------------------------------------

-	for (int i = 0; i < sessionsCompleted.length; ++i) {

-		removeUpdateSession(sessionsCompleted[i]);

-	}

-

-	// Save the update log to keep logs in sync

-	//-----------------------------------------

-	saveUpdateLog();

-}

-}

diff --git a/update/org.eclipse.update/src/org/eclipse/update/internal/core/UMSessionManagerEntry.java b/update/org.eclipse.update/src/org/eclipse/update/internal/core/UMSessionManagerEntry.java
deleted file mode 100644
index 9d616c8..0000000
--- a/update/org.eclipse.update/src/org/eclipse/update/internal/core/UMSessionManagerEntry.java
+++ /dev/null
@@ -1,171 +0,0 @@
-package org.eclipse.update.internal.core;

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

-

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.core.internal.boot.update.*;

-/**

- * Abstract class for update manager objects that have an ILogEntry

- */

-public abstract class UMSessionManagerEntry {

-	protected ILogEntry _logEntry = null;

-	protected ILogEntryProperty _propertyStatus = null;

-	protected ILogEntryProperty _propertyAttempts = null;

-	protected Object            _objData = null;

-/**

- * UpdateManagerEntry constructor comment.

- */

-public UMSessionManagerEntry( ILogEntry logEntry ) {

-	_logEntry = logEntry;

-

-	// Status

-	//-------

-	_propertyStatus = _logEntry.getProperty(UpdateManagerConstants.STRING_STATUS);

-

-	if (_propertyStatus == null) {

-		_propertyStatus = new LogEntryProperty(logEntry, UpdateManagerConstants.STRING_STATUS, UpdateManagerConstants.STATUS_PENDING );

-		logEntry.addProperty( _propertyStatus );

-	}

-

-	// Attempts

-	//---------

-	_propertyAttempts = _logEntry.getProperty(UpdateManagerConstants.STRING_ATTEMPTS);

-

-	if (_propertyAttempts == null) {

-		_propertyAttempts = new LogEntryProperty(logEntry, UpdateManagerConstants.STRING_ATTEMPTS, UpdateManagerConstants.STRING_0 );

-		logEntry.addProperty( _propertyAttempts );

-	}

-

-}

-/**

- * @param logEntry org.eclipse.update.internal.core.ILogEntry

- */

-public void buildTreeFromLog(ILogEntry logEntry) {

-	

-	// Attempts

-	//---------

-	ILogEntryProperty property = _logEntry.getProperty(UpdateManagerConstants.STRING_ATTEMPTS);

-

-	if (property != null) {

-		_propertyAttempts = property;

-	}

-	

-	// Status

-	//-------

-	property = _logEntry.getProperty(UpdateManagerConstants.STRING_STATUS);

-

-	if (property != null) {

-		_propertyStatus = property;

-	}

-}

-/**

- * 

- * @return java.lang.String

- * @param strPrefix java.lang.String

- * @param ex java.lang.Exception

- */

-public String createMessageString(String strPrefix, Exception ex) {

-

-	StringBuffer strb = new StringBuffer(strPrefix);

-

-	if (ex != null) {

-		if (ex.getLocalizedMessage() != null) {

-			strb.append(": " + ex.getLocalizedMessage());

-		}

-

-		else if (ex.toString() != null && ex.toString().length() > 0) {

-			strb.append(": " + ex.toString());

-		}

-	}

-

-	return strb.toString();

-}

-/**

- * Execute any pending or failed updates.

- */

-public abstract boolean execute( IProgressMonitor progressMonitor );

-/**

- * Execute any pending or failed updates.

- */

-public abstract boolean executeUndo( IProgressMonitor progressMonitor );

-/**

- * @return java.lang.Object

- */

-public java.lang.Object getData() {

-	return _objData;

-}

-/**

- * Returns the log entry associated with this session object.

- * @return org.eclipse.update.internal.core.ILogEntry

- */

-public ILogEntry getLogEntry() {

-	return _logEntry;

-}

-/**

- *

- * @return java.lang.String

- */

-public String getStatus() {

-

-	return _propertyStatus.getValue();

-}

-/**

- * @param strb java.lang.StringBuffer

- * @param iIndentation int

- */

-public abstract void getStatusString(StringBuffer strb, int iIndentation);

-/**

- * Increments the value of the number of attempts

- */

-public void incrementAttemptCount() {

-

-	int iAttempts = 0;

-

-	try {

-		iAttempts = new Integer(_propertyAttempts.getValue()).intValue();

-	}

-	catch (Exception ex) {

-	}

-

-	_propertyAttempts.setValue( Integer.toString( ++iAttempts ) );

-}

-/**

- * @param strb java.lang.StringBuffer

- * @param iIndentation int

- */

-public void indent(StringBuffer strb, int iIndentation) {

-

-	// Line feed

-	//----------

-	strb.append( "\n" );

-

-	// Indentation spaces

-	//-------------------

-	for( int i=0; i<iIndentation; ++i ){

-		strb.append( " " );

-	}

-}

-/**

- */

-public void resetAttemptCount() {

-	_propertyAttempts.setValue( UpdateManagerConstants.STRING_0 );

-}

-/**

- * Stores IManifestDescriptor

- * @param newData java.lang.Object

- */

-public void setData(java.lang.Object objData) {

-	_objData = objData;

-}

-/**

- * Every entry has a status property.

- * @return java.lang.String

- * @param status java.lang.String

- */

-public void setStatus(String strStatus) {

-

-	_propertyStatus.setValue( strStatus != null ? strStatus : UpdateManagerConstants.STRING_EMPTY );

-}

-}

diff --git a/update/org.eclipse.update/src/org/eclipse/update/internal/core/UMSessionManagerMessage.java b/update/org.eclipse.update/src/org/eclipse/update/internal/core/UMSessionManagerMessage.java
deleted file mode 100644
index 3a9c9b9..0000000
--- a/update/org.eclipse.update/src/org/eclipse/update/internal/core/UMSessionManagerMessage.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package org.eclipse.update.internal.core;

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

-

-import org.eclipse.core.internal.boot.update.*;

-import java.util.Date;

-

-/**

- * This class represents a failure message and consists of a timestamp and text.

- *

- */

-

-public class UMSessionManagerMessage {

-	protected ILogEntry _logEntry = null;

-	protected ILogEntryProperty _propertyTimestamp = null;

-	protected ILogEntryProperty _propertyText      = null;

-/**

- *

- * @param logEntry org.eclipse.update.internal.core.ILogEntry

- */

-public UMSessionManagerMessage(ILogEntry logEntry) {

-

-	_logEntry = logEntry;

-	

-	// Text

-	//-----

-	_propertyText = _logEntry.getProperty(UpdateManagerConstants.STRING_TEXT);

-

-	if (_propertyText == null) {

-		_propertyText = new LogEntryProperty(logEntry, UpdateManagerConstants.STRING_TEXT, UpdateManagerConstants.STRING_EMPTY );

-		logEntry.addProperty( _propertyText );

-	}

-

-	// Timestamp

-	//----------

-	_propertyTimestamp = _logEntry.getProperty(UpdateManagerConstants.STRING_TIMESTAMP);

-

-	if (_propertyTimestamp == null) {

-		_propertyTimestamp = new LogEntryProperty(logEntry, UpdateManagerConstants.STRING_TIMESTAMP, new Date().toString() );

-		logEntry.addProperty( _propertyTimestamp );

-	}

-}

-/**

- * @param logEntry org.eclipse.update.internal.core.LogEntry

- */

-public void buildTreeFromLog(ILogEntry logEntry) {

-		

-	// Text

-	//-----

-	ILogEntryProperty property = _logEntry.getProperty(UpdateManagerConstants.STRING_TEXT);

-

-	if (property != null) {

-		_propertyText = property;

-	}

-

-	// Source

-	//-------

-	property = _logEntry.getProperty(UpdateManagerConstants.STRING_TIMESTAMP);

-

-	if (property != null) {

-		_propertyTimestamp = property;

-	}

-}

-/**

- * @return java.lang.String

- */

-public String getText() {

-	

-	return _propertyText.getValue();

-}

-/**

- *

- */

-public void setText( String strID ) {

-	_propertyText.setValue( strID != null ? strID : UpdateManagerConstants.STRING_EMPTY );

-}

-}

diff --git a/update/org.eclipse.update/src/org/eclipse/update/internal/core/UMSessionManagerOperation.java b/update/org.eclipse.update/src/org/eclipse/update/internal/core/UMSessionManagerOperation.java
deleted file mode 100644
index f6aadd5..0000000
--- a/update/org.eclipse.update/src/org/eclipse/update/internal/core/UMSessionManagerOperation.java
+++ /dev/null
@@ -1,1189 +0,0 @@
-package org.eclipse.update.internal.core;

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

-

-import org.eclipse.swt.widgets.Shell;

-import org.eclipse.webdav.http.client.Response;

-import java.util.jar.*;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.core.internal.boot.LaunchInfo;

-import org.eclipse.update.internal.ui.*;

-import org.eclipse.core.internal.boot.update.*;

-import java.io.*;

-import java.net.*;

-import java.util.*;

-

-/**

- * This class represents an operation such as "copy" or "unzip".

- * Attributes are id, status (pending/complete), action,

- * source, target.  Children are messages.

- */

-

-public class UMSessionManagerOperation extends UMSessionManagerEntry {

-		

-	protected ArrayList         _alMessages     = new ArrayList();

-	protected ILogEntryProperty _propertyAction = null;

-	protected ILogEntryProperty _propertyID     = null;

-	protected ILogEntryProperty _propertySource = null;

-	protected ILogEntryProperty _propertyTarget = null;

-/**

- * UpdateManagerOperation constructor comment.

- */

-public UMSessionManagerOperation( ILogEntry logEntry ) {

-	super( logEntry );

-

-	// Action

-	//-------

-	_propertyAction = _logEntry.getProperty(UpdateManagerConstants.STRING_ACTION);

-

-	if (_propertyAction == null) {

-		_propertyAction = new LogEntryProperty(logEntry, UpdateManagerConstants.STRING_ACTION, UpdateManagerConstants.STRING_EMPTY );

-		logEntry.addProperty( _propertyAction );

-	}

-

-	// Id

-	//---

-	_propertyID = _logEntry.getProperty(UpdateManagerConstants.STRING_ID);

-

-	if (_propertyID == null) {

-		_propertyID = new LogEntryProperty(logEntry, UpdateManagerConstants.STRING_ID, UpdateManagerConstants.STRING_EMPTY );

-		logEntry.addProperty( _propertyID );

-	}

-

-	// Source

-	//-------

-	_propertySource = _logEntry.getProperty(UpdateManagerConstants.STRING_SOURCE);

-

-	if (_propertySource == null) {

-		_propertySource = new LogEntryProperty(logEntry, UpdateManagerConstants.STRING_SOURCE, UpdateManagerConstants.STRING_EMPTY );

-		logEntry.addProperty( _propertySource );

-	}

-

-	// Target

-	//-------

-	_propertyTarget = _logEntry.getProperty(UpdateManagerConstants.STRING_TARGET);

-

-	if (_propertyTarget == null) {

-		_propertyTarget = new LogEntryProperty(logEntry, UpdateManagerConstants.STRING_TARGET, UpdateManagerConstants.STRING_EMPTY );

-		logEntry.addProperty( _propertyTarget);

-	}

-}

-/**

- * @param logEntry org.eclipse.update.internal.core.LogEntry

- */

-public void buildTreeFromLog(ILogEntry logEntry) {

-	

-	super.buildTreeFromLog( logEntry );

-	

-	// Action

-	//-------

-	ILogEntryProperty property = _logEntry.getProperty(UpdateManagerConstants.STRING_ACTION);

-

-	if (property != null) {

-		_propertyAction = property;

-	}

-	

-

-	// Id

-	//---

-	property = _logEntry.getProperty(UpdateManagerConstants.STRING_ID);

-

-	if (property != null) {

-		_propertyID = property;

-	}

-

-	// Source

-	//-------

-	property = _logEntry.getProperty(UpdateManagerConstants.STRING_SOURCE);

-

-	if (property != null) {

-		_propertySource = property;

-	}

-

-	// Target

-	//-------

-	property = _logEntry.getProperty(UpdateManagerConstants.STRING_TARGET);

-

-	if (property != null) {

-		_propertyTarget = property;

-	}

-

-

-	ILogEntry[] entries = logEntry.getChildEntries();

-

-	// Messages

-	//---------

-	int iIndex = 0;

-	UMSessionManagerMessage message = null;

-	

-	for( int i = 0; i < entries.length; ++i) {

-		if (entries[i] != null && entries[i].getName().equals(UpdateManagerConstants.STRING_MESSAGE) == true) {

-			message = new UMSessionManagerMessage( entries[i] );			

-	        _alMessages.add( message );

-

-	        message.buildTreeFromLog( entries[i] );

-		}

-	}

-}

-/**

- * Copies all data from input stream to output stream.

- * @param inputStream java.io.InputStream

- * @param outputStream java.io.OutputStream

- */

-public String copyStream(InputStream streamInput, OutputStream streamOutput, long lContentLength, String strTaskName, IProgressMonitor progressMonitor, boolean bSubtask) {

-

-	String strErrorMessage = null;

-

-	// Allocate buffer

-	//---------------- 

-	byte[] byteArray = null;

-

-	if (streamInput != null && streamOutput != null) {

-		byteArray = new byte[64000];

-	}

-

-	if (byteArray != null) {

-

-		// Copy

-		//-----

-		if (progressMonitor != null) {

-			if (bSubtask == false) {

-				if (lContentLength > 0 && lContentLength < Integer.MAX_VALUE)

-					progressMonitor.beginTask(UpdateManagerStrings.getString("S_Copy") + ": " +strTaskName, (int) lContentLength);

-				else

-					progressMonitor.beginTask(UpdateManagerStrings.getString("S_Copy") + ": "  + strTaskName, IProgressMonitor.UNKNOWN);

-			}

-			else {

-				progressMonitor.subTask(UpdateManagerStrings.getString("S_Copy") + ": "  + strTaskName);

-			}

-		}

-

-		int iBytesReceived = 0;

-

-		do {

-			// Read

-			//-----

-			try {

-				iBytesReceived = streamInput.read(byteArray);

-			}

-			catch (Exception ex) {

-				iBytesReceived = 0;

-				strErrorMessage = UpdateManagerStrings.getString("S_Error_reading_from_input_stream") + ": " + ex.getMessage();

-			}

-

-			// Write

-			//------

-			if (iBytesReceived > 0) {

-				try {

-					streamOutput.write(byteArray, 0, iBytesReceived);

-

-					if (progressMonitor != null && bSubtask == false)

-						progressMonitor.worked(iBytesReceived);

-				}

-				catch (IOException ex) {

-					iBytesReceived = 0;

-					strErrorMessage = UpdateManagerStrings.getString("S_Error_writing_to_output_stream") + ": " + ex.getMessage();

-				}

-			}

-		}

-		while (iBytesReceived > 0);

-

-		if (progressMonitor != null && bSubtask == false) {

-			progressMonitor.done();

-		}

-	}

-

-	return strErrorMessage;

-}

-/**

- *

- * @return org.eclipse.update.internal.core.UMSessionManagerMessage

- * @param actionType java.lang.String

- */

-public UMSessionManagerMessage createMessage() {

-

-	// Create a new log entry

-	//-----------------------

-	ILogEntry logEntryChild = new LogEntry( _logEntry, UpdateManagerConstants.STRING_MESSAGE );

-	_logEntry.addChildEntry( logEntryChild );

-

-	// Create the operation object

-	//----------------------------

-	UMSessionManagerMessage message = new UMSessionManagerMessage( logEntryChild );

-	

-	message.buildTreeFromLog( logEntryChild );

-	

-	_alMessages.add( message );

-	

-	return message;

-}

-/**

- *

- * 

- */

-public boolean doCopy(IProgressMonitor progressMonitor) {

-

-	String strErrorMessage = null;

-

-	// Input URL

-	//----------

-	URL urlInput = null;

-

-	try {

-		urlInput = new URL(getSource());

-	}

-	catch (MalformedURLException ex) {

-		strErrorMessage = createMessageString(UpdateManagerStrings.getString("S_Source_URL_is_malformed"), ex);

-	}

-

-	URL urlOutput = null;

-

-	// Output URL

-	//-----------

-	try {

-		urlOutput = new URL(getTarget());

-	}

-	catch (MalformedURLException ex) {

-		strErrorMessage = createMessageString(UpdateManagerStrings.getString("S_Target_URL_is_malformed"), ex);

-	}

-

-	// Input

-	//-------

-	InputStream streamInput = null;

-

-	long lContentLength = 0;

-

-	if (urlInput != null && urlOutput != null) {

-

-		// Input stream

-		//-------------

-		try {

-			URLHandler.Response response = (URLHandler.Response)URLHandler.open(urlInput);

-			lContentLength = response.getContentLength();

-			if( response.getResponseCode() == HttpURLConnection.HTTP_OK )

-				streamInput = response.getInputStream();

-		}

-		catch (IOException ex) {

-			strErrorMessage = createMessageString(UpdateManagerStrings.getString("S_Unable_to_obtain_source_input_stream"), ex);

-		}

-

-	}

-

-	// Output

-	//-------

-	OutputStream streamOutput = null;

-

-	if (streamInput != null) {

-

-		// Output connection

-		//------------------

-		URLConnection urlConnectionOutput = null;

-		

-		try {

-			urlConnectionOutput = urlOutput.openConnection();

-			urlConnectionOutput.setDoOutput(true);

-		}

-		catch (IOException ex) {

-			strErrorMessage = createMessageString( UpdateManagerStrings.getString("S_Unable_to_connect"), ex );

-		}

-

-		// Output stream

-		//--------------

-		if (urlConnectionOutput != null) {

-			try {

-				streamOutput = urlConnectionOutput.getOutputStream();

-			}

-			catch (IOException ex) {

-				strErrorMessage = createMessageString( UpdateManagerStrings.getString("S_Unable_to_obtain_target_output_stream"), ex );

-			}

-		}

-

-		// Attempt to create a file output stream

-		// This is used when protocol is file: or valoader:

-		// thus our local writes are all file I/O currently

-		//-------------------------------------------------

-		if (streamOutput == null) {

-	        try

-	        {

-		 		streamOutput = getFileOutputStream(urlOutput);

-	        }

-	        catch( IOException ex){

-				strErrorMessage = createMessageString( UpdateManagerStrings.getString("S_Unable_to_create_file"), ex );

-			}

-		}

-	}

-

-	if( streamInput != null && streamOutput != null )

-	{

-	    strErrorMessage = copyStream( streamInput, streamOutput, lContentLength, urlInput.toExternalForm(), progressMonitor, false );

-	}    

-

-	// Close input stream

-	//-------------------

-	if (streamInput != null) {

-		try {

-			streamInput.close();

-		}

-		catch (IOException ex) {

-		}

-	}

-

-	// Close output stream

-	//--------------------

-	if (streamOutput != null) {

-		try {

-			streamOutput.flush();

-			streamOutput.close();

-		}

-		catch (IOException ex) {

-			strErrorMessage = createMessageString( UpdateManagerStrings.getString("S_Error_closing_output_stream"), ex );

-		}

-	}

-	

-	// Increment the number of attempts

-	//---------------------------------

-	incrementAttemptCount();

-

-	// Error return

-	//-------------

-	if (strErrorMessage != null) {

-		UMSessionManagerMessage message = createMessage();

-		message.setText(strErrorMessage);

-		setStatus(UpdateManagerConstants.STATUS_FAILED);

-		return false;

-	}

-

-	// Successful return

-	//------------------

-	setStatus(UpdateManagerConstants.STATUS_SUCCEEDED);

-

-	return true;

-}

-/**

- *

- * 

- */

-public boolean doUnzip(IProgressMonitor progressMonitor) {

-

-	String strErrorMessage = null;

-	int rc = UpdateManagerConstants.UNDEFINED_CONTENTS;

-

-	// Input URL

-	//----------

-	URL urlInput = null;

-	try {

-		urlInput = new URL(getSource());

-	}

-	catch (MalformedURLException ex) {

-		strErrorMessage = createMessageString(UpdateManagerStrings.getString("S_Source_URL_is_malformed"), ex);

-	}

-

-	// Output URL

-	//-----------

-	URL urlOutput = null;

-	try {

-		urlOutput = new URL(getTarget());

-	}

-	catch (MalformedURLException ex) {

-		strErrorMessage = createMessageString(UpdateManagerStrings.getString("S_Target_URL_is_malformed"), ex);

-	}

-

-	// For unzipping plugins or component/configuration jar, 

-	// set up the list of directories to look for, also call

-	// LaunchInfo.installPending

-	//-----------------------------------------------------

-	Vector dirNames = new Vector();

-	Vector dirNamesInstalled = new Vector();// keep track of plugins/fragments unzipped

-	Vector dirNamesUnexpected = new Vector();	// keep track of unexpected plugins/fragments dir

-	ArrayList productVIDs = new ArrayList();

-	ArrayList componentVIDs = new ArrayList();

-	ArrayList pluginVIDs = new ArrayList();

-	ArrayList fragmentVIDs = new ArrayList();

-

-	if (getAction() == UpdateManagerConstants.OPERATION_UNZIP_PLUGINS ) {

-		IComponentDescriptor comp = null;

-		if (getData() instanceof IComponentEntryDescriptor) {

-			comp = ((IComponentEntryDescriptor) getData()).getComponentDescriptor();

-		} else {

-			comp = (IComponentDescriptor) getData();

-		}

-		if (comp != null) {

-			IPluginEntryDescriptor[] plugins = comp.getPluginEntries();

-			for (int i=0; i<plugins.length; i++) {

-				dirNames.addElement( UMEclipseTree.PLUGINS_DIR + "/" + plugins[i].getDirName());

-				pluginVIDs.add(new LaunchInfo.VersionedIdentifier(plugins[i].getUniqueIdentifier(), plugins[i].getVersionStr()));

-			}

-			IFragmentEntryDescriptor[] fragments = comp.getFragmentEntries();

-			for (int i=0; i<fragments.length; i++) {

-				dirNames.addElement( UMEclipseTree.FRAGMENTS_DIR + "/" + fragments[i].getDirName());	

-				fragmentVIDs.add(new LaunchInfo.VersionedIdentifier(plugins[i].getUniqueIdentifier(), plugins[i].getVersionStr()));

-			}

-		} else {

-			strErrorMessage = UpdateManagerStrings.getString("S_Error_in_registry");

-		}

-	} else if (getAction() == UpdateManagerConstants.OPERATION_UNZIP_INSTALL) {

-		rc = UpdateManagerConstants.INSTALL_XML_MISSING;

-		if (getData() instanceof IProductDescriptor) {

-			IProductDescriptor desc = (IProductDescriptor) getData();

-			dirNames.addElement(UMEclipseTree.INSTALL_DIR + "/" + UMEclipseTree.PRODUCTS_DIR + "/" + desc.getDirName());

-			productVIDs.add(new LaunchInfo.VersionedIdentifier(desc.getUniqueIdentifier(), desc.getVersionStr()));

-		} else { 

-			IComponentDescriptor desc = null;

-			if (getData() instanceof IComponentEntryDescriptor) {

-				desc = ((IComponentEntryDescriptor) getData()).getComponentDescriptor();

-			} else {

-				desc = (IComponentDescriptor) getData();

-			}

-			dirNames.addElement(UMEclipseTree.INSTALL_DIR + "/" + UMEclipseTree.COMPONENTS_DIR + "/" + desc.getDirName());

-			componentVIDs.add(new LaunchInfo.VersionedIdentifier(desc.getUniqueIdentifier(), desc.getVersionStr()));

-		}

-	}

-	if (!LaunchInfo.getCurrent().installPending(productVIDs, componentVIDs, pluginVIDs, fragmentVIDs)) {

-		strErrorMessage = UpdateManagerStrings.getString("S_Error_occurred_during_installation_setup");

-	}

-	

-	

-	// Create a file specification from the input URL

-	//-----------------------------------------------

-	String strFilespec = UMEclipseTree.getFileInPlatformString(urlInput);

-

-	JarFile jarFile = null;

-

-	try {

-		jarFile = new JarFile(strFilespec);

-	}

-	catch (IOException ex) {

-		strErrorMessage = createMessageString(UpdateManagerStrings.getString("S_Unable_to_open_Jar_file"), ex);

-	}

-

-	if ((jarFile != null) && (strErrorMessage == null)) {

-

-		JarEntry entry = null;

-		InputStream streamInputEntry = null;

-

-		int iCount = jarFile.size();

-		

-		// Set up progress monitor

-		// Compute the filename without the path information

-		//--------------------------------------------------

-		String strFilename = strFilespec;

-		int iIndex = strFilespec.lastIndexOf(File.separatorChar);

-		

-		if (iIndex >= 0 && iIndex < strFilespec.length() - 1) {

-			strFilename = strFilespec.substring(iIndex + 1);

-		}

-

-		if (progressMonitor != null) {

-			progressMonitor.beginTask(UpdateManagerStrings.getString("S_Install") + ": " + strFilename, iCount);

-		}

-

-

-		// Do each jar file entry

-		//-----------------------

-		Enumeration enum = jarFile.entries();

-		while (enum.hasMoreElements() == true) {

-			entry = (JarEntry) enum.nextElement();

-			String entryName = entry.getName();

-			

-			if (getAction() == UpdateManagerConstants.OPERATION_UNZIP_PLUGINS ) {

-				// Unzip plugins and fragments.  Skip entries not under plugins/  or fragments/ trees

-				//-----------------------------------------------------------------------------------

-				if ((!entryName.startsWith(UMEclipseTree.PLUGINS_DIR) &&

-					!entryName.startsWith(UMEclipseTree.FRAGMENTS_DIR)) 

-					|| entryName.endsWith("/")) {

-					if (progressMonitor != null) progressMonitor.worked(1);

-					continue;

-				}

-				String prefix = entryName;

-				int second_slash = entryName.indexOf("/", (entryName.indexOf("/")+1));

-				if (second_slash > 0) 

-					prefix = entryName.substring(0,second_slash);

-				int match = dirNames.indexOf(prefix);

-				if (match < 0) {   // not a valid plugin

-					if (!dirNamesUnexpected.contains(prefix))

-						dirNamesUnexpected.addElement(prefix);

-					continue;

-				}

-				// got an entry with matching directory 

-				// keep track of which ones they are

-				if (!dirNamesInstalled.contains(prefix))

-					dirNamesInstalled.addElement(prefix);

-			} else if (getAction() == UpdateManagerConstants.OPERATION_UNZIP_INSTALL) {

-				// Skip over entries that don't start with the right dir naming convention (id_version)

-				//-------------------------------------------------------------------------------------

-				if (!entryName.startsWith((String)dirNames.firstElement()) || entryName.endsWith("/")) {

-					if (progressMonitor != null) progressMonitor.worked(1);

-					continue;

-				}

-				// got an entry - as long as we have install.xml we're happy

-				if (entryName.equals((String)dirNames.firstElement()+"/"+IManifestAttributes.INSTALL_MANIFEST))

-					rc = UpdateManagerConstants.OK;

-			} else if (getAction() == UpdateManagerConstants.OPERATION_UNZIP_BINDIR) {

-				// Unzip the bin directory, if it exists

-				//--------------------------------------

-				if (!entryName.startsWith(UMEclipseTree.BIN_DIR) || entryName.endsWith("/")) {

-					if (progressMonitor != null) progressMonitor.worked(1);

-					continue;

-				}

-				// got bin dir

-				rc = UpdateManagerConstants.OK;

-			}

-			try {

-				streamInputEntry = jarFile.getInputStream(entry);

-			}

-			catch (IOException ex) {

-				streamInputEntry = null;

-				strErrorMessage = createMessageString(UpdateManagerStrings.getString("S_Unable_to_open_jar_entry_input_stream"), ex);

-				break;

-			}

-			catch (SecurityException ex) {

-				streamInputEntry = null;

-				strErrorMessage = createMessageString(UpdateManagerStrings.getString("S_Encountered_jar_entry_security_exception"), ex);

-				break;

-			}

-

-

-			// Create an output URL

-			//---------------------

-			URL urlOutputFile = null;

-

-			if (streamInputEntry != null) {

-				try {

-					// Ensure file separator between target directory, and source file path

-					//---------------------------------------------------------------------

-					StringBuffer strbTarget = new StringBuffer(getTarget());

-					if (getTarget().endsWith("/") == false) {

-						strbTarget.append('/');

-					}

-					strbTarget.append(entryName);

-					urlOutputFile = new URL(strbTarget.toString());

-					File fTarget = new File(UMEclipseTree.getFileInPlatformString(urlOutputFile));

-					if (fTarget.exists() &&

-						(getAction() != UpdateManagerConstants.OPERATION_UNZIP_BINDIR)) {		

-						// we will not override existing files, except in bin/

-						if (progressMonitor != null) progressMonitor.worked(1);

-						continue;

-					}

-				}

-				catch (MalformedURLException ex) {

-					strErrorMessage = createMessageString(UpdateManagerStrings.getString("S_Unable_to_create_jar_entry_URL"), ex);

-					break;

-				}

-			}

-

-

-			// Create a file output stream

-			//----------------------------

-			OutputStream streamOutputFile = null;

-

-			if (urlOutputFile != null) {

-				try {

-					streamOutputFile = getFileOutputStream(urlOutputFile);

-				}

-				catch (IOException ex) {

-					strErrorMessage = createMessageString(UpdateManagerStrings.getString("S_Unable_to_create_output_file_for_Jar_entry") + ": " + urlOutputFile.toExternalForm(), ex);

-					break;

-				}

-			}

-

-			// Copy from input to output stream

-			//---------------------------------

-			if (streamInputEntry != null && streamOutputFile != null) {

-

-	            // Do not alter progress monitor

-	            //------------------------------

-				strErrorMessage = copyStream(streamInputEntry, streamOutputFile, 0, entryName, null, true );

-				if (strErrorMessage != null) {

-					break;

-				}

-			}

-			try {

-				if (streamInputEntry != null) 	streamInputEntry.close();

-				if (streamOutputFile != null) 	streamOutputFile.close();

-			} catch (java.io.IOException ex) {

-				// unchecked

-			}

-			if (progressMonitor != null) progressMonitor.worked(1);

-		}	// while

-//		strErrorMessage = "Error Injected!";

-		try {

-			jarFile.close();

-		} catch (java.io.IOException ex) {

-			// unchecked

-		}		

-	}	// if jarFile is not null

-

-	// tally up what's unzipped and what's not

-	//---------------------------------

-	if (strErrorMessage == null) {

-		if (getAction() == UpdateManagerConstants.OPERATION_UNZIP_PLUGINS ) {

-			if (dirNamesUnexpected.size() > 0) {

-				rc = UpdateManagerConstants.UNDEFINED_CONTENTS;

-				strErrorMessage = UpdateManagerStrings.getString("S_Undefined_contents_found_in_Jar");

-			}

-			else if (!dirNamesInstalled.containsAll(dirNames)) {

-				rc = UpdateManagerConstants.MISSING_CONTENTS;

-				strErrorMessage = UpdateManagerStrings.getString("S_Unable_to_find_defined_contents_in_Jar");

-			} 

-		} else if (getAction() == UpdateManagerConstants.OPERATION_UNZIP_INSTALL) {

-			if (rc != UpdateManagerConstants.OK)

-				strErrorMessage = UpdateManagerStrings.getString("S_Unable_to_find_install_manifest_file_in_Jar");

-		}

-	}		

-	

-	// Call LaunchInfo.installConfirmed if all clean

-	// Otherwise, call after we've cleaned up (undo*)

-	//-----------------------------------------------

-	if (strErrorMessage == null) {

-		if (!LaunchInfo.getCurrent().installConfirmed(productVIDs, componentVIDs, pluginVIDs, fragmentVIDs)) {

-			strErrorMessage = UpdateManagerStrings.getString("S_Error_occurred_during_installation_completion");

-		}

-	}

-	

-	if (progressMonitor != null) progressMonitor.done();

-

-	// Increment the number of attempts

-	//---------------------------------

-	incrementAttemptCount();

-

-	// Error return

-	//-------------

-	if (strErrorMessage != null) {

-		UMSessionManagerMessage message = createMessage();

-		message.setText(strErrorMessage);

-		setStatus(UpdateManagerConstants.STATUS_FAILED);

-		return false;

-	}

-

-	// Successful return

-	//------------------

-	setStatus(UpdateManagerConstants.STATUS_SUCCEEDED);

-

-	return true;

-}

-/**

- *

- * 

- */

-public boolean doVerify(IProgressMonitor progressMonitor) {

-

-	String strErrorMessage = null;

-

-	// Input URL

-	//----------

-	URL urlInput = null;

-

-	try {

-		urlInput = new URL(getSource());

-	}

-	catch (MalformedURLException ex) {

-		strErrorMessage = createMessageString(UpdateManagerStrings.getString("S_Source_URL_is_malformed"), ex);

-	}

-

-	IInstallable installable = (IInstallable) getData();

-

-	String strName = installable.getLabel();

-	String strId = null;

-	String strProviderName = null;

-

-	if (installable instanceof IProductDescriptor) {

-		strId = ((IProductDescriptor) installable).getUniqueIdentifier();

-		strProviderName = ((IProductDescriptor) installable).getProviderName();

-	}

-	else if (installable instanceof IComponentDescriptor) {

-		strId = ((IComponentDescriptor) installable).getUniqueIdentifier();

-		strProviderName = ((IComponentDescriptor) installable).getProviderName();

-	}

-	else if (installable instanceof IComponentEntryDescriptor) {

-		strId = ((IComponentEntryDescriptor) installable).getUniqueIdentifier();

-	}

-	else if (installable instanceof IPluginEntryDescriptor) {

-		strId = ((IPluginEntryDescriptor) installable).getUniqueIdentifier();

-	}

-	else if (installable instanceof IFragmentEntryDescriptor) {

-		strId = ((IFragmentEntryDescriptor) installable).getUniqueIdentifier();

-	}

-

-	JarVerificationService verifier = UpdateManager.getCurrentInstance().getJarVerifier();

-

-	JarVerificationResult result = verifier.okToInstall(new File(urlInput.getFile()), strId, strName, strProviderName, progressMonitor);

-

-	if (result.getResultCode() == JarVerificationResult.CANCEL_INSTALL) {

-		Exception ex = result.getResultException();

-		strErrorMessage = createMessageString(UpdateManagerStrings.getString("S_Installation_cancelled_by_user"), ex);

-	}

-

-	// Increment the number of attempts

-	//---------------------------------

-	incrementAttemptCount();

-

-	// Error return

-	//-------------

-	if (strErrorMessage != null) {

-		UMSessionManagerMessage message = createMessage();

-		message.setText(strErrorMessage);

-		setStatus(UpdateManagerConstants.STATUS_FAILED);

-		return false;

-	}

-

-	// Successful return

-	//------------------

-	setStatus(UpdateManagerConstants.STATUS_SUCCEEDED);

-

-	return true;

-}

-/**

- * Execute copy from source URL to target URL.

- */

-public boolean execute(IProgressMonitor progressMonitor) {

-

-	if (getAction() == UpdateManagerConstants.OPERATION_UNZIP_INSTALL ||

-		getAction() == UpdateManagerConstants.OPERATION_UNZIP_PLUGINS ||

-		getAction() == UpdateManagerConstants.OPERATION_UNZIP_BINDIR) {

-		return doUnzip(progressMonitor);

-	}

-	

-	else if (getAction() == UpdateManagerConstants.OPERATION_COPY) {

-		return doCopy(progressMonitor);

-	}

-	else if (getAction() == UpdateManagerConstants.OPERATION_VERIFY_JAR) {

-		return doVerify(progressMonitor);

-	}

-	return false;

-}

-/**

- * Execute any pending or failed updates.

- */

-public boolean executeUndo(IProgressMonitor progressMonitor) {

-

-	// Undo all successful and failed operations

-	//------------------------------------------

-	if (getStatus().equals(UpdateManagerConstants.STATUS_PENDING) == false) {

-		if (getAction() == UpdateManagerConstants.OPERATION_UNZIP_INSTALL ||

-			getAction() == UpdateManagerConstants.OPERATION_UNZIP_PLUGINS) {

-			return undoUnzip(progressMonitor);

-		}

-		else if (getAction() == UpdateManagerConstants.OPERATION_COPY) {

-			return undoCopy(progressMonitor);

-		}

-		else if (getAction() == UpdateManagerConstants.OPERATION_VERIFY_JAR){

-			return undoVerify(progressMonitor);

-		}

-	}

-

-	return true;

-}

-/**

- * 

- * @return java.lang.String

- */

-public String getAction() {

-	

-	return _propertyAction.getValue();

-}

-/**

- * Creates a file output stream from the URL.

- * @param url java.net.URL

- */

-private FileOutputStream getFileOutputStream(URL url) throws IOException {

-

-	// Convert the URL to a string

-	//----------------------------

-	String strFilespec = UMEclipseTree.getFileInPlatformString(url);

-

-

-	// Create directory structure

-	//---------------------------

-	int iIndex = strFilespec.lastIndexOf(File.separator);

-	if (iIndex >= 0) {

-		String strPath = strFilespec.substring(0, iIndex+1);

-

-		File fileDirectory = new File(strPath);

-		if (fileDirectory.exists() == false) {

-			fileDirectory.mkdirs();

-		}

-	}

-

-	// Open / create the file

-	//-----------------------

-	File file = new File(strFilespec);

-	boolean bExists = file.exists();

-

-	if (bExists == false) {

-		bExists = file.createNewFile();

-	}

-

-	// Create the output stream

-	//-------------------------

-	return new FileOutputStream(file);

-}

-/**

- * @return java.lang.String

- */

-public String getId() {

-	

-	return _propertyID.getValue();

-}

-/**

- *

- * @return java.lang.String

- */

-public String getSource() {

-	

-	return _propertySource.getValue();

-}

-/**

- * @param strb java.lang.StringBuffer

- * @param iIndentation int

- */

-public void getStatusString(java.lang.StringBuffer strb, int iIndentation) {

-

-	if (getStatus().equals(UpdateManagerConstants.STATUS_SUCCEEDED) == true) {

-		return;

-	}

-	else if (getStatus().equals(UpdateManagerConstants.STATUS_PENDING) == true) {

-		return;

-	}

-

-	else {

-		if (getAction().equals(UpdateManagerConstants.OPERATION_COPY) == true) {

-			indent(strb, iIndentation);

-			strb.append(UpdateManagerStrings.getString("S_Copy") + ": " + getSource());

-		}

-		else if (getAction().equals(UpdateManagerConstants.OPERATION_UNZIP_INSTALL) ||

-				getAction().equals(UpdateManagerConstants.OPERATION_UNZIP_PLUGINS) == true) {

-			indent(strb, iIndentation);

-			strb.append(UpdateManagerStrings.getString("S_Install") + ": " + getSource());

-		}

-

-		// Obtain messages

-		//----------------

-		for (int i = 0; i < _alMessages.size(); ++i) {

-			indent(strb, iIndentation + 2);

-			strb.append(((UMSessionManagerMessage) _alMessages.get(i)).getText());

-		}

-	}

-}

-/**

- *

- * @return java.lang.String

- */

-public String getTarget() {

-	

-	return _propertyTarget.getValue();

-}

-/**

- *

- * @param actionType java.lang.String

- */

-public void setAction(String strAction) {

-	_propertyAction.setValue( strAction != null ? strAction : UpdateManagerConstants.STRING_EMPTY );

-}

-/**

- *

- */

-public void setId( String strID ) {

-	_propertyID.setValue( strID != null ? strID : UpdateManagerConstants.STRING_EMPTY );

-}

-/**

- *

- */

-public void setSource( String strSource ) {

-	_propertySource.setValue( strSource != null ? strSource : UpdateManagerConstants.STRING_EMPTY );

-}

-/**

- *

- */

-public void setTarget( String strTarget ) {

-	_propertyTarget.setValue( strTarget != null ? strTarget : UpdateManagerConstants.STRING_EMPTY );

-}

-/**

- *

- * 

- */

-public boolean undoCopy(IProgressMonitor progressMonitor) {

-

-	String strErrorMessage = null;

-

-	// Output URL

-	//-----------

-	URL urlOutput = null;

-

-	try {

-		urlOutput = new URL(getTarget());

-	}

-	catch (MalformedURLException ex) {

-		strErrorMessage = createMessageString(UpdateManagerStrings.getString("S_Target_URL_is_malformed"), ex);

-	}

-

-	if (urlOutput != null) {

-

-		// Convert the URL to a string

-		//----------------------------

-		String strFilespec = UMEclipseTree.getFileInPlatformString(urlOutput);

-

-		// Delete the file

-		//----------------

-		File file = new File(strFilespec);

-		if (file.exists() == true) {

-			if (file.delete() == false) {

-				strErrorMessage = UpdateManagerStrings.getString("S_Unable_to_delete_file") + ": " + strFilespec;

-			}

-		}

-	}

-

-	// Reset the number of attempts

-	//-----------------------------

-	resetAttemptCount();

-

-	// Error return

-	//-------------

-	if (strErrorMessage != null) {

-		if (getStatus().equals(UpdateManagerConstants.STATUS_SUCCEEDED) == true)

-			setStatus(UpdateManagerConstants.STATUS_SUCCEEDED_UNDO_FAILED);

-		else

-			setStatus(UpdateManagerConstants.STATUS_FAILED_UNDO_FAILED);

-

-		return false;

-	}

-

-	// Successful return

-	//------------------

-	if (getStatus().equals(UpdateManagerConstants.STATUS_SUCCEEDED) == true)

-		setStatus(UpdateManagerConstants.STATUS_SUCCEEDED_UNDO_SUCCEEDED);

-	else

-		setStatus(UpdateManagerConstants.STATUS_FAILED_UNDO_SUCCEEDED);

-

-	return true;

-}

-/**

- *

- * 

- */

-public boolean undoUnzip(IProgressMonitor progressMonitor) {

-

-	String strErrorMessage = null;

-

-	// Input URL

-	//----------

-	URL urlInput = null;

-	try {

-		urlInput = new URL(getSource());

-	}

-	catch (MalformedURLException ex) {

-		strErrorMessage = createMessageString(UpdateManagerStrings.getString("S_Source_URL_is_malformed"), ex);

-	}

-

-	// Output URL

-	//-----------

-	URL urlOutput = null;

-	try {

-		urlOutput = new URL(getTarget());

-	}

-	catch (MalformedURLException ex) {

-		strErrorMessage = createMessageString(UpdateManagerStrings.getString("S_Target_URL_is_malformed"), ex);

-	}

-

-	// For plugins or component/configuration jar, 

-	// set up the list of directories to look for

-	// This section contains subtle differences from doUnzip()

-	//--------------------------------------------------------

-	Vector dirNames = new Vector();

-	ArrayList productVIDs = new ArrayList();

-	ArrayList componentVIDs = new ArrayList();

-	ArrayList pluginVIDs = new ArrayList();

-	ArrayList fragmentVIDs = new ArrayList();

-	if (getAction() == UpdateManagerConstants.OPERATION_UNZIP_PLUGINS ) {

-		IComponentDescriptor comp = null;

-		if (getData() instanceof IComponentEntryDescriptor) {

-			comp = ((IComponentEntryDescriptor) getData()).getComponentDescriptor();

-		} else {

-			comp = (IComponentDescriptor) getData();

-		}

-		if (comp != null) {

-			IPluginEntryDescriptor[] plugins = comp.getPluginEntries();

-			for (int i=0; i<plugins.length; i++) {

-				dirNames.addElement( UMEclipseTree.PLUGINS_DIR + "/" + plugins[i].getDirName());

-				pluginVIDs.add(new LaunchInfo.VersionedIdentifier(plugins[i].getUniqueIdentifier(), plugins[i].getVersionStr()));

-			}

-			IFragmentEntryDescriptor[] fragments = comp.getFragmentEntries();

-			for (int i=0; i<fragments.length; i++) {

-				dirNames.addElement( UMEclipseTree.FRAGMENTS_DIR + "/" + fragments[i].getDirName());	

-				fragmentVIDs.add(new LaunchInfo.VersionedIdentifier(plugins[i].getUniqueIdentifier(), plugins[i].getVersionStr()));

-			}

-		} else {

-			strErrorMessage = UpdateManagerStrings.getString("S_Error_in_registry");

-		}

-	} else if (getAction() == UpdateManagerConstants.OPERATION_UNZIP_INSTALL) {

-		// rc = UpdateManagerConstants.INSTALL_XML_MISSING;

-		if (getData() instanceof IProductDescriptor) {

-			IProductDescriptor desc = (IProductDescriptor) getData();

-			dirNames.addElement(UMEclipseTree.INSTALL_DIR + "/" + UMEclipseTree.PRODUCTS_DIR + "/" + desc.getDirName() + "/");

-			productVIDs.add(new LaunchInfo.VersionedIdentifier(desc.getUniqueIdentifier(), desc.getVersionStr()));

-		} else { 

-			IComponentDescriptor desc = (IComponentDescriptor) getData();

-			dirNames.addElement(UMEclipseTree.INSTALL_DIR + "/" + UMEclipseTree.COMPONENTS_DIR + "/" + desc.getDirName() + "/");

-			componentVIDs.add(new LaunchInfo.VersionedIdentifier(desc.getUniqueIdentifier(), desc.getVersionStr()));

-		}

-	}

-

-		

-	// Create a file specification from the input URL

-	//-----------------------------------------------

-	String strFilespec = UMEclipseTree.getFileInPlatformString(urlInput);

-

-	JarFile jarFile = null;

-	

-	try {

-		jarFile = new JarFile(strFilespec);

-	}

-	catch (IOException ex) {

-		strErrorMessage = createMessageString(UpdateManagerStrings.getString("S_Unable_to_open_Jar_file"), ex);

-	}

-

-	if (jarFile != null) {

-

-		JarEntry entry = null;

-

-		int iCount = jarFile.size();

-

-		// Set up progress monitor

-		// Compute the filename without the path information

-		//--------------------------------------------------

-		String strFilename = strFilespec;

-		int iIndex = strFilespec.lastIndexOf(File.separatorChar);

-		

-		if (iIndex >= 0 && iIndex < strFilespec.length() - 1) {

-			strFilename = strFilespec.substring(iIndex + 1);

-		}

-		

-		if (progressMonitor != null) progressMonitor.beginTask(UpdateManagerStrings.getString("S_Undo") + ": " + strFilename, iCount);

-

-		// Do each jar file entry

-		//-----------------------

-		Enumeration enum = jarFile.entries();

-

-		while (enum.hasMoreElements() == true) {

-			entry = (JarEntry) enum.nextElement();

-			String entryName = entry.getName();

-			

-			if (getAction().equals(UpdateManagerConstants.OPERATION_UNZIP_PLUGINS)) {

-				// Remove the plugins and fragments.  Skip entries not under plugins/ or fragments/ trees

-				//----------------------------------------------------------------------------------------

-				if ((!entryName.startsWith(UMEclipseTree.PLUGINS_DIR)) &&

-					(!entryName.startsWith(UMEclipseTree.FRAGMENTS_DIR))) {

-					if (progressMonitor != null) progressMonitor.worked(1);

-					continue;

-				}												

-				if ((entryName.equals(UMEclipseTree.PLUGINS_DIR + "/")) ||

-					(entryName.equals(UMEclipseTree.FRAGMENTS_DIR + "/"))) {

-					if (progressMonitor != null) progressMonitor.worked(1);

-					continue;

-				}

-				// Don't bother cleaning up the entries not matching the expected list

-				// They weren't unzipped in the first place

-				//--------------------------------------------------------------------

-				String prefix = entryName;

-				int second_slash = entryName.indexOf("/", (entryName.indexOf("/")+1));

-				if (second_slash > 0) 

-					prefix = entryName.substring(0,second_slash);

-				int match = dirNames.indexOf(prefix);

-				if (match < 0) {   // not a valid plugin

-					continue;

-				}

-			} else if (getAction().equals(UpdateManagerConstants.OPERATION_UNZIP_INSTALL)) {

-				// Remove the component/product items.  Skip over entries that don't match the dirname

-				//------------------------------------------------------------------------------------

-				if (!entryName.startsWith((String)dirNames.firstElement())) {

-					if (progressMonitor != null) progressMonitor.worked(1);

-					continue;

-				}

-			} else if (getAction().equals(UpdateManagerConstants.OPERATION_UNZIP_BINDIR)) {

-				// No-op.   The bin directory contents cannot be undone

-				//-----------------------------------------------------

-				break;

-			}

-

-			if (urlOutput != null) {

-				// Build pathname to actual install location

-				//------------------------------------------

-				strFilespec = urlOutput.getFile() + "/" + entryName;

-				strFilespec = strFilespec.replace('/',File.separatorChar);

-				int k = strFilespec.indexOf(UMEclipseTree.DEVICE_SEPARATOR);

-				if (k != -1 && strFilespec.startsWith(File.separator)) {

-					strFilespec = strFilespec.substring(1);

-				}

-

-				// Delete the file or directory

-				//-----------------------------

-				File file = new File(strFilespec);

-				if (file.exists() == true) {

-					if (file.isDirectory())

-						UpdateManager.cleanupDirectory(file);

-					if (file.delete() == false) {

-						strErrorMessage = UpdateManagerStrings.getString("S_Unable_to_delete_file") + ": " + strFilespec;

-					}

-				}

-			}

-		if (progressMonitor != null) progressMonitor.worked(1);		

-		} // while

-

-		try {

-			jarFile.close();

-		} catch (java.io.IOException ex) {

-			// unchecked

-		}

-	} // if jarFile is not null

-

-	// Call LaunchInfo.installConfirmed if all clean

-	//-----------------------------------------------

-	if (strErrorMessage == null) {

-		if (!LaunchInfo.getCurrent().installConfirmed(productVIDs, componentVIDs, pluginVIDs, fragmentVIDs)) {

-			strErrorMessage = UpdateManagerStrings.getString("S_Error_occurred_during_installation_completion");

-		}

-	}

-	

-	if (progressMonitor != null) progressMonitor.done();

-	

-	// Reset the number of attempts

-	//-----------------------------

-	resetAttemptCount();

-

-	// Error return

-	//-------------

-	if (strErrorMessage != null) {

-		if (getStatus().equals(UpdateManagerConstants.STATUS_SUCCEEDED) == true)

-			setStatus(UpdateManagerConstants.STATUS_SUCCEEDED_UNDO_FAILED);

-		else

-			setStatus(UpdateManagerConstants.STATUS_FAILED_UNDO_FAILED);

-

-		return false;

-	}

-

-	// Successful return

-	//------------------

-	if (getStatus().equals(UpdateManagerConstants.STATUS_SUCCEEDED) == true)

-		setStatus(UpdateManagerConstants.STATUS_SUCCEEDED_UNDO_SUCCEEDED);

-	else

-		setStatus(UpdateManagerConstants.STATUS_FAILED_UNDO_SUCCEEDED);

-

-	return true;

-}

-/**

- *

- * 

- */

-public boolean undoVerify(IProgressMonitor progressMonitor) {

-	

-	resetAttemptCount();

-	

-	if (getStatus().equals(UpdateManagerConstants.STATUS_SUCCEEDED) == true)

-		setStatus(UpdateManagerConstants.STATUS_SUCCEEDED_UNDO_SUCCEEDED);

-	else

-		setStatus(UpdateManagerConstants.STATUS_FAILED_UNDO_SUCCEEDED);

-

-	return true;

-}

-}

diff --git a/update/org.eclipse.update/src/org/eclipse/update/internal/core/UMSessionManagerParcel.java b/update/org.eclipse.update/src/org/eclipse/update/internal/core/UMSessionManagerParcel.java
deleted file mode 100644
index b0c7d97..0000000
--- a/update/org.eclipse.update/src/org/eclipse/update/internal/core/UMSessionManagerParcel.java
+++ /dev/null
@@ -1,327 +0,0 @@
-package org.eclipse.update.internal.core;

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

-

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.core.internal.boot.update.*;

-import java.util.*;

-

-/**

- * This class represents either a component or a product.  A parcel can

- * have sub parcels, and copy objects.  Attributes are action (add, fix), id, status (pending, complete),

- * type (component / product).

- */

-

-public class UMSessionManagerParcel extends UMSessionManagerEntry {

-	

-	protected ArrayList _alParcels = new ArrayList();

-	protected ArrayList _alOperations   = new ArrayList();

-	

-	protected ILogEntryProperty _propertyAction = null;

-	protected ILogEntryProperty _propertyID     = null;

-	protected ILogEntryProperty _propertyType   = null;

-/**

- * UpdateManagerParcel constructor comment.

- */

-public UMSessionManagerParcel( ILogEntry logEntry ) {

-	super( logEntry );

-

-	// Action

-	//-------

-	_propertyAction = _logEntry.getProperty(UpdateManagerConstants.STRING_ACTION);

-

-	if (_propertyAction == null) {

-		_propertyAction = new LogEntryProperty(logEntry, UpdateManagerConstants.STRING_ACTION, UpdateManagerConstants.STRING_EMPTY );

-		logEntry.addProperty( _propertyAction );

-	}

-

-	// Id

-	//---

-	_propertyID = _logEntry.getProperty(UpdateManagerConstants.STRING_ID);

-

-	if (_propertyID == null) {

-		_propertyID = new LogEntryProperty(logEntry, UpdateManagerConstants.STRING_ID, UpdateManagerConstants.STRING_EMPTY );

-		logEntry.addProperty( _propertyID );

-	}

-

-	// Type

-	//-----

-	_propertyType = _logEntry.getProperty(UpdateManagerConstants.STRING_TYPE);

-

-	if (_propertyType == null) {

-		_propertyType = new LogEntryProperty(logEntry, UpdateManagerConstants.STRING_TYPE, UpdateManagerConstants.STRING_EMPTY );

-		logEntry.addProperty( _propertyType );

-	}

-}

-/**

- * @param logEntry org.eclipse.update.internal.core.LogEntry

- */

-public void buildTreeFromLog(ILogEntry logEntry) {

-

-	super.buildTreeFromLog( logEntry );

-	

-	// Action

-	//-------

-	ILogEntryProperty property = _logEntry.getProperty(UpdateManagerConstants.STRING_ACTION);

-

-	if (property != null) {

-		_propertyAction = property;

-	}

-

-	// Id

-	//---

-	property = _logEntry.getProperty(UpdateManagerConstants.STRING_ID);

-

-	if (property != null) {

-		_propertyID = property;

-	}

-

-	// Type  

-	//-----

-	property = _logEntry.getProperty(UpdateManagerConstants.STRING_TYPE);

-

-	if (property != null) {

-		_propertyType = property;

-	}

-		

-	ILogEntry[] entries = logEntry.getChildEntries();

-

-	// Parcels

-	//--------	

-	int iIndex = 0;

-	UMSessionManagerParcel parcel = null;

-	

-	for( int i = 0; i < entries.length; ++i) {

-		if (entries[i] != null && entries[i].getName().equals(UpdateManagerConstants.STRING_PARCEL) == true) {

-			parcel = new UMSessionManagerParcel( entries[i] );			

-	        _alParcels.add( parcel );

-

-	        parcel.buildTreeFromLog( entries[i] );

-		}

-	}

-

-	// Operations

-	//-----------

-	iIndex = 0;

-	UMSessionManagerOperation operation = null;

-	

-	for( int i = 0; i < entries.length; ++i) {

-		if (entries[i] != null && entries[i].getName().equals(UpdateManagerConstants.STRING_OPERATION) == true) {

-			operation = new UMSessionManagerOperation( entries[i] );			

-	        _alOperations.add( operation );

-

-	        operation.buildTreeFromLog( entries[i] );

-		}

-	}

-}

-/**

- * @return org.eclipse.update.internal.core.UMSessionManagerOperation

- * @param actionType java.lang.String

- */

-public UMSessionManagerOperation createOperation() {

-

-	// Create a new log entry

-	//-----------------------

-	ILogEntry logEntryChild = new LogEntry( _logEntry, UpdateManagerConstants.STRING_OPERATION );

-	_logEntry.addChildEntry( logEntryChild );

-

-	// Create the operation object

-	//----------------------------

-	UMSessionManagerOperation operation = new UMSessionManagerOperation( logEntryChild );

-	_alOperations.add( operation );

-	

-	return operation;

-}

-/**

- * Creates a sub-parcel

- * @return org.eclipse.update.internal.core.UpdateManagerParcel

- * @param actionType java.lang.String

- */

-public UMSessionManagerParcel createParcel() {

-

-	// Create a new log entry

-	//-----------------------

-	ILogEntry logEntryChild = new LogEntry( _logEntry, UpdateManagerConstants.STRING_PARCEL );

-	_logEntry.addChildEntry( logEntryChild );

-

-	// Create the parcel object

-	//-------------------------

-	UMSessionManagerParcel parcel = new UMSessionManagerParcel( logEntryChild );

-	_alParcels.add( parcel );

-	

-	return parcel;

-}

-/**

- * Execute any pending or failed updates.

- */

-public boolean execute(IProgressMonitor progressMonitor) {

-

-	// Stop if any failure occurs

-	//---------------------------

-	boolean bSuccess = true;

-

-	// Parcels may be sequential, do in forward order

-	//-----------------------------------------------

-	for (int i = 0; i < _alParcels.size(); ++i) {

-

-		if (((UMSessionManagerParcel) _alParcels.get(i)).execute(progressMonitor) == false) {

-			bSuccess = false;

-			break;

-		}

-	}

-

-	// Operations may be sequential, do in forward order

-	//--------------------------------------------------

-	if (bSuccess == true) {

-		for (int i = 0; i < _alOperations.size(); ++i) {

-

-			if (((UMSessionManagerOperation) _alOperations.get(i)).execute(progressMonitor) == false) {

-				bSuccess = false;

-				break;

-			}

-		}

-	}

-

-	// Status

-	//-------

-	setStatus(bSuccess == true ? UpdateManagerConstants.STATUS_SUCCEEDED : UpdateManagerConstants.STATUS_FAILED);

-

-	incrementAttemptCount();

-

-	return bSuccess;

-}

-/**

- * Execute any pending or failed updates.

- */

-public boolean executeUndo(org.eclipse.core.runtime.IProgressMonitor progressMonitor) {

-

-	// Undo only failed attempts

-	//--------------------------

-	if (getStatus().equals(UpdateManagerConstants.STATUS_FAILED) == false) {

-		return true;

-	}

-

-	// Attempt all even if failure occurs

-	//-----------------------------------	

-	boolean bSuccess = true;

-

-	// Parcels may be sequential, undo in reverse order

-	//-------------------------------------------------

-	for (int i = _alParcels.size() - 1; i >= 0; --i) {

-

-		if (((UMSessionManagerParcel) _alParcels.get(i)).executeUndo(progressMonitor) == false) {

-			bSuccess = false;

-		}

-	}

-

-	// Operations may be sequential, undo in reverse order

-	//----------------------------------------------------

-	for (int i = _alOperations.size() - 1; i >= 0; --i) {

-

-		if (((UMSessionManagerOperation) _alOperations.get(i)).executeUndo(progressMonitor) == false) {

-			bSuccess = false;

-		}

-	}

-

-	// Status

-	//-------

-	setStatus(bSuccess == true ? UpdateManagerConstants.STATUS_FAILED_UNDO_SUCCEEDED : UpdateManagerConstants.STATUS_FAILED_UNDO_FAILED);

-

-	resetAttemptCount();

-

-	return bSuccess;

-}

-/**

- * @return java.lang.String

- */

-public String getAction() {

-	

-	return _propertyAction.getValue();

-}

-/**

- * @return java.lang.String

- */

-public String getId() {

-	

-	return _propertyID.getValue();

-}

-/**

- * Returns all operations

- * @return org.eclipse.update.internal.core.UMSessionManagerOperation[]

- */

-public UMSessionManagerOperation[] getOperations() {

-

-	UMSessionManagerOperation[] operations = new UMSessionManagerOperation[_alOperations.size()];

-	return (UMSessionManagerOperation[])_alOperations.toArray( operations );

-}

-/**

- * Returns all sub-parcels

- * @return org.eclipse.update.internal.core.UpdateManagerParcel[]

- */

-public UMSessionManagerParcel[] getParcels() {

-

-	UMSessionManagerParcel[] parcels = new UMSessionManagerParcel[_alParcels.size()];

-	return (UMSessionManagerParcel[])_alParcels.toArray( parcels );

-}

-/**

- * @param strb java.lang.StringBuffer

- * @param iIndentation int

- */

-public void getStatusString(java.lang.StringBuffer strb, int iIndentation) {

-

-	if (getStatus().equals(UpdateManagerConstants.STATUS_SUCCEEDED) == true) {

-		return;

-	}

-

-	else {

-		// Parcel label

-		//-------------

-		IInstallable descriptor = (IInstallable) getData();

-

-		indent(strb, iIndentation);

-		strb.append( descriptor.getLabel());

-

-

-		// Parcels may be sequential, do in forward order

-		//-----------------------------------------------

-		for (int i = 0; i < _alParcels.size(); ++i) {

-

-			((UMSessionManagerParcel) _alParcels.get(i)).getStatusString(strb, iIndentation + 2);

-		}

-

-		// Operations may be sequential, do in forward order

-		//--------------------------------------------------

-		for (int i = 0; i < _alOperations.size(); ++i) {

-

-			((UMSessionManagerOperation) _alOperations.get(i)).getStatusString(strb, iIndentation + 2);

-		}

-	}

-}

-/**

- * @return java.lang.String

- */

-public String getType() {

-	

-	return _propertyType.getValue();

-}

-/**

- *

- */

-public void setAction( String strAction ) {

-	_propertyAction.setValue( strAction != null ? strAction : UpdateManagerConstants.STRING_EMPTY );

-}

-/**

- *

- */

-public void setId( String strID ) {

-	_propertyID.setValue( strID != null ? strID : UpdateManagerConstants.STRING_EMPTY );

-}

-/**

- *

- */

-public void setType( String strType ) {

-	_propertyType.setValue( strType != null ? strType : UpdateManagerConstants.STRING_EMPTY );

-}

-}

diff --git a/update/org.eclipse.update/src/org/eclipse/update/internal/core/UMSessionManagerSession.java b/update/org.eclipse.update/src/org/eclipse/update/internal/core/UMSessionManagerSession.java
deleted file mode 100644
index 369855a..0000000
--- a/update/org.eclipse.update/src/org/eclipse/update/internal/core/UMSessionManagerSession.java
+++ /dev/null
@@ -1,207 +0,0 @@
-package org.eclipse.update.internal.core;

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

-

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.core.internal.boot.update.*;

-import java.util.Date;

-import java.util.*;

-

-/**

- * This class represents a session in which update manager operations are

- * executed.  This class contains parcel objects and has status and timestamp

- * as its attributes.  The timestamp attribute is automatically set when the session

- * is created for the first time.

- */

-

-public class UMSessionManagerSession extends UMSessionManagerEntry {

-	protected ArrayList _alParcels = new ArrayList();

-	protected ILogEntryProperty _propertyTimestamp = null;

-/**

- * UpdateManagerSession constructor comment.

- */

-public UMSessionManagerSession(ILogEntry logEntry) {

-	super( logEntry );

-

-	// Timestamp

-	//----------

-	_propertyTimestamp = _logEntry.getProperty(UpdateManagerConstants.STRING_TIMESTAMP);

-

-	if (_propertyTimestamp == null) {

-		_propertyTimestamp = new LogEntryProperty(logEntry, UpdateManagerConstants.STRING_TIMESTAMP, new Date().toString() );

-		logEntry.addProperty( _propertyTimestamp );

-	}

-}

-/**

- * @param logEntry org.eclipse.update.internal.core.LogEntry

- */

-public void buildTreeFromLog(ILogEntry logEntry) {

-	

-	super.buildTreeFromLog( logEntry );

-	

-	// Timestamp

-	//----------

-	ILogEntryProperty property = _logEntry.getProperty(UpdateManagerConstants.STRING_TIMESTAMP);

-

-	if (property != null) {

-		_propertyTimestamp = property;

-	}

-

-	

-	ILogEntry[] entries = logEntry.getChildEntries();

-	

-	// Parcels

-	//--------

-	int iIndex = 0;

-	UMSessionManagerParcel parcel = null;

-	

-	for( int i = 0; i < entries.length; ++i) {

-		if (entries[i] != null && entries[i].getName().equals(UpdateManagerConstants.STRING_PARCEL) == true) {

-			parcel = new UMSessionManagerParcel( entries[i] );			

-	        _alParcels.add( parcel );

-

-	        parcel.buildTreeFromLog( entries[i] );

-		}

-	}

-}

-/**

- *

- * @return org.eclipse.update.internal.core.UMTaskManagerParcel

- * @param actionType java.lang.String

- */

-public UMSessionManagerParcel createParcel() {

-

-	// Create a new log entry

-	//-----------------------

-	ILogEntry logEntryChild = new LogEntry( _logEntry, UpdateManagerConstants.STRING_PARCEL );

-	_logEntry.addChildEntry( logEntryChild );

-

-	// Create the copy object

-	//-----------------------

-	UMSessionManagerParcel parcel = new UMSessionManagerParcel( logEntryChild );

-	_alParcels.add( parcel );

-	

-	return parcel;

-}

-/**

- * Execute any pending or failed updates.

- */

-public boolean execute(IProgressMonitor progressMonitor) {

-

-	// Attempt all even if failure occurs

-	//-----------------------------------	

-	boolean bSuccess = true;

-

-	// Parcels may be sequential, do in forward order

-	//-----------------------------------------------

-	for (int i = 0; i < _alParcels.size(); ++i) {

-

-		if (((UMSessionManagerParcel) _alParcels.get(i)).execute(progressMonitor) == false) {

-			bSuccess = false;

-		}

-	}

-

-	// Status

-	//-------

-	setStatus(bSuccess == true ? UpdateManagerConstants.STATUS_SUCCEEDED : UpdateManagerConstants.STATUS_FAILED);

-

-	incrementAttemptCount();

-

-	return bSuccess;

-}

-/**

- * Execute any pending or failed updates.

- */

-public boolean executeUndo(org.eclipse.core.runtime.IProgressMonitor progressMonitor) {

-

-	// Undo only failed attempts

-	//--------------------------

-	if (getStatus().equals(UpdateManagerConstants.STATUS_FAILED) == false) {

-		return true;

-	}

-	

-	// Attempt all even if failure occurs

-	//-----------------------------------	

-	boolean bSuccess = true;

-

-	// Parcels may be sequential, undo in reverse order

-	//-------------------------------------------------

-	for (int i = _alParcels.size() - 1; i >= 0; --i) {

-

-		if (((UMSessionManagerParcel) _alParcels.get(i)).executeUndo(progressMonitor) == false) {

-			bSuccess = false;

-		}

-	}

-

-	// Status

-	//-------

-	setStatus(bSuccess == true ? UpdateManagerConstants.STATUS_FAILED_UNDO_SUCCEEDED : UpdateManagerConstants.STATUS_FAILED_UNDO_FAILED);

-

-	resetAttemptCount();

-	

-	return bSuccess;

-}

-/**

- * Returns all parcels

- * @return org.eclipse.update.internal.core.UMSessionManagerParcel[]

- */

-public UMSessionManagerParcel[] getParcels() {

-

-	UMSessionManagerParcel[] parcels = new UMSessionManagerParcel[_alParcels.size()];

-	return (UMSessionManagerParcel[])_alParcels.toArray( parcels );

-}

-/**

- * @return java.lang.String

- */

-public String getStatusString() {

-	

-	StringBuffer strb = new StringBuffer();

-

-	getStatusString( strb, 0 );

-	

-	return strb.toString();

-}

-/**

- * @param strb java.lang.StringBuffer

- * @param iIndentation int

- */

-public void getStatusString(java.lang.StringBuffer strb, int iIndentation) {

-

-	String strStatus = getStatus();

-

-	if (strStatus.equals(UpdateManagerConstants.STATUS_SUCCEEDED) == true) {

-		strb.append(UpdateManagerStrings.getString("S_Installations_have_completed_successfully"));

-		strb.append("\n");

-		strb.append(UpdateManagerStrings.getString("S_You_must_restart_the_workbench_to_activate_any_changes"));

-	}

-

-	else {

-		strb.append(UpdateManagerStrings.getString("S_An_installation_error_or_cancellation_has_occurred"));

-

-		// Parcels may be sequential, do in forward order

-		//-----------------------------------------------

-		for (int i = 0; i < _alParcels.size(); ++i) {

-

-			((UMSessionManagerParcel) _alParcels.get(i)).getStatusString(strb, 2);

-		}

-	}

-}

-/**

- * @return java.lang.String

- */

-public String getTimestamp() {

-	

-	return _propertyTimestamp.getValue();

-}

-/**

- * Returns whether this session is complete

- * @return boolean

- */

-public boolean isComplete() {

-

-	return _propertyStatus.getValue().equals(UpdateManagerConstants.STATUS_SUCCEEDED) ||

-		   _propertyStatus.getValue().equals(UpdateManagerConstants.STATUS_FAILED_UNDO_SUCCEEDED);

-}

-}

diff --git a/update/org.eclipse.update/src/org/eclipse/update/internal/core/URLHandler.java b/update/org.eclipse.update/src/org/eclipse/update/internal/core/URLHandler.java
deleted file mode 100644
index 50eed69..0000000
--- a/update/org.eclipse.update/src/org/eclipse/update/internal/core/URLHandler.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package org.eclipse.update.internal.core;

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

-

-import org.eclipse.core.internal.boot.update.*;

-import org.eclipse.webdav.http.client.*;

-import org.eclipse.webdav.client.WebDAVFactory;

-import org.eclipse.webdav.Context;

-import java.io.*;

-import java.net.*;

-

-public class URLHandler extends BaseURLHandler {

-

-	private static HttpClient http = null;

-	private static WebDAVFactory factory = null;

-	

-	private static final String HTTP = "http";

-	

-	static class Response extends BaseURLHandler.Response {

-		private org.eclipse.webdav.http.client.Response r = null;

-		private Response(org.eclipse.webdav.http.client.Response r) {

-			this.r = r;

-		}

-		public InputStream getInputStream() throws IOException {

-			return r.getInputStream();

-		}

-		public long getContentLength() {

-			return r.getContentLength();

-		}

-		public int getResponseCode() {

-			return r.getStatusCode();

-		}

-		public String getResponseMessage() {

-			return r.getStatusMessage();

-		}

-	}

-

-private URLHandler() {}

-public static BaseURLHandler.Response open(URL url) throws IOException {

-

-	if (url==null) return null;

-

-	if (!url.getProtocol().equals(HTTP)) {

-		URLConnection c = url.openConnection();

-		Context ctx = factory.newContext();

-		int i = 1;

-		String name = null;

-		while ((name = c.getHeaderFieldKey(i)) != null) {

-			ctx.put(name.toLowerCase(), c.getHeaderField(i));

-			i++;

-		}	

-		InputStream is = c.getInputStream();	

-		return new Response(new org.eclipse.webdav.http.client.Response(UNKNOWN_STATUS,UNKNOWN_MSG,ctx,is));

-	}

-	else {

-		if (http==null) throw new IllegalStateException(UpdateManagerStrings.getString("S_HTTP_client_not_set"));	

-		Request request = new Request("GET", url, null);

-		return new Response(http.invoke(request));

-	}	

-}

-protected BaseURLHandler.Response openURL(URL url) throws IOException {

-	return URLHandler.open(url);

-}

-public static void setHttpClient(HttpClient c) {

-

-	if (http==null) {

-		http = c;

-		factory = new WebDAVFactory();

-

-		// setup this handler as the handler for boot portion of update manager

-		BaseURLHandler.setURLHandler(new URLHandler());

-	}

-}

-}

diff --git a/update/org.eclipse.update/src/org/eclipse/update/internal/core/UpdateManager.java b/update/org.eclipse.update/src/org/eclipse/update/internal/core/UpdateManager.java
deleted file mode 100644
index e456884..0000000
--- a/update/org.eclipse.update/src/org/eclipse/update/internal/core/UpdateManager.java
+++ /dev/null
@@ -1,640 +0,0 @@
-package org.eclipse.update.internal.core;

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

-

-import java.io.File;

-import java.net.MalformedURLException;

-import java.net.URL;

-import java.util.TreeSet;

-

-import org.eclipse.core.internal.boot.LaunchInfo;

-import org.eclipse.core.internal.boot.LaunchInfo.VersionedIdentifier;

-import org.eclipse.core.internal.boot.update.IComponentDescriptor;

-import org.eclipse.core.internal.boot.update.IComponentEntryDescriptor;

-import org.eclipse.core.internal.boot.update.IFragmentEntryDescriptor;

-import org.eclipse.core.internal.boot.update.IInstallable;

-import org.eclipse.core.internal.boot.update.IPluginEntryDescriptor;

-import org.eclipse.core.internal.boot.update.IProductDescriptor;

-import org.eclipse.core.internal.boot.update.IUMRegistry;

-import org.eclipse.core.internal.boot.update.IURLNamePair;

-import org.eclipse.core.internal.boot.update.LogStoreException;

-import org.eclipse.core.internal.boot.update.UMEclipseTree;

-import org.eclipse.core.internal.boot.update.UMRegistryManager;

-import org.eclipse.core.internal.boot.update.UpdateManagerConstants;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.swt.widgets.Shell;

-import org.eclipse.update.internal.ui.JarVerificationService;

-

-/**

- * Update Manager updates a workstation in one of three modes:

- * <ol>

- * <li>local</li>

- * <li>remote</li>

- * <li>remote cached</li>

- * </ol>

- * Usage:

- * <ol>

- * <li>Create an instance of this class</li>

- * <li>Set persistent properties as required</li>

- * <ul>

- * <li>mode</li>

- * <li>update log URL</li>

- * <li>history log URL</li>

- * </ul>

- * <li>Call the initialize function</li>

- * <li>Call the update function</li>

- * </ol>

- * Persistent properties are loaded before any are changed, and saved after any

- * are changed.

- */

-

-public class UpdateManager {

-

-	// Package name for this class

-	// Used by UpdateManagerStrings to obtain its resource bundle properties file

-	//---------------------------------------------------------------------------

-	public static final String _strPackageName = "org.eclipse.update.internal.core";

-	public static UpdateManager _updateManagerInstance = null;

-	

-	// Persistent properties

-	//----------------------

-	protected int    _iMode         = UpdateManagerConstants.MODE_LOCAL;

-	protected String _strUpdateLogURL  = null;

-	protected String _strHistoryLogURL = null;

-

-	// Instance state data

-	//--------------------

-	protected UMRegistryManager _registryManager = null;

-	protected UMSessionManager  _sessionManager  = null;

-	protected Shell             _shell           = null;

-	

-	protected JarVerificationService _jarVerifier = null;

-/**

- * Constructs an instance of this class, then initializes by loading its persistent properties

- */

-public UpdateManager() {

-}

-/**

- * Constructs an instance of this class, then initializes by loading its persistent properties

- */

-public UpdateManager( Shell shell ) {

-	_updateManagerInstance = this;

-	_shell = shell;

-}

-/**

- * Deletes all files in the staging area.

- */

-public void cleanup() {

-	String strStagingDirectory = UMEclipseTree.getFileInPlatformString(UMEclipseTree.getStagingArea());

-

-	File fileStagingDirectory = new File(strStagingDirectory);

-

-	if (fileStagingDirectory.exists() == true) {

-		File[] files = fileStagingDirectory.listFiles();

-		for (int i = 0; i < files.length; ++i) {

-			if (files[i].isDirectory() == true) {

-				cleanupDirectory(files[i]);

-			}

-			boolean bSuccessful = files[i].delete();

-			

-		}

-	}

-}

-/**

- */

-public static void cleanupDirectory(File fileDirectory) {

-

-	File[] files = fileDirectory.listFiles();

-	

-	for (int i = 0; i < files.length; ++i) {

-		if (files[i].isDirectory() == true) {

-			cleanupDirectory(files[i]);

-		}

-

-		boolean bSuccessful = files[i].delete();

-//		if (!bSuccessful)

-//			System.out.println("ooops!" + files[i]);

-	}

-}

-/**

- */

-public UMSessionManagerSession createSession(IInstallable[] descriptors, boolean bVerifyJars) throws UpdateManagerException {

-

-	// FOR NOW DO NOT DO JAR VERIFICATION

-	//-----------------------------------

-	bVerifyJars = false;

-

-	// Create a new update session

-	//----------------------------

-	UMSessionManagerSession session = _sessionManager.createUpdateSession();

-

-	// Create a definer that can define the operations required

-	//---------------------------------------------------------

-	ISessionDefiner sessionDefiner = new UMSessionDefinerReferenceUpdate();

-	

-	// Define a set of operations

-	//---------------------------

-	sessionDefiner.defineOperations(session, descriptors, bVerifyJars);

-

-	// Save the update log

-	//--------------------

-	try {

-		_sessionManager.saveUpdateLog();

-	}

-	catch (LogStoreException ex) {

-		throw new UpdateManagerException(ex.getMessage());

-	}

-

-	return session;

-}

-/**

- * Updates the local machine by:

- * <ol>

- * <li>defining the operations</li>

- * <li>downloading any new objects</li>

- * <li>applying any downloaded updates</li>

- * <li>displaying a progress monitor</li>

- * </ol>

- */

-public UMSessionManagerSession executeSession( UMSessionManagerSession session, IProgressMonitor progressMonitor ) throws UpdateManagerException {

-

-	// Throw any exception when complete

-	//----------------------------------

-	UpdateManagerException umException = null;

-	

-	// Execute the session

-	//--------------------

-	_sessionManager.executeSession( session, progressMonitor );

-

-	// Move successful sessions from update log to history log

-	//--------------------------------------------------------

-	try {

-		_sessionManager.updateAndSaveLogs();

-	}

-	catch (LogStoreException ex) {

-		if (umException != null) {

-			umException = new UpdateManagerException("S_Unable_to_save_update_logs");

-		}

-	}

-

-	// Throw any exceptions found

-	//---------------------------

-	if (umException != null) {

-		throw umException;

-	}

-

-	return session;

-}

-/**

- * Updates the local machine by:

- * <ol>

- * <li>defining the operations</li>

- * <li>downloading any new objects</li>

- * <li>applying any downloaded updates</li>

- * <li>displaying a progress monitor</li>

- * </ol>

- */

-public UMSessionManagerSession executeSessionUndo( UMSessionManagerSession session, IProgressMonitor progressMonitor ) throws UpdateManagerException {

-

-	// Throw any exception when complete

-	//----------------------------------

-	UpdateManagerException umException = null;

-	

-	// Execute the session

-	//--------------------

-	_sessionManager.executeSessionUndo( session, progressMonitor );

-

-	// Move successful sessions from update log to history log

-	//--------------------------------------------------------

-	try {

-		_sessionManager.updateAndSaveLogs();

-	}

-	catch (LogStoreException ex) {

-		if (umException != null) {

-			umException = new UpdateManagerException("S Unable to save update logs");

-		}

-	}

-

-	// Throw any exceptions found

-	//---------------------------

-	if (umException != null) {

-		throw umException;

-	}

-

-	return session;

-}

-/**

- */

-public static UpdateManager getCurrentInstance() {

-	return _updateManagerInstance;

-}

-/**

- * Takes a string with an Id + '_' + Version, and returns the Id.

- */

-private String getIdFromInfoString(String strInfo) {

-

-	String strId = null;

-

-	int iIndex = strInfo.lastIndexOf('_');

-	

-	if (iIndex >= 0) {

-		strId = strInfo.substring(0, iIndex);

-	}

-

-	else {

-		strId = strInfo;

-	}

-

-	return strId;

-}

-// return the jar verifier

-

-public JarVerificationService getJarVerifier() {

-	if (_jarVerifier == null)	

-		_jarVerifier = new JarVerificationService( _shell );

-	return _jarVerifier;

-}

-/**

- * Returns a list of components that require updating by:

- *<ol>

- *<li>Loading all product/component manifests from .install/tree </li>

- *<li>Determining which components require updating by:</li>

- *<ol>

- *<li>Collecting update URLs from each component</li>

- *<li>Collecting update URLs from products that components are a part of</li>

- *</ol>

- *<li>Determining what updates are available by:</li>

- *<ol>

- *<li>Accessing the update URL</li>

- *<li>Determining if the component is a newer version of the existing one</li>

- *</ol>

- *<li>

- *</ol>

- */

-public IURLNamePair[] getLocalDiscoveryURLs() {

-

-	IURLNamePair[] urlNPs = null;

-	

-	// Obtain the local registry

-	//--------------------------

-	IUMRegistry registry = _registryManager.getLocalRegistry();

-

-	// Create a list of all URLs

-	//--------------------------

-	TreeSet setURLs = new TreeSet( new UpdateManagerURLComparator() );

-

-	// Obtain a list of all installed components

-	//------------------------------------------

-	IComponentDescriptor[] componentDescriptors = registry.getComponentDescriptors();

-

-	// Obtain a list of discovery URLs

-	//--------------------------------

-	for (int i = 0; i < componentDescriptors.length; ++i) {

-		urlNPs = componentDescriptors[i].getDiscoveryURLs();

-

-		for (int j = 0; j < urlNPs.length; ++j) {

-			setURLs.add(urlNPs[j]);

-		}

-	}

-

-	// Obtain a list of all installed products

-	//----------------------------------------

-	IProductDescriptor[] productDescriptors = registry.getProductDescriptors();

-

-	// Obtain a list of discovery URLs

-	//--------------------------------

-	for (int i = 0; i < productDescriptors.length; ++i) {

-		urlNPs = productDescriptors[i].getDiscoveryURLs();

-

-		for (int j = 0; j < urlNPs.length; ++j) {

-			setURLs.add(urlNPs[j]);

-		}

-	}

-

-	urlNPs = new IURLNamePair[ setURLs.size() ];

-	System.arraycopy(setURLs.toArray(), 0, urlNPs, 0, setURLs.size() );

-	

-	return urlNPs;

-}

-/**

- * Returns a list of components that require updating by:

- *<ol>

- *<li>Loading all product/component manifests from .install/tree </li>

- *<li>Determining which components require updating by:</li>

- *<ol>

- *<li>Collecting update URLs from each component</li>

- *<li>Collecting update URLs from products that components are a part of</li>

- *</ol>

- *<li>Determining what updates are available by:</li>

- *<ol>

- *<li>Accessing the update URL</li>

- *<li>Determining if the component is a newer version of the existing one</li>

- *</ol>

- *<li>

- *</ol>

- */

-public IURLNamePair[] getLocalUpdateURLs() {

-

-	IURLNamePair[] urlNPs = null;

-	

-	// Obtain the local registry

-	//--------------------------

-	IUMRegistry registry = _registryManager.getLocalRegistry();

-

-	// Create a list of all URLs

-	//--------------------------

-	TreeSet setURLs = new TreeSet( new UpdateManagerURLComparator() );

-

-	// Obtain a list of all installed components

-	//------------------------------------------

-	IComponentDescriptor[] componentDescriptors = registry.getComponentDescriptors();

-

-	// Obtain a list of discovery URLs

-	//--------------------------------

-	for (int i = 0; i < componentDescriptors.length; ++i) {

-		urlNPs = componentDescriptors[i].getUpdateURLs();

-

-		for (int j = 0; j < urlNPs.length; ++j) {

-			setURLs.add(urlNPs[j]);

-		}

-	}

-

-	// Obtain a list of all installed products

-	//----------------------------------------

-	IProductDescriptor[] productDescriptors = registry.getProductDescriptors();

-

-	// Obtain a list of discovery URLs

-	//--------------------------------

-	for (int i = 0; i < productDescriptors.length; ++i) {

-		urlNPs = productDescriptors[i].getUpdateURLs();

-

-		for (int j = 0; j < urlNPs.length; ++j) {

-			setURLs.add(urlNPs[j]);

-		}

-	}

-

-	urlNPs = new IURLNamePair[ setURLs.size() ];

-	System.arraycopy(setURLs.toArray(), 0, urlNPs, 0, setURLs.size() );

-	

-	return urlNPs;

-}

-// return the local (current) registry

-

-public IUMRegistry getRegistryAt(URL url) {

-	

-	return _registryManager.getRegistryAt( url );

-}

-/**

- */

-public UMRegistryManager getRegistryManager() {

-	return _registryManager;

-}

-/**

- * Initializes the update and history log URLs,creates a session manager,

- * and creates a registry manager.

- */

-public void initialize() throws UpdateManagerException{

-

-	// Obtain install URL

-	//-------------------

-	URL urlBase = UMEclipseTree.getBaseInstallURL();

-	String strUrlBase = urlBase.toExternalForm();

-	String strUrlInstall = strUrlBase + "install/";

-

-	String strUrlUpdateLog = strUrlInstall + "update.log";

-	String strUrlHistoryLog = strUrlInstall + "history.log";

-

-	setUpdateLogURL(strUrlUpdateLog);

-	setHistoryLogURL(strUrlHistoryLog);

-

-	// Create a session manager

-	//-------------------------

-	try {

-		_sessionManager = new UMSessionManager(new URL(_strUpdateLogURL), new URL(_strHistoryLogURL), true);

-	}

-	catch (MalformedURLException ex) {

-		throw new UpdateManagerException("Invalid log URL specification");

-	}

-	catch (LogStoreException ex) {

-		throw new UpdateManagerException(ex.getMessage());

-	}

-

-	// Registry Manager

-	//-----------------

-	_registryManager = new UMRegistryManager(urlBase);

-}

-/**

- * 

- */

-public void removeComponent(IComponentDescriptor componentDescriptor) {

-	removeComponent(componentDescriptor, null);

-}

-/**

- * 

- */

-public void removeComponent(IComponentDescriptor componentDescriptor, IProductDescriptor productDescriptor) {

-

-	if( componentDescriptor == null )

-		return;

-		

-	LaunchInfo launchInfo = LaunchInfo.getCurrent();

-	LaunchInfo.VersionedIdentifier vid = null;

-

-	// Plugins

-	//--------

-	IPluginEntryDescriptor[] pluginEntries = componentDescriptor.getPluginEntries();

-

-	for (int i = 0; i < pluginEntries.length; ++i) {

-		vid = new LaunchInfo.VersionedIdentifier(pluginEntries[i].getUniqueIdentifier(), pluginEntries[i].getVersionStr());

-		launchInfo.removePlugin(vid);

-	}

-

-	// Fragments

-	//----------

-	IFragmentEntryDescriptor[] fragmentEntries = componentDescriptor.getFragmentEntries();

-

-	for (int i = 0; i < fragmentEntries.length; ++i) {

-		vid = new LaunchInfo.VersionedIdentifier(fragmentEntries[i].getUniqueIdentifier(), pluginEntries[i].getVersionStr());

-		launchInfo.removeFragment(vid);

-	}

-

-	// Component

-	//----------

-	vid = new LaunchInfo.VersionedIdentifier(componentDescriptor.getUniqueIdentifier(), componentDescriptor.getVersionStr());

-	launchInfo.removeComponent(vid);

-	_registryManager.removeComponentDescriptorFromLocal(componentDescriptor, productDescriptor);

-	

-	return;

-}

-/**

- * 

- */

-public void removeProduct(IProductDescriptor productDescriptor) {

-

-	if( productDescriptor == null )

-		return;

-		

-	// Components

-	//-----------

-	IComponentEntryDescriptor[] componentEntries = productDescriptor.getComponentEntries();

-

-	for (int i = 0; i < componentEntries.length; ++i) {

-		IComponentDescriptor componentDescriptor = componentEntries[i].getComponentDescriptor();

-		if (componentDescriptor.isRemovable(productDescriptor))

-			removeComponent(componentDescriptor, productDescriptor);

-	}

-

-	// Product

-	//--------

-	LaunchInfo.VersionedIdentifier vid = new LaunchInfo.VersionedIdentifier(productDescriptor.getUniqueIdentifier(), productDescriptor.getVersionStr());

-	LaunchInfo.getCurrent().removeConfiguration(vid);

-	_registryManager.removeProductDescriptorFromLocal(productDescriptor);

-}

-/**

- * Sets the URL for the history log.  This property is persistent.

- */

-public void setHistoryLogURL(String strURL) throws UpdateManagerException {

-

-	// Check for valid URL

-	//--------------------

-	try {

-		new URL(strURL);

-	}

-	catch (MalformedURLException ex) {

-		throw new UpdateManagerException("Invalid log URL specification");

-	}

-

-	// Change the property

-	//--------------------

-	_strHistoryLogURL = strURL;

-}

-/**

- * Sets the URL for the update log.  This property is persistent.

- */

-public void setUpdateLogURL(String strURL) throws UpdateManagerException {

-	

-	// Check for valid URL

-	//--------------------

-	try {

-		new URL(strURL);

-	}

-	catch (MalformedURLException ex) {

-		throw new UpdateManagerException("Invalid log URL specification");

-	}

-

-	// Change the property

-	//--------------------

-	_strUpdateLogURL = strURL;

-}

-/**

- * Updates the boot loader's launch information with what is currently installed.

- */

-public void updateLaunchInfoAndRegistry(UMSessionManagerSession session) {

-

-	// Update launch info even if this session had a failure

-	// One or more parcels could have succeeded

-	//------------------------------------------------------

-	if (session != null) {

-		

-		LaunchInfo launchInfo = LaunchInfo.getCurrent();

-

-		// Obtain product/component information

-		//-------------------------------------

-		UMSessionManagerParcel[] parcels = session.getParcels();

-

-		for (int i = 0; i < parcels.length; ++i) {

-			updateLaunchInfoAndRegistryParcel( parcels[i], launchInfo );

-		}

-	}

-}

-/**

- * Recursively updates the boot loader's information for this parcel and sub-parcels.

- */

-protected void updateLaunchInfoAndRegistryParcel(UMSessionManagerParcel parcel, LaunchInfo launchInfo) {

-

-	// Update the profile only if the install was successful

-	//------------------------------------------------------

-	if (parcel != null && parcel.getStatus().equals(UpdateManagerConstants.STATUS_SUCCEEDED) == true) {

-

-		Object objData = parcel.getData();

-

-		// Product

-		//--------

-		if (objData instanceof IProductDescriptor) {

-			updateLaunchInfoProduct((IProductDescriptor) objData, launchInfo);

-			_registryManager.addProductDescriptorToLocal((IProductDescriptor) objData);

-		}

-

-		// Component

-		//----------

-		else if (objData instanceof IComponentDescriptor) {

-			updateLaunchInfoComponent((IComponentDescriptor) objData, launchInfo);

-			_registryManager.addComponentDescriptorToLocal((IComponentDescriptor) objData, true);

-		}

-			

-		// Component Entry

-		//----------------

-		else if (objData instanceof IComponentEntryDescriptor) {

-			IComponentDescriptor comp = ((IComponentEntryDescriptor)objData).getComponentDescriptor();

-			updateLaunchInfoComponent(comp, launchInfo);

-			_registryManager.addComponentDescriptorToLocal(comp, false);

-		}

-

-		// Do child parcels

-		//-----------------

-		UMSessionManagerParcel[] parcelChildren = parcel.getParcels();

-

-		for (int i = 0; i < parcelChildren.length; ++i) {

-			updateLaunchInfoAndRegistryParcel(parcelChildren[i], launchInfo);

-		}

-	}

-}

-/**

- * Updates the boot loader's launch information with what is currently installed.

- */

-public void updateLaunchInfoComponent(IComponentDescriptor descriptor, LaunchInfo launchInfo) {

-

-	// Component

-	//----------

-	launchInfo.setComponent(new LaunchInfo.VersionedIdentifier(descriptor.getUniqueIdentifier(), descriptor.getVersionStr()));

-

-	// Plugins

-	//--------

-	IPluginEntryDescriptor[] pluginDescriptors = descriptor.getPluginEntries();

-

-	for (int i = 0; i < pluginDescriptors.length; ++i) {

-		updateLaunchInfoPlugin(pluginDescriptors[i], launchInfo);

-	}

-

-	// Fragments

-	//----------

-	IFragmentEntryDescriptor[] fragmentDescriptors = descriptor.getFragmentEntries();

-

-	for (int i = 0; i < fragmentDescriptors.length; ++i) {

-		updateLaunchInfoFragment(fragmentDescriptors[i], launchInfo);

-	}

-}

-/**

- * Updates the boot loader's launch information with what is currently installed.

- */

-public void updateLaunchInfoFragment(IFragmentEntryDescriptor descriptor, LaunchInfo launchInfo) {

-

-	launchInfo.setFragment(new LaunchInfo.VersionedIdentifier(descriptor.getUniqueIdentifier(),descriptor.getVersionStr()));

-}

-/**

- * Updates the boot loader's launch information with what is currently installed.

- */

-public void updateLaunchInfoPlugin(IPluginEntryDescriptor descriptor, LaunchInfo launchInfo) {

-

-	launchInfo.setPlugin(new LaunchInfo.VersionedIdentifier(descriptor.getUniqueIdentifier(),descriptor.getVersionStr()));

-}

-/**

- * Updates the boot loader's launch information with what is currently installed.

- */

-public void updateLaunchInfoProduct(IProductDescriptor descriptor, LaunchInfo launchInfo) {

-

-	launchInfo.setConfiguration(new LaunchInfo.VersionedIdentifier(descriptor.getUniqueIdentifier(),descriptor.getVersionStr()), descriptor.getApplication());

-}

-}

diff --git a/update/org.eclipse.update/src/org/eclipse/update/internal/core/UpdateManagerException.java b/update/org.eclipse.update/src/org/eclipse/update/internal/core/UpdateManagerException.java
deleted file mode 100644
index e25de36..0000000
--- a/update/org.eclipse.update/src/org/eclipse/update/internal/core/UpdateManagerException.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.eclipse.update.internal.core;

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

-

-/**

- * 

- */

-public class UpdateManagerException  extends Exception {

-/**

- * UpdateManagerException constructor comment.

- */

-public UpdateManagerException( String strMessage ) {

-	super( strMessage );

-}

-}

diff --git a/update/org.eclipse.update/src/org/eclipse/update/internal/core/UpdateManagerPlugin.java b/update/org.eclipse.update/src/org/eclipse/update/internal/core/UpdateManagerPlugin.java
deleted file mode 100644
index e05d25d..0000000
--- a/update/org.eclipse.update/src/org/eclipse/update/internal/core/UpdateManagerPlugin.java
+++ /dev/null
@@ -1,135 +0,0 @@
-package org.eclipse.update.internal.core;

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

-

-import java.net.MalformedURLException;

-import java.net.URL;

-/**

- */

-import org.eclipse.core.runtime.*;

-import org.eclipse.update.internal.ui.*;

-import org.eclipse.jface.resource.ImageDescriptor;

-import org.eclipse.webdav.http.client.HttpClient;

-

-public class UpdateManagerPlugin extends Plugin {

-	private static UpdateManagerPlugin _pluginInstance = null;

-	private	HttpClient client =null;

-/**

- * UpdateManagerPlugin constructor comment.

- */

-public UpdateManagerPlugin( IPluginDescriptor pluginDescriptor ) {

-	super( pluginDescriptor );

-

-	_pluginInstance = this;

-}

-/**

- * Returns the image descriptor of an image file relative to this plugin

- * @return org.eclipse.jface.resource.ImageDescriptor

- * @param strImage java.lang.String

- */

-public static ImageDescriptor getImageDescriptor(String strImage) {

-

-	UpdateManagerPlugin plugin = getPluginInstance();

-

-	if (plugin != null) {

-

-		// Obtain my plugin descriptor

-		//----------------------------

-		IPluginDescriptor pluginDescriptor = plugin.getDescriptor();

-

-		// Determine where I am installed

-		//-------------------------------

-		URL path = pluginDescriptor.getInstallURL();

-

-		// Add the relative file location to the install location

-		// Create the image descriptor

-		//-------------------------------------------------------

-		URL urlFullPathString = null;

-

-		try {

-			urlFullPathString = new URL(path, strImage);

-			return ImageDescriptor.createFromURL(urlFullPathString);

-		}

-

-		catch (MalformedURLException e) {

-		}

-	}

-	return null;

-}

-/**

- * @return org.eclipse.update.internal.core.UpdateManagerPlugin

- */

-public static UpdateManagerPlugin getPluginInstance() {

-	return _pluginInstance;

-}

-/**

- * Shuts down this plug-in and discards all plug-in state.

- * <p>

- * This method should be re-implemented in subclasses that need to do something

- * when the plug-in is shut down.  Implementors should call the inherited method

- * to ensure that any system requirements can be met.

- * </p>

- * <p>

- * Plug-in shutdown code should be robust. In particular, this method

- * should always make an effort to shut down the plug-in. Furthermore,

- * the code should not assume that the plug-in was started successfully,

- * as this method will be invoked in the event of a failure during startup.

- * </p>

- * <p>

- * Note 1: If a plug-in has been started, this method will be automatically

- * invoked by the platform when the platform is shut down.

- * </p>

- * <p>

- * Note 2: This method is intended to perform simple termination

- * of the plug-in environment. The platform may terminate invocations

- * that do not complete in a timely fashion.

- * </p>

- * <b>Cliens must never explicitly call this method.</b>

- *

- * @exception CoreException if this method fails to shut down

- *   this plug-in 

- */

-public void shutdown() throws CoreException {

-	if(client!=null) client.close(); 

-}

-/**

- * Starts up this plug-in.

- * <p>

- * This method should be overridden in subclasses that need to do something

- * when this plug-in is started.  Implementors should call the inherited method

- * to ensure that any system requirements can be met.

- * </p>

- * <p>

- * If this method throws an exception, it is taken as an indication that

- * plug-in initialization has failed; as a result, the plug-in will not

- * be activated; moreover, the plug-in will be marked as disabled and 

- * ineligible for activation for the duration.

- * </p>

- * <p>

- * Plug-in startup code should be robust. In the event of a startup failure,

- * the plug-in's <code>shutdown</code> method will be invoked automatically,

- * in an attempt to close open files, etc.

- * </p>

- * <p>

- * Note 1: This method is automatically invoked by the platform 

- * the first time any code in the plug-in is executed.

- * </p>

- * <p>

- * Note 2: This method is intended to perform simple initialization 

- * of the plug-in environment. The platform may terminate initializers 

- * that do not complete in a timely fashion.

- * </p>

- * <b>Cliens must never explicitly call this method.</b>

- *

- * @exception CoreException if this plug-in did not start up properly

- */

-public void startup() throws CoreException {

-	// Setup HTTP client

-	//------------------

-	client = new HttpClient();

-	client.setAuthenticator(new AuthorizationDatabase());

-	URLHandler.setHttpClient(client);

-}

-}

diff --git a/update/org.eclipse.update/src/org/eclipse/update/internal/core/UpdateManagerStrings.java b/update/org.eclipse.update/src/org/eclipse/update/internal/core/UpdateManagerStrings.java
deleted file mode 100644
index 21b7ecd..0000000
--- a/update/org.eclipse.update/src/org/eclipse/update/internal/core/UpdateManagerStrings.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package org.eclipse.update.internal.core;

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

-

-/**

- * This class loads translatable strings from a resource bundle properties file.

- */

-import java.util.ResourceBundle;

-import java.util.MissingResourceException;

-

-public class UpdateManagerStrings

-{

-	private static ResourceBundle _resourceBundle = null;

-/**

- * Obtains a NL translated string from a resource bundle

- * @param strKey java.lang.String

- */

-public static String getString( String strKey ) 

-{

-	String strTranslated = strKey;

-

-	// Obtain the set of translated strings

-	//-------------------------------------

-	if( _resourceBundle == null )

-	{

-		try

-		{

-			_resourceBundle = ResourceBundle.getBundle( UpdateManager._strPackageName + ".updatemanagerstrings" );

-		}

-		catch( MissingResourceException ex )

-		{

-			_resourceBundle = null;

-		}

-	}

-

-	// Obtain the translated string

-	//-----------------------------

-	if( _resourceBundle != null )

-	{

-		try

-		{

-			strTranslated = _resourceBundle.getString( strKey );

-		}

-		catch( MissingResourceException ex )

-		{

-			strTranslated = strKey;

-		}

-	}

-

-	return strTranslated;

-}

-}

diff --git a/update/org.eclipse.update/src/org/eclipse/update/internal/core/UpdateManagerURLComparator.java b/update/org.eclipse.update/src/org/eclipse/update/internal/core/UpdateManagerURLComparator.java
deleted file mode 100644
index ede4744..0000000
--- a/update/org.eclipse.update/src/org/eclipse/update/internal/core/UpdateManagerURLComparator.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package org.eclipse.update.internal.core;

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

-

-import org.eclipse.core.internal.boot.update.*;

-import java.net.*;

-/**

- * 

- */

-import java.util.Comparator;

-public class UpdateManagerURLComparator implements Comparator{

-/**

- * UpdateManagerTreeItemComparator constructor comment.

- */

-public UpdateManagerURLComparator() {

-	super();

-}

-/**

- * Compares two strings independent of case.

- * 

- * @return a negative integer, zero, or a positive integer as the

- *         first argument is less than, equal to, or greater than the

- *         second. 

- * @throws ClassCastException if the arguments' types prevent them from

- *         being compared by this Comparator.

- */

-public int compare(java.lang.Object o1, java.lang.Object o2) {

-

-	if (o1 instanceof URLNamePair && o2 instanceof URLNamePair) {

-		return ((URLNamePair) o1).getURL().toExternalForm().toLowerCase().compareTo(((URLNamePair) o2).getURL().toExternalForm().toLowerCase());

-	}

-

-	return 0;

-}

-}

diff --git a/update/org.eclipse.update/src/org/eclipse/update/internal/core/updatemanagerstrings.properties b/update/org.eclipse.update/src/org/eclipse/update/internal/core/updatemanagerstrings.properties
deleted file mode 100644
index 5cec005..0000000
--- a/update/org.eclipse.update/src/org/eclipse/update/internal/core/updatemanagerstrings.properties
+++ /dev/null
@@ -1,112 +0,0 @@
-S_Add                                                     = Add

-S_Additional_Locations                                    = Additional Locations

-S_An_installation_error_or_cancellation_has_occurred      = An installation error or cancellation has occurred

-S_At_the_following_domain                                 = At the following domain

-S_Available                                               = Available

-S_Cancel_component_installation                           = Cancel component installation

-S_Component                                               = Component

-S_Component_identifier                                    = Component identifier

-S_Component_name                                          = Component name

-S_Configuration_Change                                    = Configuration Change

-S_Copy                                                    = Copy

-S_Current_installation                                    = Current installation

-S_Description                                             = Description

-S_Encountered_jar_entry_security_exception                = Encountered jar entry security exception

-S_Enter_a_user_name_and_password_for                      = Enter a user name and password for

-S_Error_closing_output_stream                             = Error closing output stream

-S_Error_in_registry                                       = Error in registry

-S_Error_occurred_during_installation_completion           = Error occurred during installation completion

-S_Error_occurred_during_installation_setup                = Error occurred during installation setup

-S_Error_occurred_during_verification                      = Error occurred during verification

-S_Error_reading_from_input_stream                         = Error reading from input stream

-S_Error_writing_to_output_stream                          = Error writing to output stream

-S_Examining                                               = Examining

-S_File_is_not_a_valid_JAR_file                            = File is not a valid JAR file

-S_File_name                                               = File name

-S_HTTP_client_not_set                                     = HTTP client not set

-S_Identifier                                              = Identifier

-S_Information                                             = Information

-S_Install                                                 = Install

-S_Install_component                                       = Install component

-S_Install_Components                                      = Install Components

-S_Installation                                            = Installation

-S_Installation_cancelled_by_user                          = Installation cancelled by user

-S_Installation_completed                                  = Installation completed

-S_Installations_have_completed_successfully               = Installations have completed successfully

-S_Installed                                               = Installed

-S_Installed_Components                                    = Installed Components

-S_Installing_this_component_may_corrupt_your_installation = Installing this component may corrupt your installation

-S_Location                                                = Location

-S_New_Component_Updates                                   = New Component Updates

-S_New_Components                                          = New Components

-S_No_installable_items_were_found                         = No installable items were found

-S_not_available                                           = not available

-S_not_compatible                                          = not compatible

-S_not_newer                                               = not newer

-S_not_updatable                                           = not updatable

-S_Number_of_installation_histories_to_keep                = Number of installation histories to keep

-S_Obtaining_information                                   = Obtaining information

-S_OK                                                      = OK

-S_optional                                                = optional

-S_Password                                                = Password

-S_Password_Required                                       = Password Required

-S_Predefined_Locations                                    = Predefined Locations

-S_Provider                                                = Provider

-S_Reading                                                 = Reading

-S_Remove                                                  = Remove

-S_Remove_selected_components                              = Remove selected components

-S_Revert                                                  = Revert

-S_Revert_to_a_Previous_Installation                       = Revert to a Previous Installation

-S_Revert_to_another_installation                          = Revert to another installation

-S_Search_for_more_recent_versions_to_install              = Search for more recent versions to install

-S_Search_for_new_components                               = Search for new components

-S_Search_for_updates_for_all_components                   = Search for updates for all components

-S_Search_for_updates_for_selected_components              = Search for updates for selected components

-S_Select_a_previous_installation_to_revert_to             = Select a previous installation to revert to

-S_Select_any_optional_components_to_install               = Select any optional components to install

-S_Select_available_versions_to_install                    = Select available versions to install

-S_Select_components_to_install                            = Select components to install

-S_Select_locations_to_update_from                         = Select locations to update from

-S_Show_only_most_recent_versions                          = Show only most recent versions

-S_Software_Updates                                        = Software Updates

-S_Source_location                                         = Source location

-S_Source_URL_is_malformed                                 = Source URL is malformed

-S_Specify_search_locations_for_new_components             = Specify search locations for new components

-S_Status                                                  = Status

-S_Target_URL_is_malformed                                 = Target URL is malformed

-S_The_certificates_used_to_authenticate_this_component_are_not_recognized = The certificates used to authenticate this component are not recognized

-S_The_content_of_this_component_has_been_corrupted        = The content of this component has been corrupted

-S_The_following_installation_will_become_active_when_the_workbench_is_restarted = The following installation will become active when the workbench is restarted

-S_The_following_items_will_be_installed                   = The following items will be installed

-S_The_following_items_will_be_updated                     = The following items will be updated

-S_The_installation_process_will_be_aborted                = The installation process will be aborted

-S_The_provider_of_this_component_cannot_be_verified       = The provider of this component cannot be verified

-S_This_component_has_not_been_digitally_signed            = This component has not been digitally signed

-S_This_component_will_not_be_installed                    = This component will not be installed

-S_Update                                                  = Update

-S_Update_All                                              = Update All

-S_Updates_completed                                       = Updates completed

-S_Unable_to_access_the_following_locations                = Unable to access the following locations

-S_Unable_to_connect                                       = Unable to connect

-S_Unable_to_create_file                                   = Unable to create file

-S_Unable_to_create_jar_entry_URL                          = Unable to create jar entry URL

-S_Unable_to_create_output_file_for_Jar_entry              = Unable to create output file for Jar entry

-S_Unable_to_delete_file                                   = Unable to delete file

-S_Unable_to_find_install_manifest_file_in_Jar             = Unable to find install manifest file in Jar

-S_Unable_to_find_defined_contents_in_Jar                  = Unable to find defined contents in Jar

-S_Unable_to_obtain_source_input_stream                    = Unable to obtain source input stream

-S_Unable_to_obtain_target_output_stream                   = Unable to obtain target output stream

-S_Unable_to_open_error_logs                               = Unable to open error_logs

-S_Unable_to_open_jar_entry_input_stream                   = Unable to open jar entry input stream

-S_Unable_to_open_Jar_file                                 = Unable to open Jar file

-S_Undefined_contents_found_in_Jar                         = Undefined contents found in Jar

-S_Undo                                                    = Undo

-S_User_name                                               = User name

-S_Verification                                            = Verification

-S_Verification_cancelled                                  = Verification cancelled

-S_Verify                                                  = Verify

-S_Version                                                 = Version

-S_You_are_about_to_install_a_signed_component             = You are about to install a signed component

-S_You_are_about_to_install_an_unsigned_component          = You are about to install an unsigned component

-S_You_may_choose_to_install_the_component_or_cancel_its_installation = You may choose to install the component or cancel its installation

-S_You_must_restart_the_workbench_to_activate_any_changes  = You must restart the workbench to activate any changes

diff --git a/update/org.eclipse.update/src/org/eclipse/update/internal/ui/AuthorizationDatabase.java b/update/org.eclipse.update/src/org/eclipse/update/internal/ui/AuthorizationDatabase.java
deleted file mode 100644
index 8d2af15..0000000
--- a/update/org.eclipse.update/src/org/eclipse/update/internal/ui/AuthorizationDatabase.java
+++ /dev/null
@@ -1,108 +0,0 @@
-package org.eclipse.update.internal.ui;

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

-

-import java.net.URL;

-import java.util.Hashtable;

-import java.util.Map;

-

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.core.runtime.Platform;

-import org.eclipse.swt.widgets.Display;

-import org.eclipse.swt.widgets.Shell;

-import org.eclipse.update.internal.core.UpdateManagerPlugin;

-import org.eclipse.webdav.http.client.IAuthenticator;

-

-/**

- * A transient database that remembers information, such as usernames and

- * passwords.  The information is stored in memory only and is discarted

- * when the Plaform shuts down.

- */

-public class AuthorizationDatabase implements IAuthenticator {

-

-	/**

-	 * The Map containing the userid and password

-	 */

-	private Map result = new Hashtable();

-

-	/**

-	 * 

-	 */

-	public void addAuthenticationInfo(URL serverUrl, String realm, String scheme, Map info) {

-		try {

-			Platform.addAuthorizationInfo(serverUrl, realm, scheme, info);

-		}

-		catch (CoreException e) {

-			UpdateManagerPlugin.getPluginInstance().getLog().log(e.getStatus());

-		}

-	}

-

-	/**

-	 * 

-	 */

-	public void addProtectionSpace(URL resourceUrl, String realm) {

-		try {

-			Platform.addProtectionSpace(resourceUrl, realm);

-		}

-		catch (CoreException e) {

-			UpdateManagerPlugin.getPluginInstance().getLog().log(e.getStatus());

-		}

-

-	}

-	/**

-	 *

-	 */

-	public Map getAuthenticationInfo(URL serverUrl, String realm, String scheme) {

-

-		return Platform.getAuthorizationInfo(serverUrl, realm, scheme);

-	}

-	/**

-	 * 

-	 */

-	public String getProtectionSpace(URL resourceUrl) {

-		return Platform.getProtectionSpace(resourceUrl);

-	}

-	/**

-	 * 

-	 */

-	public Map requestAuthenticationInfo(final URL resourceUrl, final String realm, final String scheme) {

-

-		result = new Hashtable();

-		if (scheme.equalsIgnoreCase("Basic")) {

-

-			Display disp = Display.getCurrent();

-			if (disp != null) {

-				promptForPassword(resourceUrl, realm, result);

-			}

-			else {

-				Display.getDefault().syncExec(new Runnable() {

-					public void run() {

-						promptForPassword(resourceUrl, realm, result);

-					}

-				});

-			};

-		}

-		return result;

-	}

-

-	/**

-	 *

-	 */

-	private void promptForPassword(URL resourceUrl, String realm, Map info) {

-

-		Shell shell = new Shell();

-		UserValidationDialog ui = new UserValidationDialog(shell, resourceUrl, realm, "");

-		ui.setUsernameMutable(true);

-		ui.setBlockOnOpen(true);

-		ui.open();

-

-		if (ui.getReturnCode() != ui.CANCEL) {

-			info.put("username", ui.getUserid());

-			info.put("password", ui.getPassword());

-		}

-		shell.dispose();

-

-	}

-}
\ No newline at end of file
diff --git a/update/org.eclipse.update/src/org/eclipse/update/internal/ui/Installation.java b/update/org.eclipse.update/src/org/eclipse/update/internal/ui/Installation.java
deleted file mode 100644
index 056f820..0000000
--- a/update/org.eclipse.update/src/org/eclipse/update/internal/ui/Installation.java
+++ /dev/null
@@ -1,221 +0,0 @@
-package org.eclipse.update.internal.ui;

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

-

-import java.net.MalformedURLException;

-import java.net.URL;

-import java.util.Date;

-import org.eclipse.core.internal.boot.LaunchInfo;

-import org.eclipse.core.internal.boot.LaunchInfo.History;

-/**

- */

-public class Installation {

-	private static final String STRING_ID = "-id";

-	private static final String STRING_LIST = "-list";

-	private static final String STRING_LOCATION = "-location";

-	private static final String STRING_SET = "-set";

-

-	private boolean _bList = false;

-	private boolean _bSet = false;

-	private String _strLocation = null;

-	private String _strId = null;

-	private int _iId = -1;

-	private LaunchInfo _launchInfo = null;

-	/**

-	 * Installation constructor comment.

-	 */

-	public Installation() {

-		super();

-	}

-	/**

-	 * 

-	 */

-	private String checkCommandLineOptions() {

-

-		// Command

-		//--------

-		if (_bList == true) {

-			if (_bSet == true) {

-				return "Invalid option syntax";

-			}

-		}

-

-		else if (_bSet == true) {

-			if (_bList == true) {

-				return "Invalid option syntax";

-			}

-		}

-

-		else {

-			return "Command missing";

-		}

-

-		// Location

-		//---------

-		if (_strLocation == null || _strLocation.length() == 0) {

-			return "Location missing";

-		}

-

-		URL urlLocation = null;

-

-		try {

-			urlLocation = new URL(_strLocation);

-		}

-		catch (MalformedURLException ex) {

-			return "Invalid location syntax";

-		}

-

-		// Set the location of the installation directory

-		//-----------------------------------------------

-		//	LaunchInfo.startup(urlLocation);

-		_launchInfo = LaunchInfo.getCurrent();

-

-		// Set

-		//----

-		if (_bSet == true) {

-			if (_strId == null || _strId.length() == 0) {

-				return "Installation identifier number missing";

-			}

-

-			try {

-				_iId = new Integer(_strId).intValue();

-			}

-			catch (NumberFormatException ex) {

-				return "Invalid identifier syntax";

-			}

-		}

-

-		return null;

-	}

-	/**

-	 */

-	public String doList() {

-

-		LaunchInfo launchInfoFormer = null;

-

-		LaunchInfo.History[] histories = _launchInfo.getLaunchInfoHistory();

-

-		if (histories.length == 0)

-			return "No histories found";

-

-		if (histories.length == 1 && histories[0].getLaunchInfoDate() == null)

-			return "No histories found";

-

-		// Same order as doSet()

-		// Most recent to oldest order

-		//----------------------------

-		int iIndex = 1;

-

-		for (int i = histories.length - 1; i >= 0; --i) {

-

-			Date date = histories[i].getLaunchInfoDate();

-

-			// Older profile

-			//--------------

-			if (date != null) {

-				System.out.println(Integer.toString(iIndex++) + " " + histories[i].getLaunchInfoDate().toString());

-			}

-		}

-

-		return null;

-	}

-	/**

-	 * 

-	 */

-	public String doSet() {

-

-		LaunchInfo.History[] histories = _launchInfo.getLaunchInfoHistory();

-

-		if (_iId < histories.length) {

-

-			int iIndex = 1;

-

-			// Same algorithm as doList()

-			// Most recent to oldest order

-			//----------------------------

-			for (int i = histories.length - 1; i >= 0; --i) {

-

-				Date date = histories[i].getLaunchInfoDate();

-

-				// Older profile

-				//--------------

-				if (date != null) {

-					if (iIndex == _iId) {

-						_launchInfo.revertTo(histories[i]);

-						System.out.println(date.toString());

-						return null;

-					}

-					else {

-						iIndex++;

-					}

-				}

-			}

-		}

-

-		return "Identifier not found";

-	}

-	/**

-	 */

-	public static void main(String[] args) {

-

-		Installation installation = new Installation();

-

-		installation.parseCommandLineOptions(args);

-

-		String strError = installation.checkCommandLineOptions();

-

-		if (strError == null) {

-			if (installation._bList == true)

-				strError = installation.doList();

-

-			else if (installation._bSet == true)

-				strError = installation.doSet();

-		}

-

-		if (strError != null) {

-			System.out.println(strError);

-			printUsage();

-			System.exit(-1);

-		}

-	}

-	/**

-	 */

-	public void parseCommandLineOptions(String[] straArgs) {

-

-		for (int i = 0; i < straArgs.length; ++i) {

-

-			// Command: List

-			//--------------

-			if (straArgs[i].equalsIgnoreCase(STRING_LIST) == true) {

-				_bList = true;

-			}

-

-			// Command: Set

-			//-------------

-			else if (straArgs[i].equalsIgnoreCase(STRING_SET) == true) {

-				_bSet = true;

-			}

-

-			// Location to install from

-			//-------------------------

-			else if (straArgs[i].equalsIgnoreCase(STRING_LOCATION) == true && i < straArgs.length - 1) {

-				_strLocation = straArgs[++i];

-			}

-

-			// Identifier

-			//-----------

-			else if (straArgs[i].equalsIgnoreCase(STRING_ID) == true && i < straArgs.length - 1) {

-				_strId = straArgs[++i];

-			}

-		}

-	}

-	/**

-	 */

-	public static void printUsage() {

-		System.out.println("");

-		System.out.println("-list -location urlPath");

-		System.out.println("-set  -location urlPath -id number");

-	}

-}
\ No newline at end of file
diff --git a/update/org.eclipse.update/src/org/eclipse/update/internal/ui/JarVerificationDialog.java b/update/org.eclipse.update/src/org/eclipse/update/internal/ui/JarVerificationDialog.java
deleted file mode 100644
index 6d5389d..0000000
--- a/update/org.eclipse.update/src/org/eclipse/update/internal/ui/JarVerificationDialog.java
+++ /dev/null
Binary files differ
diff --git a/update/org.eclipse.update/src/org/eclipse/update/internal/ui/JarVerificationResult.java b/update/org.eclipse.update/src/org/eclipse/update/internal/ui/JarVerificationResult.java
deleted file mode 100644
index 1711181..0000000
--- a/update/org.eclipse.update/src/org/eclipse/update/internal/ui/JarVerificationResult.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package org.eclipse.update.internal.ui;

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

-

-/**

- * Result of the service

- */

-public class JarVerificationResult {

-

-	public static final int CANCEL_INSTALL = 0;

-	public static final int OK_TO_INSTALL = 1;

-

-	private int resultCode;

-	private Exception resultException;

-	/**

-	 */

-	public int getResultCode() {

-		return resultCode;

-	}

-	/**

-	 */

-	public Exception getResultException() {

-		return resultException;

-	}

-	/**

-	 */

-	public void setResultCode(int newResultCode) {

-		resultCode = newResultCode;

-	}

-	/**

-	 * called by JarVerificationService only

-	 */

-	void setResultException(Exception newResultException) {

-		resultException = newResultException;

-	}

-}
\ No newline at end of file
diff --git a/update/org.eclipse.update/src/org/eclipse/update/internal/ui/JarVerificationService.java b/update/org.eclipse.update/src/org/eclipse/update/internal/ui/JarVerificationService.java
deleted file mode 100644
index 69b4339..0000000
--- a/update/org.eclipse.update/src/org/eclipse/update/internal/ui/JarVerificationService.java
+++ /dev/null
Binary files differ
diff --git a/update/org.eclipse.update/src/org/eclipse/update/internal/ui/JarVerifier.java b/update/org.eclipse.update/src/org/eclipse/update/internal/ui/JarVerifier.java
deleted file mode 100644
index dda11d7..0000000
--- a/update/org.eclipse.update/src/org/eclipse/update/internal/ui/JarVerifier.java
+++ /dev/null
Binary files differ
diff --git a/update/org.eclipse.update/src/org/eclipse/update/internal/ui/KeyStores.java b/update/org.eclipse.update/src/org/eclipse/update/internal/ui/KeyStores.java
deleted file mode 100644
index 7284e0a..0000000
--- a/update/org.eclipse.update/src/org/eclipse/update/internal/ui/KeyStores.java
+++ /dev/null
Binary files differ
diff --git a/update/org.eclipse.update/src/org/eclipse/update/internal/ui/Main.java b/update/org.eclipse.update/src/org/eclipse/update/internal/ui/Main.java
deleted file mode 100644
index e0f0367..0000000
--- a/update/org.eclipse.update/src/org/eclipse/update/internal/ui/Main.java
+++ /dev/null
@@ -1,181 +0,0 @@
-package org.eclipse.update.internal.ui;

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

-

-import java.net.*;

-import java.lang.reflect.*;

-import java.io.PrintWriter;

-import java.util.StringTokenizer;

-import java.util.Vector;

-/**

- * Startup class for Eclipse. Creates a class loader using

- * supplied URL of platform installation, loads and calls

- * the Eclipse Boot Loader

- */

-public class Main {

-	protected boolean debug = false;

-	protected boolean usage = false;

-	protected String bootLocation = null;

-	protected String application;

-	protected URL pluginPathLocation;

-	protected String location;

-

-	// constants

-	private static final String APPLICATION = "-application";

-	private static final String BOOT = "-boot";

-	private static final String DEBUG = "-debug";

-	private static final String USAGE = "-?";

-	private static final String BOOTLOADER = "org.eclipse.core.boot.BootLoader";

-

-	// The project containing the boot loader code.  This is used to construct

-	// the correct class path for running in VAJ and VAME.

-	private static final String PROJECT_NAME = "Eclipse Core Boot";

-

-	private static boolean inVAJ;

-	static {

-		try {

-			Class.forName("com.ibm.uvm.lang.ProjectClassLoader");

-			inVAJ = true;

-		} catch (Exception e) {

-			inVAJ = false;

-		}

-	}

-	private static boolean inVAME;

-	static {

-		try {

-			Class.forName("com.ibm.eclipse.VAME");

-			inVAME = true;

-		} catch (Exception e) {

-			inVAME = false;

-		}

-	}

-

-protected void basicRun(String[] args) throws Exception {

-	Class clazz = getBootLoader(bootLocation);

-	Method method = clazz.getDeclaredMethod("run", new Class[] { String.class, URL.class, String.class, String[].class });

-	try {

-		method.invoke(clazz, new Object[] { application, pluginPathLocation, location, args });

-	} catch (InvocationTargetException e) {

-		if (e.getTargetException() instanceof Error)

-			throw (Error) e.getTargetException();

-		else

-			throw e;

-	}

-}

-public Class getBootLoader(String base) throws Exception {

-	URLClassLoader loader = new URLClassLoader(new URL[] { getBootURL(base)}, null);

-	return loader.loadClass(BOOTLOADER);

-}

-/**

- * Returns the <code>URL</code> where the boot classes are located.

- */

-protected URL getBootURL(String base) throws MalformedURLException {

-	URL url = null;

-	if (base != null) 

-		return new URL(base);

-	// Create a URL based on the location of this class' code.

-	// strip off jar file and/or last directory to get 

-	// to the directory containing projects.

-	url = getClass().getProtectionDomain().getCodeSource().getLocation();

-	String path = url.getFile();

-	if (path.endsWith(".jar"))

-		path = path.substring(0, path.lastIndexOf("/"));

-	if (path.endsWith("/"))

-		path = path.substring(0, path.length() - 1);

-	if (inVAJ || inVAME) {

-		int ix = path.lastIndexOf("/");

-		path = path.substring(0, ix + 1);

-		path = path + PROJECT_NAME + "/";

-	} else

-		path = path + "/plugins/org.eclipse.core.boot/boot.jar";

-	return new URL(url.getProtocol(), url.getHost(), url.getPort(), path);

-}

-/**

- * Print the usage of this launcher on the system console

- */

-protected void printUsage(PrintWriter out) {

-	out.println("The general form of using the Platform bootstrap main is:");

-	out.println("      java <main class> -application <name> [option list]");

-	out.println("where the required arguments are:");

-	out.println("      -application <name> : the application to run ");

-	out.println("and where the option list can be any number of the following:");

-	out.println("      -platform <location> : run in the given location");

-	out.println("      -debug [debug options file] : turn on debug mode.  Read debug options from ");

-	out.println("          the specified file or from ./.options if not specified.");

-	out.println("      -? : print this message");

-	out.flush();

-}

-protected String[] processCommandLine(String[] args) throws Exception {

-	int[] configArgs = new int[100];

-	configArgs[0] = -1; // need to initialize the first element to something that could not be an index.

-	int configArgIndex = 0;

-	for (int i = 0; i < args.length; i++) {

-		boolean found = false;

-		// check for args without parameters (i.e., a flag arg)

-		// check if debug should be enabled for the entire platform

-		if (args[i].equalsIgnoreCase(DEBUG)) {

-			debug = true;

-			// passed thru this arg (i.e., do not set found = true

-		}

-

-		// look for the usage flag

-		if (args[i].equalsIgnoreCase(USAGE)) {

-			usage = true;

-			// passed thru this arg (i.e., do not set found = true

-		}

-

-		if (found) {

-			configArgs[configArgIndex++] = i;

-			continue;

-		}

-		// check for args with parameters. If we are at the last argument or if the next one

-		// has a '-' as the first character, then we can't have an arg with a parm so continue.

-		if (i == args.length - 1 || args[i + 1].startsWith("-")) {

-			continue;

-		}

-		String arg = args[++i];

-

-		// look for the laucher to run

-		if (args[i - 1].equalsIgnoreCase(BOOT)) {

-			found = true;

-			bootLocation = arg;

-		}

-

-		// look for the application to run

-		if (args[i - 1].equalsIgnoreCase(APPLICATION)) {

-			found = true;

-			application = arg;

-		}

-

-		// done checking for args.  Remember where an arg was found 

-		if (found) {

-			configArgs[configArgIndex++] = i - 1;

-			configArgs[configArgIndex++] = i;

-		}

-	}

-

-	// remove all the arguments consumed by this argument parsing

-	if (configArgIndex == 0)

-		return args;

-	String[] passThruArgs = new String[args.length - configArgIndex];

-	configArgIndex = 0;

-	int j = 0;

-	for (int i = 0; i < args.length; i++) {

-		if (i == configArgs[configArgIndex])

-			configArgIndex++;

-		else

-			passThruArgs[j++] = args[i];

-	}

-	return passThruArgs;

-}

-public void run(String[] args) throws Exception {

-	String[] passThruArgs = processCommandLine(args);

-	if (usage) {

-		printUsage(new PrintWriter(System.out));

-		return;

-	}

-	basicRun(passThruArgs);

-}

-}

diff --git a/update/org.eclipse.update/src/org/eclipse/update/internal/ui/UMApplication.java b/update/org.eclipse.update/src/org/eclipse/update/internal/ui/UMApplication.java
deleted file mode 100644
index 3bb792a..0000000
--- a/update/org.eclipse.update/src/org/eclipse/update/internal/ui/UMApplication.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package org.eclipse.update.internal.ui;

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

-

-/* 

- * Update Manager Install Application

- *

- * Command to run from command line:

- *

- *.\jre\bin\java -verify -cp startup.jar org.eclipse.core.launcher.UIMain -application org.eclipse.update.internal.ui.updateManager -install -url http://klicnik.torolab.ibm.com/eclipse/site/ -id org.eclipse.sdk %*

- *

- *

- * Arguments are:

- *   -install   Install command

- *   -url [url] Location from which to install from

- *   -id  [id]  Identifier of the manifest to install

- *

- * Sample:

- *   -install -url file:/c:/temp/updatesite/ -id org.eclipse.sdk

- */

-import java.util.StringTokenizer;

-import java.util.Vector;

-

-public class UMApplication extends Main {

-	private static final String DEFAULT_APPLICATION = "org.eclipse.update.internal.ui.updateManager";

-	public UMApplication() {

-		super();

-		application = DEFAULT_APPLICATION;

-	}

-	public static void main(String[] args) {

-

-		int iReturnCode = 0;

-

-		try {

-			new UMApplication().run(args);

-		}

-

-		catch (Exception e) {

-		}

-

-		System.exit(0);

-	}

-}
\ No newline at end of file
diff --git a/update/org.eclipse.update/src/org/eclipse/update/internal/ui/UMApplicationUserInterface.java b/update/org.eclipse.update/src/org/eclipse/update/internal/ui/UMApplicationUserInterface.java
deleted file mode 100644
index 2543bc2..0000000
--- a/update/org.eclipse.update/src/org/eclipse/update/internal/ui/UMApplicationUserInterface.java
+++ /dev/null
Binary files differ
diff --git a/update/org.eclipse.update/src/org/eclipse/update/internal/ui/UMApplicationUserInterfaceProperties.java b/update/org.eclipse.update/src/org/eclipse/update/internal/ui/UMApplicationUserInterfaceProperties.java
deleted file mode 100644
index ac84b0b..0000000
--- a/update/org.eclipse.update/src/org/eclipse/update/internal/ui/UMApplicationUserInterfaceProperties.java
+++ /dev/null
Binary files differ
diff --git a/update/org.eclipse.update/src/org/eclipse/update/internal/ui/UMApplicationWindow.java b/update/org.eclipse.update/src/org/eclipse/update/internal/ui/UMApplicationWindow.java
deleted file mode 100644
index 9d6394b..0000000
--- a/update/org.eclipse.update/src/org/eclipse/update/internal/ui/UMApplicationWindow.java
+++ /dev/null
Binary files differ
diff --git a/update/org.eclipse.update/src/org/eclipse/update/internal/ui/UMDialog.java b/update/org.eclipse.update/src/org/eclipse/update/internal/ui/UMDialog.java
deleted file mode 100644
index a098936..0000000
--- a/update/org.eclipse.update/src/org/eclipse/update/internal/ui/UMDialog.java
+++ /dev/null
Binary files differ
diff --git a/update/org.eclipse.update/src/org/eclipse/update/internal/ui/UMDialogAction.java b/update/org.eclipse.update/src/org/eclipse/update/internal/ui/UMDialogAction.java
deleted file mode 100644
index 19dd3d4..0000000
--- a/update/org.eclipse.update/src/org/eclipse/update/internal/ui/UMDialogAction.java
+++ /dev/null
Binary files differ
diff --git a/update/org.eclipse.update/src/org/eclipse/update/internal/ui/UMPreferencePageSettings.java b/update/org.eclipse.update/src/org/eclipse/update/internal/ui/UMPreferencePageSettings.java
deleted file mode 100644
index d5a2709..0000000
--- a/update/org.eclipse.update/src/org/eclipse/update/internal/ui/UMPreferencePageSettings.java
+++ /dev/null
Binary files differ
diff --git a/update/org.eclipse.update/src/org/eclipse/update/internal/ui/UMWizard.java b/update/org.eclipse.update/src/org/eclipse/update/internal/ui/UMWizard.java
deleted file mode 100644
index 0adbc08..0000000
--- a/update/org.eclipse.update/src/org/eclipse/update/internal/ui/UMWizard.java
+++ /dev/null
Binary files differ
diff --git a/update/org.eclipse.update/src/org/eclipse/update/internal/ui/UMWizardPageComplete.java b/update/org.eclipse.update/src/org/eclipse/update/internal/ui/UMWizardPageComplete.java
deleted file mode 100644
index 5d3a7ec..0000000
--- a/update/org.eclipse.update/src/org/eclipse/update/internal/ui/UMWizardPageComplete.java
+++ /dev/null
Binary files differ
diff --git a/update/org.eclipse.update/src/org/eclipse/update/internal/ui/UMWizardPageInstallable.java b/update/org.eclipse.update/src/org/eclipse/update/internal/ui/UMWizardPageInstallable.java
deleted file mode 100644
index b2803d4..0000000
--- a/update/org.eclipse.update/src/org/eclipse/update/internal/ui/UMWizardPageInstallable.java
+++ /dev/null
@@ -1,1333 +0,0 @@
-package org.eclipse.update.internal.ui;

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

-

-import java.io.InputStream;

-import java.lang.reflect.InvocationTargetException;

-import java.net.MalformedURLException;

-import java.net.URL;

-import java.util.Hashtable;

-import java.util.Iterator;

-import java.util.TreeSet;

-import java.util.Vector;

-

-import org.eclipse.core.internal.boot.update.IComponentDescriptor;

-import org.eclipse.core.internal.boot.update.IComponentEntryDescriptor;

-import org.eclipse.core.internal.boot.update.IManifestDescriptor;

-import org.eclipse.core.internal.boot.update.IProductDescriptor;

-import org.eclipse.core.internal.boot.update.IUMRegistry;

-import org.eclipse.core.internal.boot.update.UMEclipseTree;

-import org.eclipse.core.internal.boot.update.URLNamePair;

-import org.eclipse.core.internal.boot.update.UpdateManagerConstants;

-import org.eclipse.core.internal.boot.update.BaseURLHandler.Response;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.jface.dialogs.MessageDialog;

-import org.eclipse.jface.operation.IRunnableWithProgress;

-import org.eclipse.jface.viewers.ColumnLayoutData;

-import org.eclipse.jface.viewers.ColumnWeightData;

-import org.eclipse.jface.viewers.TableLayout;

-import org.eclipse.jface.wizard.WizardPage;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.custom.SashForm;

-import org.eclipse.swt.custom.TableTree;

-import org.eclipse.swt.custom.TableTreeItem;

-import org.eclipse.swt.events.MouseEvent;

-import org.eclipse.swt.events.MouseMoveListener;

-import org.eclipse.swt.events.MouseTrackListener;

-import org.eclipse.swt.events.SelectionEvent;

-import org.eclipse.swt.events.SelectionListener;

-import org.eclipse.swt.graphics.Point;

-import org.eclipse.swt.layout.GridData;

-import org.eclipse.swt.layout.GridLayout;

-import org.eclipse.swt.widgets.Button;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.TableColumn;

-import org.eclipse.swt.widgets.TableItem;

-import org.eclipse.swt.widgets.Text;

-import org.eclipse.update.internal.core.URLHandler;

-import org.eclipse.update.internal.core.UpdateManagerStrings;

-import org.eclipse.webdav.http.client.IStatusCodes;

-

-/**

- * Presents products and components that may be selected for installation.

- */

-public class UMWizardPageInstallable extends WizardPage implements MouseMoveListener, MouseTrackListener, SelectionListener {

-	protected boolean _bRefreshRequired = true;

-	protected UMWizard _wizard = null;

-	protected TableTree _tableTreeItems = null;

-	protected Hashtable _hashRegistryCache = new Hashtable();

-	protected TreeSet _treeSetItems = null;

-	protected TreeSet _treeSetLocations = null;

-	protected Text _textDescription = null;

-	protected String _strDescription = null;

-	protected boolean _bUpdateMode = false;

-	protected SashForm _sashFormTopBottom = null;

-	protected IProgressMonitor _progressMonitor = null;

-	protected URLNamePair[] _urlNamePairs = null;

-	protected Button _buttonShowLatestOnly = null;

-	protected boolean _bShowLatestOnly = true;

-	/**

-	 *

-	 */

-	public UMWizardPageInstallable(UMWizard wizard, String strName, boolean bUpdateMode) {

-		super(strName);

-		_wizard = wizard;

-		_bUpdateMode = bUpdateMode;

-

-		if (bUpdateMode == true) {

-			this.setTitle(UpdateManagerStrings.getString("S_New_Component_Updates"));

-			this.setDescription(UpdateManagerStrings.getString("S_Select_available_versions_to_install"));

-		}

-		else {

-			this.setTitle(UpdateManagerStrings.getString("S_New_Components"));

-			this.setDescription(UpdateManagerStrings.getString("S_Select_components_to_install"));

-		}

-	}

-	/**

-	 * 

-	 */

-	public void addLocationToTree(IUMRegistry registryRemote, IUMRegistry registryLocal, IProgressMonitor progressMonitor) {

-

-		UMWizardTreeItem itemProduct = null;

-		UMWizardTreeItem itemComponent = null;

-		UMWizardTreeItem itemComponentEntry = null;

-		UMWizardTreeItem itemLocation = null;

-		UMWizardTreeItem itemComponentCategory = null;

-		UMWizardTreeItem itemProductCategory = null;

-

-		IProductDescriptor descriptorLocalProduct = null;

-		IProductDescriptor[] descriptorsProduct = null;

-		IComponentDescriptor descriptorLocalComponent = null;

-		IComponentDescriptor[] descriptorsComponent = null;

-		IComponentEntryDescriptor[] descriptorsEntry = null;

-

-		// Obtain descriptors

-		//-------------------

-		if (_bShowLatestOnly == true) {

-			descriptorsProduct = registryRemote.getProductDescriptors();

-			descriptorsComponent = registryRemote.getComponentDescriptors();

-		}

-		else {

-			descriptorsProduct = registryRemote.getAllProductDescriptors();

-			descriptorsComponent = registryRemote.getAllComponentDescriptors();

-		}

-

-		if (descriptorsProduct.length + descriptorsComponent.length > 0) {

-

-			itemLocation = new UMWizardTreeItem();

-			itemLocation._iType = UpdateManagerConstants.TYPE_URL;

-			itemLocation._strDescription = registryRemote.getRegistryBaseURL().toExternalForm();

-			itemLocation._strName = getURLDescription(itemLocation._strDescription);

-			itemLocation._strURLUpdate = itemLocation._strName;

-

-			progressMonitor.beginTask(UpdateManagerStrings.getString("S_Examining") + ":", descriptorsProduct.length + descriptorsComponent.length);

-			progressMonitor.subTask(itemLocation._strName);

-

-			IManifestDescriptor[] descriptorsSelected = _wizard._manifestDescriptors;

-

-			boolean bIncludeThisOne = false;

-

-			// Products

-			//---------

-			if (descriptorsProduct.length > 0) {

-

-				itemProductCategory = new UMWizardTreeItem();

-				itemProductCategory._iType = UpdateManagerConstants.TYPE_PRODUCT_CATEGORY;

-				itemProductCategory._strName = "products";

-

-				// Add product category to location tree later

-				//--------------------------------------------

-				IProductDescriptor descriptorProductSelected = null;

-

-				for (int i = 0; i < descriptorsProduct.length; ++i) {

-

-					// Include all if selected descriptors is null

-					// Otherwise, include only those selected

-					//--------------------------------------------

-					bIncludeThisOne = true;

-

-					if (descriptorsSelected != null) {

-						bIncludeThisOne = false;

-

-						for (int j = 0; j < descriptorsSelected.length; ++j) {

-							if (descriptorsSelected[j] instanceof IProductDescriptor) {

-								descriptorProductSelected = (IProductDescriptor) descriptorsSelected[j];

-								if (descriptorProductSelected.getUniqueIdentifier() != null) {

-									if (descriptorProductSelected.getUniqueIdentifier().equals(descriptorsProduct[i].getUniqueIdentifier()) == true) {

-										bIncludeThisOne = true;

-										break;

-									}

-								}

-							}

-						}

-					}

-

-					// Display only non-installed items

-					//---------------------------------

-					if (_bUpdateMode == false) {

-						if (registryLocal.getProductDescriptor(descriptorsProduct[i].getUniqueIdentifier()) != null) {

-							bIncludeThisOne = false;

-						}

-					}

-

-					if (bIncludeThisOne == true) {

-						itemProduct = new UMWizardTreeItem();

-						itemProduct._iType = UpdateManagerConstants.TYPE_PRODUCT;

-						itemProduct._strDescription = descriptorsProduct[i].getDescription();

-						itemProduct._strName = descriptorsProduct[i].getLabel();

-						itemProduct._strId = descriptorsProduct[i].getUniqueIdentifier();

-						itemProduct._strVendorName = descriptorsProduct[i].getProviderName();

-						itemProduct._strVersionAvailable = descriptorsProduct[i].getVersionStr();

-						itemProduct._descriptorAvailable = descriptorsProduct[i];

-

-						descriptorLocalProduct = registryLocal.getProductDescriptor(itemProduct._strId);

-

-						if (descriptorLocalProduct != null) {

-							itemProduct._descriptorCurrent = descriptorLocalProduct;

-							itemProduct._strVersionCurrent = descriptorLocalProduct.getVersionStr();

-						}

-

-						itemProductCategory.addChildItem(itemProduct);

-

-						// Component entries of the product

-						//---------------------------------

-						descriptorsEntry = descriptorsProduct[i].getComponentEntries();

-

-						for (int j = 0; j < descriptorsEntry.length; ++j) {

-

-							// Turn off selected flag

-							//-----------------------

-							descriptorsEntry[j].isSelected(false);

-							itemComponentEntry = new UMWizardTreeItem();

-							itemComponentEntry._iType = UpdateManagerConstants.TYPE_COMPONENT_ENTRY;

-							itemComponentEntry._strName = descriptorsEntry[j].getLabel();

-							itemComponentEntry._strId = descriptorsEntry[j].getUniqueIdentifier();

-							itemComponentEntry._strVersionAvailable = descriptorsEntry[j].getVersionStr();

-							itemComponentEntry._descriptorEntry = descriptorsEntry[j];

-

-							descriptorLocalComponent = registryLocal.getComponentDescriptor(itemComponentEntry._strId);

-

-							if (descriptorLocalComponent != null) {

-								itemComponentEntry._strVersionCurrent = descriptorLocalComponent.getVersionStr();

-								itemComponentEntry._strVendorName = descriptorLocalComponent.getProviderName();

-								itemComponentEntry._descriptorCurrent = descriptorLocalComponent;

-							}

-

-							itemProduct.addChildItem(itemComponentEntry);

-						}

-					}

-

-					progressMonitor.worked(1);

-				}

-

-				// Add component category if there are any components

-				//---------------------------------------------------

-				if (itemProductCategory._vectorChildren != null && itemProductCategory._vectorChildren.size() > 0) {

-					itemLocation.addChildItem(itemProductCategory);

-				}

-			}

-

-			// Components

-			//-----------

-			if (descriptorsComponent.length > 0) {

-

-				itemComponentCategory = new UMWizardTreeItem();

-				itemComponentCategory._iType = UpdateManagerConstants.TYPE_COMPONENT_CATEGORY;

-				itemComponentCategory._strName = "components";

-

-				// Add product category to location tree later

-				//--------------------------------------------

-				IComponentDescriptor descriptorComponentSelected = null;

-				for (int i = 0; i < descriptorsComponent.length; ++i) {

-

-					// Include all if selected descriptors is null

-					// Otherwise, include only those selected

-					//--------------------------------------------

-					bIncludeThisOne = true;

-					if (descriptorsSelected != null) {

-						bIncludeThisOne = false;

-						for (int j = 0; j < descriptorsSelected.length; ++j) {

-							if (descriptorsSelected[j] instanceof IComponentDescriptor) {

-								descriptorComponentSelected = (IComponentDescriptor) descriptorsSelected[j];

-								if (descriptorComponentSelected.getUniqueIdentifier() != null) {

-									if (descriptorComponentSelected.getUniqueIdentifier().equals(descriptorsComponent[i].getUniqueIdentifier()) == true) {

-										bIncludeThisOne = true;

-										break;

-									}

-								}

-							}

-						}

-					}

-

-					// Display only non-installed items

-					//---------------------------------

-					if (_bUpdateMode == false) {

-						if (registryLocal.getComponentDescriptor(descriptorsComponent[i].getUniqueIdentifier()) != null) {

-							bIncludeThisOne = false;

-						}

-					}

-

-					if (bIncludeThisOne == true) {

-						itemComponent = new UMWizardTreeItem();

-						itemComponent._iType = UpdateManagerConstants.TYPE_COMPONENT;

-						itemComponent._strDescription = descriptorsComponent[i].getDescription();

-						itemComponent._strName = descriptorsComponent[i].getLabel();

-						itemComponent._strId = descriptorsComponent[i].getUniqueIdentifier();

-						itemComponent._strVendorName = descriptorsComponent[i].getProviderName();

-						itemComponent._strVersionAvailable = descriptorsComponent[i].getVersionStr();

-						itemComponent._descriptorAvailable = descriptorsComponent[i];

-

-						descriptorLocalComponent = registryLocal.getComponentDescriptor(itemComponent._strId);

-

-						if (descriptorLocalComponent != null) {

-							itemComponent._strVersionCurrent = descriptorLocalComponent.getVersionStr();

-							itemComponent._descriptorCurrent = descriptorLocalComponent;

-						}

-

-						itemComponentCategory.addChildItem(itemComponent);

-					}

-					progressMonitor.worked(1);

-				}

-

-				// Add component category if there are any components

-				//---------------------------------------------------

-				if (itemComponentCategory._vectorChildren != null && itemComponentCategory._vectorChildren.size() > 0) {

-					itemLocation.addChildItem(itemComponentCategory);

-				}

-			}

-			progressMonitor.done();

-

-			// Add location if there are any products/components

-			//---------------------------------------------------       

-			if (itemLocation._vectorChildren != null && itemLocation._vectorChildren.size() > 0) {

-				_treeSetItems.add(itemLocation);

-			}

-		}

-	}

-	/**

-	 *

-	 */

-	public void connectToTree() {

-

-		// Remove all existing tree items

-		//-------------------------------

-		_tableTreeItems.removeAll();

-

-		UMWizardTreeItem item = null;

-

-		Iterator iter = _treeSetItems.iterator();

-

-		while (iter.hasNext() == true) {

-

-			item = (UMWizardTreeItem) iter.next();

-

-			// Create a new tree item for the top level (URL)

-			//-----------------------------------------------

-			TableTreeItem treeItem = new TableTreeItem(_tableTreeItems, SWT.NULL);

-

-			if (item._strName != null)

-				treeItem.setText(0, item._strName);

-

-			if (item._strVendorName != null)

-				treeItem.setText(4, item._strVendorName);

-

-			treeItem.setData(item);

-

-			// Create child tree items

-			//------------------------

-			if (item._vectorChildren != null) {

-				for (int i = 0; i < item._vectorChildren.size(); ++i) {

-					connectToTree((UMWizardTreeItem) item._vectorChildren.elementAt(i), treeItem);

-				}

-			}

-

-			treeItem.setExpanded(true);

-		}

-	}

-	/**

-	 * Connects items to a new tree widget.

-	 */

-	public void connectToTree(UMWizardTreeItem item, TableTreeItem treeItemParent) {

-

-		// Ignore product category and component category items

-		//-----------------------------------------------------

-		TableTreeItem treeItem = treeItemParent;

-

-		// Create a new tree item

-		//-----------------------

-		if (item._iType == UpdateManagerConstants.TYPE_PRODUCT || item._iType == UpdateManagerConstants.TYPE_COMPONENT || item._iType == UpdateManagerConstants.TYPE_COMPONENT_ENTRY) {

-

-			treeItem = new TableTreeItem(treeItemParent, SWT.NULL);

-			treeItem.setText(0, item._strName);

-			treeItem.setData(item);

-

-			// Table text

-			//-----------

-			if (item._strVersionCurrent != null)

-				treeItem.setText(1, item._strVersionCurrent);

-

-			if (item._strVersionAvailable != null)

-				treeItem.setText(2, item._strVersionAvailable);

-

-			if (item._strVendorName != null)

-				treeItem.setText(4, item._strVendorName);

-

-			// Status text

-			//------------

-			boolean bInstallable = false;

-

-			if (item._iType == UpdateManagerConstants.TYPE_PRODUCT) {

-				int iInstallable = isInstallableProduct(treeItem);

-				treeItem.setText(3, convertInstallableToString(iInstallable));

-			}

-

-			else if (item._iType == UpdateManagerConstants.TYPE_COMPONENT) {

-				int iInstallable = isInstallableComponent(treeItem);

-				treeItem.setText(3, convertInstallableToString(iInstallable));

-			}

-

-			else if (item._iType == UpdateManagerConstants.TYPE_COMPONENT_ENTRY) {

-

-				int iInstallable = isInstallableComponentEntry(treeItem);

-				treeItem.setText(3, convertInstallableToString(iInstallable));

-

-				if (iInstallable == UpdateManagerConstants.OK_TO_INSTALL) {

-					// Optional installation

-					//---------------------- 

-					if (item._descriptorEntry.isOptionalForInstall() == true) {

-						treeItem.setText(3, UpdateManagerStrings.getString("S_optional"));

-					}

-				}

-				else {

-					treeItem.setText(3, convertInstallableToString(iInstallable));

-				}

-			}

-		}

-

-		// Create child tree items

-		//------------------------

-		if (item._vectorChildren != null) {

-			for (int i = 0; i < item._vectorChildren.size(); ++i) {

-				connectToTree((UMWizardTreeItem) item._vectorChildren.elementAt(i), treeItem);

-			}

-		}

-

-		// Expand only after children have been created

-		//---------------------------------------------

-		if (item._iType != UpdateManagerConstants.TYPE_PRODUCT)

-			treeItem.setExpanded(true);

-

-		return;

-	}

-	/**

-	 * Converts installable constant to a displayable string

-	 */

-	public String convertInstallableToString(int iInstallable) {

-

-		switch (iInstallable) {

-			case UpdateManagerConstants.NOT_COMPATIBLE :

-				return UpdateManagerStrings.getString("S_not_compatible");

-			case UpdateManagerConstants.NOT_NEWER :

-				return UpdateManagerStrings.getString("S_not_newer");

-			case UpdateManagerConstants.NOT_UPDATABLE :

-				return UpdateManagerStrings.getString("S_not_updatable");

-			case UpdateManagerConstants.NOT_AVAILABLE :

-				return UpdateManagerStrings.getString("S_not_available");

-			default :

-				return "";

-		}

-	}

-	/**

-	 * createContents method comment.

-	 */

-	public void createControl(Composite compositeParent) {

-		// Content

-		//--------

-		Composite compositeContent = new Composite(compositeParent, SWT.NULL);

-

-		GridLayout layout = new GridLayout();

-		compositeContent.setLayout(layout);

-

-		GridData gridData = new GridData();

-		gridData.horizontalAlignment = GridData.FILL;

-		gridData.verticalAlignment = GridData.FILL;

-		gridData.grabExcessHorizontalSpace = true;

-		gridData.grabExcessVerticalSpace = true;

-		compositeContent.setLayoutData(gridData);

-

-		// Checkbox: Show most recent versions only

-		//-----------------------------------------

-		_buttonShowLatestOnly = new Button(compositeContent, SWT.CHECK);

-		_buttonShowLatestOnly.setText(UpdateManagerStrings.getString("S_Show_only_most_recent_versions"));

-		_buttonShowLatestOnly.setSelection(_bShowLatestOnly);

-		_buttonShowLatestOnly.addSelectionListener(this);

-

-		// SashPane Top/Bottom

-		//--------------------

-		_sashFormTopBottom = new SashForm(compositeContent, SWT.VERTICAL);

-

-		gridData = new GridData();

-		gridData.horizontalAlignment = GridData.FILL;

-		gridData.verticalAlignment = GridData.FILL;

-		gridData.grabExcessHorizontalSpace = true;

-		gridData.grabExcessVerticalSpace = true;

-		_sashFormTopBottom.setLayoutData(gridData);

-

-		// Tree: Installable

-		//------------------

-		_tableTreeItems = new TableTree(_sashFormTopBottom, SWT.MULTI | SWT.FULL_SELECTION | SWT.BORDER | SWT.CHECK);

-

-		String[] columnTitles = { UpdateManagerStrings.getString("S_Component"), UpdateManagerStrings.getString("S_Installed"), UpdateManagerStrings.getString("S_Available"), UpdateManagerStrings.getString("S_Status"), UpdateManagerStrings.getString("S_Provider")};

-		int[] iColumnWeight = { 40, 15, 15, 15, 15 };

-		TableLayout layoutTable = new TableLayout();

-

-		for (int i = 0; i < columnTitles.length; i++) {

-			TableColumn tableColumn = new TableColumn(_tableTreeItems.getTable(), SWT.NONE);

-			tableColumn.setText(columnTitles[i]);

-			ColumnLayoutData cLayout = new ColumnWeightData(iColumnWeight[i], true);

-			layoutTable.addColumnData(cLayout);

-		}

-

-		_tableTreeItems.getTable().setLinesVisible(true);

-		_tableTreeItems.getTable().setHeaderVisible(true);

-		_tableTreeItems.getTable().setLayout(layoutTable);

-		_tableTreeItems.getTable().addMouseMoveListener(this);

-		_tableTreeItems.getTable().addMouseTrackListener(this);

-

-		_tableTreeItems.addSelectionListener(this);

-

-		gridData = new GridData();

-		gridData.horizontalAlignment = GridData.FILL;

-		gridData.verticalAlignment = GridData.FILL;

-		gridData.grabExcessHorizontalSpace = true;

-		gridData.grabExcessVerticalSpace = true;

-		_tableTreeItems.setLayoutData(gridData);

-

-		// Text: Description

-		//------------------

-		_textDescription = new Text(_sashFormTopBottom, SWT.WRAP | SWT.READ_ONLY | SWT.MULTI | SWT.BORDER);

-		gridData = new GridData();

-		gridData.horizontalAlignment = GridData.FILL;

-		gridData.verticalAlignment = GridData.FILL;

-		gridData.heightHint = 50;

-		_textDescription.setLayoutData(gridData);

-

-		_sashFormTopBottom.setWeights(new int[] { 80, 20 });

-

-		setControl(compositeContent);

-

-		setPageComplete(false);

-	}

-	/**

-	 * 

-	 */

-	public IUMRegistry getRegistryAt(String strLocation) {

-

-		IUMRegistry registry = (IUMRegistry) _hashRegistryCache.get(strLocation);

-

-		// Create new entry if not found

-		//------------------------------

-		if (registry == null) {

-			URL url = null;

-

-			try {

-				url = new URL(strLocation);

-			}

-			catch (MalformedURLException ex) {

-				return null;

-			}

-

-			registry = _wizard._updateManager.getRegistryAt(url);

-

-			if (registry != null) {

-				_hashRegistryCache.put(strLocation, registry);

-			}

-		}

-

-		return registry;

-	}

-	/**

-	 * 

-	 */

-	public UMWizardTreeItem[] getSelectedItems() {

-

-		UMWizardTreeItem[] items = null;

-

-		// Obtain all selected items

-		//--------------------------

-		TableTreeItem[] treeItemChildren = _tableTreeItems.getItems();

-

-		// Place them into an array

-		//-------------------------

-		Hashtable hashProducts = new Hashtable();

-		Hashtable hashComponents = new Hashtable();

-		Hashtable hashComponentEntries = new Hashtable();

-

-		for (int i = 0; i < treeItemChildren.length; ++i) {

-			getSelectedItemsRecursive(treeItemChildren[i], hashProducts, hashComponents, hashComponentEntries);

-		}

-

-		// Copy items to an array

-		//-----------------------

-		items = new UMWizardTreeItem[hashProducts.size() + hashComponents.size() + hashComponentEntries.size()];

-

-		// Products

-		//---------

-		Object[] objArray = hashProducts.values().toArray();

-		System.arraycopy(objArray, 0, items, 0, objArray.length);

-

-		// Components

-		//-----------

-		objArray = hashComponents.values().toArray();

-		System.arraycopy(objArray, 0, items, hashProducts.size(), objArray.length);

-

-		// Component Entries

-		//------------------

-		objArray = hashComponentEntries.values().toArray();

-		System.arraycopy(objArray, 0, items, hashProducts.size() + hashComponents.size(), objArray.length);

-

-		return items;

-	}

-	/**

-	 * 

-	 */

-	public void getSelectedItemsRecursive(TableTreeItem treeItem, Hashtable hashProducts, Hashtable hashComponents, Hashtable hashComponentEntries) {

-

-		// Obtain all selected items

-		//--------------------------

-		UMWizardTreeItem umTreeItem = null;

-

-		if (treeItem.getChecked() == true) {

-			umTreeItem = (UMWizardTreeItem) treeItem.getData();

-

-			if (umTreeItem != null) {

-				if (umTreeItem._iType == UpdateManagerConstants.TYPE_PRODUCT) {

-

-					// Remove duplicates by storing newer ones only

-					//---------------------------------------------

-					if (hashProducts.containsKey(umTreeItem._strId) == true) {

-						UMWizardTreeItem umTreeItemPrevious = (UMWizardTreeItem) hashProducts.get(umTreeItem._strId);

-						if (((IProductDescriptor) umTreeItem._descriptorAvailable).compare((IProductDescriptor) umTreeItemPrevious._descriptorAvailable) > 0) {

-							hashProducts.remove(umTreeItem._strId);

-							hashProducts.put(umTreeItem._strId, umTreeItem);

-						}

-					}

-					else {

-						hashProducts.put(umTreeItem._strId, umTreeItem);

-					}

-				}

-

-				else if (umTreeItem._iType == UpdateManagerConstants.TYPE_COMPONENT) {

-

-					// Remove duplicates by storing newer ones only

-					//---------------------------------------------

-					if (hashComponents.containsKey(umTreeItem._strId) == true) {

-						UMWizardTreeItem umTreeItemPrevious = (UMWizardTreeItem) hashComponents.get(umTreeItem._strId);

-						if (((IComponentDescriptor) umTreeItem._descriptorAvailable).compare((IComponentDescriptor) umTreeItemPrevious._descriptorAvailable) > 0) {

-							hashComponents.remove(umTreeItem._strId);

-							hashComponents.put(umTreeItem._strId, umTreeItem);

-						}

-					}

-					else {

-						hashComponents.put(umTreeItem._strId, umTreeItem);

-					}

-				}

-

-				else if (umTreeItem._iType == UpdateManagerConstants.TYPE_COMPONENT_ENTRY) {

-

-					// Add only if the parent product has not been selected

-					//-----------------------------------------------------

-					TableTreeItem treeItemParent = treeItem.getParentItem();

-					if (treeItemParent.getChecked() == false) {

-

-						// Remove duplicates by storing newer ones only

-						//---------------------------------------------

-						if (hashComponentEntries.containsKey(umTreeItem._strId) == true) {

-							UMWizardTreeItem umTreeItemPrevious = (UMWizardTreeItem) hashComponentEntries.get(umTreeItem._strId);

-							if (((IComponentEntryDescriptor) umTreeItem._descriptorEntry).compare((IComponentEntryDescriptor) umTreeItemPrevious._descriptorEntry) > 0) {

-								hashComponentEntries.remove(umTreeItem._strId);

-								hashComponentEntries.put(umTreeItem._strId, umTreeItem);

-							}

-						}

-						else {

-							hashComponentEntries.put(umTreeItem._strId, umTreeItem);

-						}

-					}

-				}

-			}

-		}

-

-		// Do child items

-		//---------------

-		TableTreeItem[] treeItemChildren = treeItem.getItems();

-

-		for (int i = 0; i < treeItemChildren.length; ++i) {

-			getSelectedItemsRecursive(treeItemChildren[i], hashProducts, hashComponents, hashComponentEntries);

-		}

-

-		return;

-	}

-	/**

-	 */

-	public String getURLDescription(String strURL) {

-

-		if (_treeSetLocations != null && _treeSetLocations.size() > 0) {

-			Iterator iter = _treeSetLocations.iterator();

-			URLNamePair pair = null;

-			while (iter.hasNext() == true) {

-				pair = (URLNamePair) iter.next();

-				if (pair._getURL().equals(strURL) == true) {

-					if (pair._getName() != null && pair._getName().length() > 0) {

-						return pair._getName();

-					}

-				}

-			}

-		}

-

-		return strURL;

-	}

-	/**

-	 * Obtains a list of registered component URLs from the local update registry.

-	 * Obtains a list of bookmarked URLs from the persistent data.

-	 * Creates a tree for all of the URLs.

-	 */

-	protected void initializeContent() {

-

-		if (_bRefreshRequired == false) {

-			return;

-		}

-

-		// Add all selected locations to a set

-		//------------------------------------

-		_treeSetLocations = new TreeSet(new UMWizardURLNamePairComparator());

-

-		// Obtain predefined locations strings from location page

-		//-------------------------------------------------------

-		UMWizardPageLocations pageLocations = (UMWizardPageLocations) _wizard.getPage("locations");

-

-		URLNamePair[] pairs = pageLocations.getSelectedPredefinedLocations();

-

-		for (int i = 0; i < pairs.length; ++i) {

-			_treeSetLocations.add(pairs[i]);

-		}

-

-		// Obtain additional locations strings from location page

-		//-------------------------------------------------------

-		pairs = pageLocations.getSelectedAdditionalLocations();

-

-		for (int i = 0; i < pairs.length; ++i) {

-			_treeSetLocations.add(pairs[i]);

-		}

-

-		// Obtain local registry in case there are installed versions

-		//-----------------------------------------------------------

-		final IUMRegistry registryLocal = _wizard._updateManager.getRegistryManager().getCurrentRegistry();

-

-		final Vector vectorRegistries = new Vector();

-		final Vector vectorURLsFailed = new Vector();

-

-		_tableTreeItems.setRedraw(false);

-

-		// Create an operation that read and create a registry for each location

-		//----------------------------------------------------------------------

-		IRunnableWithProgress operation = new IRunnableWithProgress() {

-			public void run(IProgressMonitor progressMonitor) throws InvocationTargetException, InterruptedException {

-

-				_progressMonitor = progressMonitor;

-

-				progressMonitor.beginTask(UpdateManagerStrings.getString("S_Reading") + ":", _treeSetLocations.size());

-

-				URLNamePair pair = null;

-				IUMRegistry registry = null;

-

-				Iterator iter = _treeSetLocations.iterator();

-

-				boolean bUrlOk = false;

-

-				while (iter.hasNext() == true) {

-

-					bUrlOk = false;

-

-					// Obtain the registry for the URL

-					// This will download the information

-					//-----------------------------------

-					pair = (URLNamePair) iter.next();

-

-					progressMonitor.subTask(pair._getName());

-

-					// Attempt to open the stream

-					//---------------------------

-					try {

-						URL url = new URL(pair._getURL());

-						url = UMEclipseTree.appendTrailingSlash(url);

-						Response response = URLHandler.open(url);

-						// we open the url to get authenticated.  response code not

-						// important at this point

-					/*	if (response.getResponseCode() == IStatusCodes.HTTP_OK) {

-							InputStream stream = response.getInputStream();

-

-							if (stream != null) {

-								stream.close();*/

-								bUrlOk = true;

-					//		}

-					//	}

-					}

-					catch (Exception ex) {

-					}

-

-					if (bUrlOk == true) { 

-						registry = getRegistryAt(pair._getURL());

-

-						// Add it to the list

-						//-------------------

-						if (registry != null)

-							vectorRegistries.add(registry);

-					}

-					else {

-						vectorURLsFailed.add(pair);

-					}

-

-					progressMonitor.worked(1);

-				}

-				progressMonitor.done();

-

-				_progressMonitor = null;

-			}

-		};

-

-		// Run the operation

-		//------------------

-		try {

-			_wizard.getContainer().run(true, true, operation);

-		}

-		catch (InterruptedException e) {

-		}

-		catch (InvocationTargetException e) {

-		}

-

-		// Create a new tree

-		//------------------

-		_treeSetItems = new TreeSet(new UMWizardTreeItemComparator());

-

-		// Create an operation that will fill the tree with information

-		// Location URL A

-		//   products

-		//     Product A

-		//     Product B

-		//   components

-		//     Component A

-		//     Component B

-		// Location URL B

-		// ...

-		//-------------------------------------------------------------

-		operation = new IRunnableWithProgress() {

-			public void run(IProgressMonitor progressMonitor) throws InvocationTargetException {

-

-				IUMRegistry registryRemote = null;

-

-				for (int i = 0; i < vectorRegistries.size(); ++i) {

-					registryRemote = (IUMRegistry) vectorRegistries.elementAt(i);

-					addLocationToTree(registryRemote, registryLocal, progressMonitor);

-				}

-			}

-		};

-

-		// Run the operation

-		//------------------

-		try {

-			_wizard.getContainer().run(true, true, operation);

-		}

-		catch (InterruptedException e) {

-			return;

-			//		System.out.println( "Interrupted" );

-		}

-		catch (InvocationTargetException e) {

-			//		System.out.println( "Invocation" );

-		}

-

-		_tableTreeItems.setRedraw(true);

-

-		// Create tree widget items for each update manager tree item

-		//-----------------------------------------------------------

-		connectToTree();

-

-		StringBuffer strbMessage = new StringBuffer();

-

-		// Determine whether there are any updatable items

-		//------------------------------------------------

-		if (_tableTreeItems.getItemCount() == 0)

-			strbMessage.append(UpdateManagerStrings.getString("S_No_installable_items_were_found") + "\n\n");

-

-		// Determine if any locations could not be accessed

-		//-------------------------------------------------

-		if (vectorURLsFailed.size() > 0) {

-			strbMessage.append(UpdateManagerStrings.getString("S_Unable_to_access_the_following_locations") + ":");

-			for (int i = 0; i < vectorURLsFailed.size(); ++i) {

-				strbMessage.append("\n   ");

-				strbMessage.append(((URLNamePair) vectorURLsFailed.elementAt(i))._getName());

-				strbMessage.append(" (");

-				strbMessage.append(((URLNamePair) vectorURLsFailed.elementAt(i))._getURL());

-				strbMessage.append(")");

-			}

-		}

-

-		if (strbMessage.length() > 0) {

-			MessageDialog.openInformation(getControl().getShell(), UpdateManagerStrings.getString("S_Information"), strbMessage.toString());

-		}

-

-		// Reset refresh flag

-		//-------------------

-		_bRefreshRequired = false;

-

-		return;

-	}

-	/**

-	 */

-	public int isInstallableComponent(TableTreeItem treeItemComponent) {

-

-		UMWizardTreeItem umTreeItem = (UMWizardTreeItem) treeItemComponent.getData();

-

-		// False if none available to install

-		//-----------------------------------

-		if (umTreeItem._descriptorAvailable == null) {

-			return -1;

-		}

-

-		// True if not yet installed

-		//--------------------------

-		if (umTreeItem._descriptorCurrent == null) {

-			return UpdateManagerConstants.OK_TO_INSTALL;

-		}

-

-		// True if installable

-		//--------------------

-		return ((IComponentDescriptor) umTreeItem._descriptorAvailable).isInstallable((IComponentDescriptor) umTreeItem._descriptorCurrent);

-	}

-	/**

-	 * @return int

-	 * @param treeItemComponent org.eclipse.swt.custom.TableTreeItem

-	 */

-	public int isInstallableComponentEntry(TableTreeItem treeItemComponentEntry) {

-

-		UMWizardTreeItem umTreeItem = (UMWizardTreeItem) treeItemComponentEntry.getData();

-

-		// False if none available to install

-		//-----------------------------------

-		if (umTreeItem._descriptorEntry == null) {

-			return -1;

-		}

-

-		// Is the product installable?

-		//----------------------------

-		TableTreeItem treeItemProduct = treeItemComponentEntry.getParentItem();

-

-		int iProductInstallable = isInstallableProduct(treeItemProduct);

-

-		// If the product is not installable, disable if mandatory component

-		//------------------------------------------------------------------

-		if (iProductInstallable != UpdateManagerConstants.OK_TO_INSTALL) {

-			if (umTreeItem._descriptorEntry.isOptionalForInstall() == false) {

-				return iProductInstallable;

-			}

-		}

-

-		return umTreeItem._descriptorEntry.isInstallable((IComponentDescriptor) umTreeItem._descriptorCurrent);

-	}

-	/**

-	 * @return int

-	 * @param treeItemComponent org.eclipse.swt.custom.TableTreeItem

-	 */

-	public int isInstallableProduct(TableTreeItem treeItemProduct) {

-

-		UMWizardTreeItem umTreeItem = (UMWizardTreeItem) treeItemProduct.getData();

-

-		// False if none available to install

-		//-----------------------------------

-		if (umTreeItem._descriptorAvailable == null) {

-			return -1;

-		}

-

-		// True if not yet installed

-		//--------------------------

-		else if (umTreeItem._descriptorCurrent == null) {

-			return UpdateManagerConstants.OK_TO_INSTALL;

-		}

-

-		// True if installable

-		//--------------------

-		return ((IProductDescriptor) umTreeItem._descriptorAvailable).isInstallable((IProductDescriptor) umTreeItem._descriptorCurrent);

-	}

-	/**

-	 * 

-	 */

-	public boolean isInstallableRecursive(TableTreeItem treeItem) {

-

-		boolean bInstallable = false;

-

-		UMWizardTreeItem umTreeItem = (UMWizardTreeItem) treeItem.getData();

-

-		// True if product or component is checked

-		//----------------------------------------

-		if (treeItem.getChecked() == true) {

-			if (umTreeItem._iType == UpdateManagerConstants.TYPE_COMPONENT || umTreeItem._iType == UpdateManagerConstants.TYPE_PRODUCT || umTreeItem._iType == UpdateManagerConstants.TYPE_COMPONENT_ENTRY) {

-				return true;

-			}

-		}

-

-		// Check all children

-		//-------------------

-		TableTreeItem[] treeItemChildren = treeItem.getItems();

-

-		for (int i = 0; i < treeItemChildren.length; ++i) {

-			if (isInstallableRecursive(treeItemChildren[i]) == true) {

-				return true;

-			}

-		}

-

-		return false;

-	}

-	/**

-	 * Sent when the mouse pointer passes into the area of

-	 * the screen covered by a control.

-	 */

-	public void mouseEnter(org.eclipse.swt.events.MouseEvent e) {

-	}

-	/**

-	 * Sent when the mouse pointer passes out of the area of

-	 * the screen covered by a control.  Erases the description text area.

-	 */

-	public void mouseExit(MouseEvent e) {

-		if (_strDescription != _wizard._strEmpty) {

-			_textDescription.setText(_wizard._strEmpty);

-			_strDescription = _wizard._strEmpty;

-		}

-	}

-	/**

-	 * Sent when the mouse pointer hovers (that is, stops moving

-	 * for an (operating system specified) period of time) over

-	 * a control.

-	 */

-	public void mouseHover(MouseEvent e) {

-	}

-	/**

-	 * Determines which item the mouse is over.  Sets the text in the description text area to the description of the item.

-	 */

-	public void mouseMove(MouseEvent e) {

-

-		// Table item

-		//-----------

-		TableItem tableItem = _tableTreeItems.getTable().getItem(new Point(e.x, e.y));

-

-		// TableTree item

-		//---------------

-		if (tableItem != null) {

-

-			TableTreeItem tableTreeItem = (TableTreeItem) tableItem.getData();

-

-			// UMWizardTreeItem

-			//---------------------- 

-			if (tableTreeItem != null) {

-

-				UMWizardTreeItem item = (UMWizardTreeItem) tableTreeItem.getData();

-

-				// Description string

-				//-------------------

-				if (item != null) {

-					if (item._strDescription != null) {

-						if (_strDescription != item._strDescription) {

-							_textDescription.setText(item._strDescription);

-							_strDescription = item._strDescription;

-						}

-					}

-					else {

-						if (_strDescription != _wizard._strEmpty) {

-							_textDescription.setText(_wizard._strEmpty);

-							_strDescription = _wizard._strEmpty;

-						}

-					}

-				}

-				else if (_strDescription != _wizard._strEmpty) {

-					_textDescription.setText(_wizard._strEmpty);

-					_strDescription = _wizard._strEmpty;

-				}

-

-			}

-		}

-		else if (_strDescription != _wizard._strEmpty) {

-			_textDescription.setText(_wizard._strEmpty);

-			_strDescription = _wizard._strEmpty;

-		}

-	}

-	/**

-	 * @return boolean

-	 */

-	public boolean performCancel() {

-

-		if (_progressMonitor == null)

-			return true;

-

-		_progressMonitor.setCanceled(true);

-		return false;

-	}

-	/**

-	 */

-	protected boolean setCheckedComponent(TableTreeItem treeItemComponent) {

-

-		if (treeItemComponent.getChecked() == false) {

-			int iInstallable = isInstallableComponent(treeItemComponent);

-

-			setTreeItemChecked(treeItemComponent, iInstallable == 0);

-			return iInstallable == 0;

-		}

-

-		return true;

-	}

-	/**

-	 */

-	protected boolean setCheckedComponentEntry(TableTreeItem treeItemComponentEntry) {

-

-		if (treeItemComponentEntry.getChecked() == false) {

-

-			UMWizardTreeItem umTreeItem = (UMWizardTreeItem) treeItemComponentEntry.getData();

-

-			int iInstallable = isInstallableComponentEntry(treeItemComponentEntry);

-

-			if (iInstallable == 0) {

-

-				// Set checked the product and all of its mandatory components

-				//------------------------------------------------------------

-				TableTreeItem treeItemProduct = treeItemComponentEntry.getParentItem();

-

-				boolean bInstallableProduct = setCheckedProduct(treeItemProduct);

-

-				// If the product is not installable, disable if mandatory component

-				//------------------------------------------------------------------

-				if (bInstallableProduct == false) {

-

-					if (umTreeItem._descriptorEntry.isOptionalForInstall() == false) {

-						if (treeItemComponentEntry.getChecked() == true)

-							treeItemComponentEntry.setChecked(false);

-						return false;

-					}

-				}

-			}

-

-			setTreeItemChecked(treeItemComponentEntry, iInstallable == 0);

-			umTreeItem._descriptorEntry.isSelected(iInstallable == 0);

-

-			return iInstallable == 0;

-		}

-

-		return true;

-	}

-	/**

-	 * This routine assumes that the checkbox was unchecked and is currently checked

-	 */

-	protected boolean setCheckedProduct(TableTreeItem treeItemProduct) {

-

-		if (treeItemProduct.getChecked() == false) {

-

-			int iInstallable = isInstallableProduct(treeItemProduct);

-

-			setTreeItemChecked(treeItemProduct, iInstallable == 0);

-

-			if (iInstallable == 0) {

-

-				TableTreeItem[] treeItemChildren = treeItemProduct.getItems();

-

-				UMWizardTreeItem umTreeItem = null;

-

-				for (int i = 0; i < treeItemChildren.length; ++i) {

-					setCheckedComponentEntry(treeItemChildren[i]);

-				}

-			}

-

-			return iInstallable == 0;

-		}

-

-		return true;

-	}

-	/**

-	 * This routine assumes that the checkbox was unchecked and is currently checked.

-	 */

-	protected boolean setCheckedURL(TableTreeItem treeItemURL) {

-

-		TableTreeItem[] treeItemChildren = treeItemURL.getItems();

-		UMWizardTreeItem umTreeItem = null;

-

-		for (int i = 0; i < treeItemChildren.length; ++i) {

-			umTreeItem = (UMWizardTreeItem) treeItemChildren[i].getData();

-

-			if (umTreeItem._iType == UpdateManagerConstants.TYPE_PRODUCT) {

-				setCheckedProduct(treeItemChildren[i]);

-			}

-			else if (umTreeItem._iType == UpdateManagerConstants.TYPE_COMPONENT) {

-				setCheckedComponent(treeItemChildren[i]);

-			}

-		}

-

-		// Always checked

-		//---------------

-		if (treeItemURL.getChecked() == false)

-			treeItemURL.setChecked(true);

-

-		return true;

-	}

-	/**

-	 */

-	protected void setTreeItemChecked(TableTreeItem treeItem, boolean bChecked) {

-

-		if (bChecked == true) {

-			if (treeItem.getChecked() == false)

-				treeItem.setChecked(true);

-		}

-		else {

-			if (treeItem.getChecked() == true)

-				treeItem.setChecked(false);

-		}

-	}

-	/**

-	 */

-	public void setTreeItemChecked(boolean bChecked) {

-	}

-	/**

-	 */

-	public void setTreeItemUncheckedRecursiveBackward(TableTreeItem treeItem) {

-

-		if (treeItem.getChecked() != false) {

-			treeItem.setChecked(false);

-		}

-

-		TableTreeItem treeItemParent = treeItem.getParentItem();

-

-		if (treeItemParent != null) {

-			setTreeItemUncheckedRecursiveBackward(treeItemParent);

-		}

-	}

-	/**

-	 */

-	public void setTreeItemUncheckedRecursiveForward(TableTreeItem treeItem) {

-

-		if (treeItem.getChecked() != false) {

-

-			treeItem.setChecked(false);

-			/*

-					UMWizardTreeItem umTreeItem = (UMWizardTreeItem) treeItem.getData();

-			

-					if (umTreeItem._iType == UpdateManagerConstants.TYPE_COMPONENT_ENTRY) {

-			

-						if (umTreeItem._descriptorEntry.isOptionalForInstall() == true) {

-							umTreeItem._descriptorEntry.isSelected(false);

-						}

-					}

-			*/

-		}

-

-		TableTreeItem[] treeItemChildren = treeItem.getItems();

-

-		for (int i = 0; i < treeItemChildren.length; ++i) {

-			setTreeItemUncheckedRecursiveForward(treeItemChildren[i]);

-		}

-	}

-	/**

-	 * 

-	 */

-	public void setVisible(boolean bVisible) {

-

-		super.setVisible(bVisible);

-

-		if (bVisible == true) {

-			_sashFormTopBottom.layout();

-			initializeContent();

-

-		}

-	}

-	/**

-	 * Sent when default selection occurs in the control.

-	 */

-	public void widgetDefaultSelected(org.eclipse.swt.events.SelectionEvent e) {

-	}

-	/**

-	 * Sent when selection occurs in the control.

-	 */

-	public void widgetSelected(org.eclipse.swt.events.SelectionEvent e) {

-

-		// Checkbox: Show latest versions only

-		//------------------------------------

-		if (e.widget == _buttonShowLatestOnly) {

-			_bShowLatestOnly = _buttonShowLatestOnly.getSelection();

-			_bRefreshRequired = true;

-			initializeContent();

-		}

-

-		// TableTreeItem: Checkbox

-		//------------------------

-		else if (e.widget == _tableTreeItems && e.detail == SWT.CHECK) {

-

-			// Set page complete to false in case there are

-			// no selected items, or until selection is determined to be valid

-			//----------------------------------------------------------------

-			setPageComplete(false);

-

-			TableTreeItem treeItem = (TableTreeItem) e.item;

-

-			UMWizardTreeItem umTreeItem = (UMWizardTreeItem) treeItem.getData();

-

-			boolean bChecked = treeItem.getChecked();

-

-			// Check

-			//------

-			if (bChecked == true) {

-				// Temporarily uncheck

-				//--------------------

-				treeItem.setChecked(false);

-

-				if (umTreeItem._iType == UpdateManagerConstants.TYPE_URL)

-					setCheckedURL(treeItem);

-

-				else if (umTreeItem._iType == UpdateManagerConstants.TYPE_PRODUCT)

-					setCheckedProduct(treeItem);

-

-				else if (umTreeItem._iType == UpdateManagerConstants.TYPE_COMPONENT)

-					setCheckedComponent(treeItem);

-

-				else if (umTreeItem._iType == UpdateManagerConstants.TYPE_COMPONENT_ENTRY)

-					setCheckedComponentEntry(treeItem);

-			}

-

-			// Uncheck

-			//--------

-			else {

-				switch (umTreeItem._iType) {

-					case UpdateManagerConstants.TYPE_COMPONENT_ENTRY :

-						umTreeItem._descriptorEntry.isSelected(false);

-						if (umTreeItem._descriptorEntry.isOptionalForInstall() == false)

-							setTreeItemUncheckedRecursiveBackward(treeItem);

-						break;

-

-					default :

-						setTreeItemUncheckedRecursiveBackward(treeItem);

-						setTreeItemUncheckedRecursiveForward(treeItem);

-						break;

-				}

-			}

-

-			// Determine if page is complete

-			//------------------------------

-			boolean bPageComplete = false;

-

-			TableTreeItem[] treeItems = _tableTreeItems.getItems();

-

-			for (int i = 0; i < treeItems.length; ++i) {

-				if (isInstallableRecursive(treeItems[i]) == true) {

-					setPageComplete(true);

-					break;

-				}

-			}

-		}

-

-		return;

-	}

-}
\ No newline at end of file
diff --git a/update/org.eclipse.update/src/org/eclipse/update/internal/ui/UMWizardPageInstalling.java b/update/org.eclipse.update/src/org/eclipse/update/internal/ui/UMWizardPageInstalling.java
deleted file mode 100644
index 7eb1bb8..0000000
--- a/update/org.eclipse.update/src/org/eclipse/update/internal/ui/UMWizardPageInstalling.java
+++ /dev/null
Binary files differ
diff --git a/update/org.eclipse.update/src/org/eclipse/update/internal/ui/UMWizardPageLaunchHistory.java b/update/org.eclipse.update/src/org/eclipse/update/internal/ui/UMWizardPageLaunchHistory.java
deleted file mode 100644
index 9589619..0000000
--- a/update/org.eclipse.update/src/org/eclipse/update/internal/ui/UMWizardPageLaunchHistory.java
+++ /dev/null
Binary files differ
diff --git a/update/org.eclipse.update/src/org/eclipse/update/internal/ui/UMWizardPageLaunchHistoryComplete.java b/update/org.eclipse.update/src/org/eclipse/update/internal/ui/UMWizardPageLaunchHistoryComplete.java
deleted file mode 100644
index 84a9d61..0000000
--- a/update/org.eclipse.update/src/org/eclipse/update/internal/ui/UMWizardPageLaunchHistoryComplete.java
+++ /dev/null
Binary files differ
diff --git a/update/org.eclipse.update/src/org/eclipse/update/internal/ui/UMWizardPageLocations.java b/update/org.eclipse.update/src/org/eclipse/update/internal/ui/UMWizardPageLocations.java
deleted file mode 100644
index d61bfbb..0000000
--- a/update/org.eclipse.update/src/org/eclipse/update/internal/ui/UMWizardPageLocations.java
+++ /dev/null
Binary files differ
diff --git a/update/org.eclipse.update/src/org/eclipse/update/internal/ui/UMWizardPageURLComplete.java b/update/org.eclipse.update/src/org/eclipse/update/internal/ui/UMWizardPageURLComplete.java
deleted file mode 100644
index 582c842..0000000
--- a/update/org.eclipse.update/src/org/eclipse/update/internal/ui/UMWizardPageURLComplete.java
+++ /dev/null
Binary files differ
diff --git a/update/org.eclipse.update/src/org/eclipse/update/internal/ui/UMWizardPageURLInstall.java b/update/org.eclipse.update/src/org/eclipse/update/internal/ui/UMWizardPageURLInstall.java
deleted file mode 100644
index 4057a14..0000000
--- a/update/org.eclipse.update/src/org/eclipse/update/internal/ui/UMWizardPageURLInstall.java
+++ /dev/null
Binary files differ
diff --git a/update/org.eclipse.update/src/org/eclipse/update/internal/ui/UMWizardPageURLInstallable.java b/update/org.eclipse.update/src/org/eclipse/update/internal/ui/UMWizardPageURLInstallable.java
deleted file mode 100644
index 0e87c19..0000000
--- a/update/org.eclipse.update/src/org/eclipse/update/internal/ui/UMWizardPageURLInstallable.java
+++ /dev/null
Binary files differ
diff --git a/update/org.eclipse.update/src/org/eclipse/update/internal/ui/UMWizardPageURLInstalling.java b/update/org.eclipse.update/src/org/eclipse/update/internal/ui/UMWizardPageURLInstalling.java
deleted file mode 100644
index ba49c34..0000000
--- a/update/org.eclipse.update/src/org/eclipse/update/internal/ui/UMWizardPageURLInstalling.java
+++ /dev/null
Binary files differ
diff --git a/update/org.eclipse.update/src/org/eclipse/update/internal/ui/UMWizardPersistentProperties.java b/update/org.eclipse.update/src/org/eclipse/update/internal/ui/UMWizardPersistentProperties.java
deleted file mode 100644
index 9cd1af7..0000000
--- a/update/org.eclipse.update/src/org/eclipse/update/internal/ui/UMWizardPersistentProperties.java
+++ /dev/null
Binary files differ
diff --git a/update/org.eclipse.update/src/org/eclipse/update/internal/ui/UMWizardProductComponentNew.java b/update/org.eclipse.update/src/org/eclipse/update/internal/ui/UMWizardProductComponentNew.java
deleted file mode 100644
index cdf3a47..0000000
--- a/update/org.eclipse.update/src/org/eclipse/update/internal/ui/UMWizardProductComponentNew.java
+++ /dev/null
Binary files differ
diff --git a/update/org.eclipse.update/src/org/eclipse/update/internal/ui/UMWizardProductComponentRevert.java b/update/org.eclipse.update/src/org/eclipse/update/internal/ui/UMWizardProductComponentRevert.java
deleted file mode 100644
index 908d541..0000000
--- a/update/org.eclipse.update/src/org/eclipse/update/internal/ui/UMWizardProductComponentRevert.java
+++ /dev/null
Binary files differ
diff --git a/update/org.eclipse.update/src/org/eclipse/update/internal/ui/UMWizardProductComponentURLInstall.java b/update/org.eclipse.update/src/org/eclipse/update/internal/ui/UMWizardProductComponentURLInstall.java
deleted file mode 100644
index 5c08941..0000000
--- a/update/org.eclipse.update/src/org/eclipse/update/internal/ui/UMWizardProductComponentURLInstall.java
+++ /dev/null
Binary files differ
diff --git a/update/org.eclipse.update/src/org/eclipse/update/internal/ui/UMWizardProductComponentUpdate.java b/update/org.eclipse.update/src/org/eclipse/update/internal/ui/UMWizardProductComponentUpdate.java
deleted file mode 100644
index f686d65..0000000
--- a/update/org.eclipse.update/src/org/eclipse/update/internal/ui/UMWizardProductComponentUpdate.java
+++ /dev/null
Binary files differ
diff --git a/update/org.eclipse.update/src/org/eclipse/update/internal/ui/UMWizardTreeItem.java b/update/org.eclipse.update/src/org/eclipse/update/internal/ui/UMWizardTreeItem.java
deleted file mode 100644
index 57ebf4a..0000000
--- a/update/org.eclipse.update/src/org/eclipse/update/internal/ui/UMWizardTreeItem.java
+++ /dev/null
Binary files differ
diff --git a/update/org.eclipse.update/src/org/eclipse/update/internal/ui/UMWizardTreeItemComparator.java b/update/org.eclipse.update/src/org/eclipse/update/internal/ui/UMWizardTreeItemComparator.java
deleted file mode 100644
index 96c1981..0000000
--- a/update/org.eclipse.update/src/org/eclipse/update/internal/ui/UMWizardTreeItemComparator.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package org.eclipse.update.internal.ui;

-/*

- * (c) Copyright IBM Corp. 2000, 2001.

- * All Rights Reserved.

- */

-

-/**

- * 

- */

-import java.util.Comparator;

-public class UMWizardTreeItemComparator implements Comparator {

-	/**

-	 * UpdateManagerTreeItemComparator constructor comment.

-	 */

-	public UMWizardTreeItemComparator() {

-		super();

-	}

-	/**

-	 * Compares its two arguments for order.  Returns a negative integer,

-	 * zero, or a positive integer as the first argument is less than, equal

-	 * to, or greater than the second.<p>

-	 *

-	 * The implementor must ensure that <tt>sgn(compare(x, y)) ==

-	 * -sgn(compare(y, x))</tt> for all <tt>x</tt> and <tt>y</tt>.  (This

-	 * implies that <tt>compare(x, y)</tt> must throw an exception if and only

-	 * if <tt>compare(y, x)</tt> throws an exception.)<p>

-	 *

-	 * The implementor must also ensure that the relation is transitive:

-	 * <tt>((compare(x, y)&gt;0) &amp;&amp; (compare(y, z)&gt;0))</tt> implies

-	 * <tt>compare(x, z)&gt;0</tt>.<p>

-	 *

-	 * Finally, the implementer must ensure that <tt>compare(x, y)==0</tt>

-	 * implies that <tt>sgn(compare(x, z))==sgn(compare(y, z))</tt> for all

-	 * <tt>z</tt>.<p>

-	 *

-	 * It is generally the case, but <i>not</i> strictly required that 

-	 * <tt>(compare(x, y)==0) == (x.equals(y))</tt>.  Generally speaking,

-	 * any comparator that violates this condition should clearly indicate

-	 * this fact.  The recommended language is "Note: this comparator

-	 * imposes orderings that are inconsistent with equals."

-	 * 

-	 * @return a negative integer, zero, or a positive integer as the

-	 *         first argument is less than, equal to, or greater than the

-	 *         second. 

-	 * @throws ClassCastException if the arguments' types prevent them from

-	 *         being compared by this Comparator.

-	 */

-	public int compare(java.lang.Object o1, java.lang.Object o2) {

-

-		if (o1 instanceof UMWizardTreeItem && o2 instanceof UMWizardTreeItem) {

-			if (((UMWizardTreeItem) o1)._strName != null && ((UMWizardTreeItem) o2)._strName != null) {

-				return ((UMWizardTreeItem) o1)._strName.compareTo(((UMWizardTreeItem) o2)._strName);

-			}

-		}

-

-		return 0;

-	}

-}
\ No newline at end of file
diff --git a/update/org.eclipse.update/src/org/eclipse/update/internal/ui/UMWizardURLNamePairComparator.java b/update/org.eclipse.update/src/org/eclipse/update/internal/ui/UMWizardURLNamePairComparator.java
deleted file mode 100644
index 59cd313..0000000
--- a/update/org.eclipse.update/src/org/eclipse/update/internal/ui/UMWizardURLNamePairComparator.java
+++ /dev/null
Binary files differ
diff --git a/update/org.eclipse.update/src/org/eclipse/update/internal/ui/UserValidationDialog.java b/update/org.eclipse.update/src/org/eclipse/update/internal/ui/UserValidationDialog.java
deleted file mode 100644
index 8645286..0000000
--- a/update/org.eclipse.update/src/org/eclipse/update/internal/ui/UserValidationDialog.java
+++ /dev/null
Binary files differ